Merge branch 'improve-device-search' into 'master'

Fix issues with Advanced Device Search

Closes product-iots#8 and product-iots#7

See merge request entgra/carbon-device-mgt!32

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/js/bottomJs.js

@@ -39,25 +39,25 @@ $("#view-search-param").click(function () {
     $("#view-search-param").addClass('hidden');
 });
 
-var dynamicForm = '<div class="dynamic-search-param row"><div class="row"><a class="close-button-div icon fw fw-error">' +
-                  '</a></div><div class="form-group wr-input-control col-md-2"><label class="wr-input-label ">State</label>' +
-                  '<select class="state no-tag form-control select2-custom"><option>AND</option><option>OR</option></select></div><div ' +
-                  'class="form-group wr-input-control col-md-4"><label class="wr-input-label ">Key</label><select class=' +
-                  '"txt-key form-control select2-custom"><option value = "deviceModel">Device Model' +
-                  '</option><option value = "PhoneNumber">Phone Number</option><option value = "vendor">Vendor</option><option value = "osVersion">OS Version' +
-                  '</option><option value = "batteryLevel">Battery Level</option><option value =' +
-                  ' "internalTotalMemory">Internal Total Memory</option> <option value ="internalAvailableMemory">' +
-                  'Internal Available Memory</option> <option value = "externalTotalMemory">External Total Memory</option>' +
-                  ' <option value = "externalAvailableMemory">External Available Memory' +
-                  '</option> <option value = "connectionType">Connection Type</option> <option value =' +
-                  ' "ssid">SSID</option><option value = "cpuUsage">CPU Usage</option><option value = "totalRAMMemory">' +
-                  'Total RAM Memory</option> <option value = "availableRAMMemory">Available RAM Memory</option>' +
-                  '<option value = "pluggedIn">Plugged In</option></select></div>' +
-                  '<div class="form-group wr-input-control col-md-2">' +
-                  '<label class="wr-input-label ">Operator</label><select id = "operators" class="form-control' +
-                  ' select2-custom no-tag operator"><option>=</option><option> !=</option><option> %</option>' +
-                  '</select></div><div class="form-group ' + 'wr-input-control col-md-4"><label class="wr-input-label">Value</label>' +
-                  '<input type="text" class="form-control txt-value"/></div></div>';
+var dynamicForm = '<div class="dynamic-search-param row"><div class="row"><a class="close-button-div icon fw fw-error">'
+    + '</a></div><div class="form-group wr-input-control col-md-2"><label class="wr-input-label ">State</label>'
+    + '<select class="state no-tag form-control select2-custom"><option>AND</option><option>OR</option></select></div>'
+    + '<div class="form-group wr-input-control col-md-4"><label class="wr-input-label ">Key</label><select class='
+    + '"txt-key form-control select2-custom"><option value = "deviceModel">Device Model</option><option value = '
+    + '"PhoneNumber">Phone Number</option><option value = "vendor">Vendor</option><option value = "osVersion">'
+    + 'OS Version</option><option value = "batteryLevel">Battery Level</option><option value ='
+    + ' "internalTotalMemory">Internal Total Memory</option><option value ="internalAvailableMemory">'
+    + 'Internal Available Memory</option><option value = "externalTotalMemory">External Total Memory</option>'
+    + '<option value = "externalAvailableMemory">External Available Memory'
+    + '</option><option value = "connectionType">Connection Type</option> <option value ='
+    + ' "ssid">SSID</option><option value= "IMEI">IMEI</option><option value = "cpuUsage">CPU Usage</option><option '
+    + 'value = "totalRAMMemory">Total RAM Memory</option><option value = "availableRAMMemory">Available RAM Memory'
+    + '</option><option value = "pluggedIn">Plugged In</option></select></div>'
+    + '<div class="form-group wr-input-control col-md-2">'
+    + '<label class="wr-input-label ">Operator</label><select id = "operators" class="form-control'
+    + ' select2-custom no-tag operator"><option>=</option><option>!=</option><option>%</option>'
+    + '</select></div><div class="form-group ' + 'wr-input-control col-md-4"><label class="wr-input-label">Value'
+    + '</label><input type="text" class="form-control txt-value"/></div></div>';
 
 var nonNumericKeyValuePair = ["deviceModel", "vendor", "osVersion", "connectionType", "ssid", "pluggedIn"];
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs

@@ -82,7 +82,7 @@
                                         required.</label>
                                 </div>
                                 <div class="col-md-2 form-group wr-input-control col-fixed-right">
-                                    <button id="device-search-btn add-custom-param" class="wr-btn">Search</button>
+                                    <button id="device-search-btn" class="wr-btn">Search</button>
                                 </div>
                             </div>