-Implemented: zwavetopology screen, tooltip to indication what will be reported in the group (xs4)

-Implemented: zwavetopology screen, tooltip on the add node screen (hint that you can also use the multi instance association) (xs4)

Author: gizmocuz

hardware/OpenZWave.cpp

@@ -2920,6 +2920,14 @@ int COpenZWave::ListGroupsForNode(const int nodeID)
 	return m_pManager->GetNumGroups(m_controllerID, nodeID);
 }
 
+std::string COpenZWave::GetGroupName(const int nodeID,const int groupID)
+{
+	if (m_pManager == NULL)
+		return "";
+
+	return m_pManager->GetGroupLabel(m_controllerID, nodeID, groupID);
+}
+
 int COpenZWave::ListAssociatedNodesinGroup(const int nodeID, const int groupID, std::vector<string> &nodesingroup)
 {
 
@@ -4370,10 +4378,12 @@ namespace http {
 									std::stringstream list;
 									std::copy(nodesingroup.begin(), nodesingroup.end(), std::ostream_iterator<string>(list, ","));
 									root["result"]["nodes"][ii]["groups"][gi]["id"] = x;
+									root["result"]["nodes"][ii]["groups"][gi]["groupName"] = pOZWHardware->GetGroupName(nodeID, x);
 									root["result"]["nodes"][ii]["groups"][gi]["nodes"] = list.str();
 								}
 								else {
 									root["result"]["nodes"][ii]["groups"][gi]["id"] = x;
+									root["result"]["nodes"][ii]["groups"][gi]["groupName"] = pOZWHardware->GetGroupName(nodeID, x);
 									root["result"]["nodes"][ii]["groups"][gi]["nodes"] = "";
 								}
 								gi++;

hardware/OpenZWave.h

@@ -115,6 +115,7 @@ class COpenZWave : public AsyncSerial, public ZWaveBase, public COpenZWaveContro
 	bool GetFailedState();
 	bool NetworkInfo(const int hwID,std::vector< std::vector< int > > &NodeArray);
 	int ListGroupsForNode(const int nodeID);
+	std::string GetGroupName(const int nodeID, const int groupID);
 	int ListAssociatedNodesinGroup(const int nodeID,const int groupID,std::vector< string > &nodesingroup);
 	bool AddNodeToGroup(const int nodeID,const int groupID, const int addID, const int instance);
 	bool RemoveNodeFromGroup(const int nodeID,const int groupID, const int removeID, const int instance);

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 998
+# ref 999
 
 CACHE:
 # CSS

www/zwavetopology.html

@@ -52,7 +52,7 @@
 		function addNodeToGroup(node,group) {
 			var hwid=getParameter("hwid");
 			bootbox.dialog({
-			  message: $.t("Please enter the node to add to this group:")+"<input type='text' id='add_node'></input>",
+			  message: $.t("Please enter the node to add to this group:")+"<input type='text' id='add_node' data-toggle='tooltip' title='NodeId or NodeId.Instance'></input>",
 			  title: "Add node",
 			  buttons: {
 				main: {
@@ -118,7 +118,7 @@
 									if (noGroups > 0) {
 										groupnodes = item.groups;
 										$.each(groupnodes, function(g, group) {
-											td = $('<td></td>');
+											td = $('<td data-toggle="tooltip" title="' + group.groupName + '"></td>');
 											$.each(group.nodes.split(','), function(){
 												if (this!="") {
 													button=$('<span class="label label-info lcursor" onclick="removeNodeFromGroup('+item.nodeID+','+group.id+','+this+');">'+this+'</span>');