Changeset 84

Timestamp:

2014-09-10 19:58:59 (11 years ago)

Author:

nlrb

Message:

Fix CommProv_pulldown

File:

• branches/1.2/J_Powermax.js (modified) (3 diffs)

branches/1.2/J_Powermax.js ¶

@@ -181 +181 @@
 }
 
+// from UI5 for UI7 compatibility
+function CommProv_pulldown(selectedDeviceID){
+    var html='';
+    var onChangeFunc='';
+    var suffix='';
+
+    if(selectedDeviceID!=0){
+        var selDeviceObj=get_device_obj(selectedDeviceID);
+        var selectedComm=selDeviceObj.commUse;
+        var selectedIO=get_device_state(selectedDeviceID,HADEVICE_SID,HAD_IOPORT_DEVICE);
+    }
+
+    var roomsNo=jsonp.ud.rooms.length;
+    var devicesNo=jsonp.ud.devices.length;
+    if(roomsNo>0){
+        html='<select id="CommProv_pulldown" class="styled" onChange="set_device_state('+selectedDeviceID+',\''+HADEVICE_SID+'\',\''+HAD_IOPORT_DEVICE+'\',this.value);">'
+        html+='<option value="" '+((selectedIO=="")?'selected':'')+'>-- '+"Please select"+' --</option>';
+        html+='<OPTGROUP LABEL="'+"no room"+'">';
+        for(var devicePos=0;devicePos<devicesNo;devicePos++){
+            var deviceObj=jsonp.ud.devices[devicePos];
+            if(parseInt(deviceObj.room)==0 && deviceObj.commProv==selectedComm){
+                html+='<option value="'+jsonp.ud.devices[devicePos].id+'" '+((selectedIO==jsonp.ud.devices[devicePos].id)?'selected':'')+'>#'+jsonp.ud.devices[devicePos].id+' '+deviceObj.name+'</option>';
+            }
+        }
+        html+='</OPTGROUP>';
+
+        for(var i=0;i<roomsNo;i++){
+            var roomObj=jsonp.ud.rooms[i];
+            var roomName=roomObj.name;
+
+            html+='<OPTGROUP LABEL="'+roomName+'">';
+            for(var devicePos=0;devicePos<devicesNo;devicePos++){
+                var deviceObj=jsonp.ud.devices[devicePos];
+                if(deviceObj.room==jsonp.ud.rooms[i].id && deviceObj.commProv==selectedComm){
+                    html+='<option value="'+jsonp.ud.devices[devicePos].id+'" '+((selectedIO==jsonp.ud.devices[devicePos].id)?'selected':'')+'>#'+jsonp.ud.devices[devicePos].id+' '+deviceObj.name+'</option>';
+                }
+            }
+            html+='</OPTGROUP>';
+        }
+        html+='</select>';
+    }else{
+        html='';
+    }
+
+    return html;
+}
+
 function pmjsSettingsTab(deviceID) {
    var deviceObj = get_device_obj(deviceID);
@@ -188 +235 @@
    html += '<tr><td colspan="3"><div class="label"><b>General options</b></div></td></tr>';
    
-   if (deviceObj.ip) {
+   var uarts = CommProv_pulldown(deviceID);
+   
+   if (uarts == "" || deviceObj.ip) {
       html += '<tr>';
       html += ' <td width="200">Communicate using IP</td>';
@@ -196 +245 @@
       html += '<tr>';
       html += ' <td width="200">Communicate using UART</td>';
-      html += ' <td width="100">' + CommProv_pulldown(deviceID) + '</td>';
+      html += ' <td width="100">' + uarts + '</td>';
       html += '</tr>';
    }