From 751dfb1bcf3883ce6705748825df38f4140bfb15 Mon Sep 17 00:00:00 2001 From: charithag Date: Mon, 27 Jul 2015 10:21:52 +0530 Subject: [PATCH 01/61] Avoid page reloading --- .../iotserver/units/group-listing/public/js/group-listing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js index c84285b5..27d27cf5 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js @@ -255,7 +255,7 @@ function attachGroupAdding() { $(modalPopupContent).html($('#add-group-200-content').html()); $("a#add-group-200-link").click(function () { hidePopup(); - location.reload(); + window.location.href = '/iotserver/groups'; }); } else { $(modalPopupContent).html($('#group-400-content').html()); @@ -427,7 +427,6 @@ function attachEvents() { $('div[data-group="' + groupId + '"]').remove(); $("a#remove-group-200-link").click(function () { hidePopup(); - location.reload(); }); } else { $(modalPopupContent).html($('#group-409-content').html()); @@ -485,6 +484,7 @@ function attachEvents() { $("div[data-groupid='" + groupId + "'] .ast-name").html(newGroupName); $("a#edit-group-200-link").click(function () { hidePopup(); + window.location.href = '/iotserver/groups'; }); } else { $(modalPopupContent).html($('#group-409-content').html()); From 987c35feccdf9c6ff3b366a88201202893a2dcbd Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Mon, 27 Jul 2015 10:31:15 +0530 Subject: [PATCH 02/61] adding temporary mqtt client jar deployment --- modules/distribution/pom.xml | 6 ++++++ ...push-1.0-SNAPSHOT-jar-with-dependencies.jar | Bin 0 -> 149014 bytes 2 files changed, 6 insertions(+) create mode 100755 modules/distribution/src/lib/mqtt-push-1.0-SNAPSHOT-jar-with-dependencies.jar diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ea5f04ec..9c8a451c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -411,6 +411,8 @@ + + @@ -431,6 +433,10 @@ + + + + + + + + + //global object to pass request stat among fuse framework files. var fuseState = { @@ -14,14 +14,14 @@ var fuseState = { currentUnit: null }; -var requestId = function makeId() { - var text = ""; - var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - for (var i = 0; i < 5; i++) - text += possible.charAt(Math.floor(Math.random() * possible.length)); + + + + + - return text; -}(); + + var fuseDebug = false; //var fuseDebug = true; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.js b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.js index 7380f57c..134f441c 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.js @@ -93,10 +93,10 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, layout = model.layout; mainUnit = model.name; } else { - log.warn( - '[' + requestId + '] multiple layouts ' + mainUnit + ':' + - layout + ' vs ' + model.name + ':' + model.layout - ); + //log.warn( + // '[' + requestId + '] multiple layouts ' + mainUnit + ':' + + // layout + ' vs ' + model.name + ':' + model.layout + //); } } }; @@ -152,8 +152,8 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, initLookUp(definitions); var model = definitions[lookUpTable[unit]]; if (!model) { - log.warn('[' + requestId + '] unit "' + unit + '" does not exits'); - throw '[' + requestId + '] unit "' + unit + '" does not exits'; + //log.warn('[' + requestId + '] unit "' + unit + '" does not exits'); + //throw '[' + requestId + '] unit "' + unit + '" does not exits'; } return model; }; @@ -219,7 +219,7 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, var path = definitionFile.getPath(); if (log.isDebugEnabled()) { - log.debug('[' + requestId + '] reading file "' + path + '"'); + //log.debug('[' + requestId + '] reading file "' + path + '"'); } unitModel.definition = require(path); @@ -351,10 +351,10 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, while (len--) { if (toDelete[units[len]]) { if (log.isDebugEnabled()) { - log.debug( - '[' + requestId + '] unit "' + units[len] + - '" is overridden by "' + toDelete[units[len]] + '"' - ); + //log.debug( + // '[' + requestId + '] unit "' + units[len] + + // '" is overridden by "' + toDelete[units[len]] + '"' + //); } units.splice(len, 1); } @@ -412,10 +412,10 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, var selfFile = new File(getUnitPath(unitName) + slashPath + selfFileName); if (selfFile.isExists()) { if (log.isDebugEnabled()) { - log.debug( - '[' + requestId + '] for unit "' + unitName + '" file resolved : "' - + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"' - ); + //log.debug( + // '[' + requestId + '] for unit "' + unitName + '" file resolved : "' + // + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"' + //); } return selfFile; @@ -434,19 +434,19 @@ var getHbsFile, getFile, toRelativePath, cleanupAncestors, var file = new File(getUnitPath(ancestorName) + slashPath + fileName); if (file.isExists()) { if (log.isDebugEnabled()) { - log.debug( - '[' + requestId + '] for unit "' + unitName + '" file resolved : "' - + slashPath + selfFileName + '" -> "' + file.getPath() + '"' - ); + //log.debug( + // '[' + requestId + '] for unit "' + unitName + '" file resolved : "' + // + slashPath + selfFileName + '" -> "' + file.getPath() + '"' + //); } return file; } } if (log.isDebugEnabled()) { - log.debug( - '[' + requestId + '] for unit "' + unitName + '" (non-excising) file resolved : "' - + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"' - ); + //log.debug( + // '[' + requestId + '] for unit "' + unitName + '" (non-excising) file resolved : "' + // + slashPath + selfFileName + '" -> "' + selfFile.getPath() + '"' + //); } return selfFile; }; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/handlebars-helpers.js b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/handlebars-helpers.js index 8c915700..f303d0e0 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/handlebars-helpers.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/handlebars-helpers.js @@ -29,8 +29,8 @@ var getScope = function (unit,configs) { //a warning as the unit author may have forgotten to return a data object if(cbResult===undefined){ cbResult = {}; //Give an empty data object - log.warn('[' + requestId + '] unit "' + unit + '" has a onRequest method which does not return a value.This may lead to the ' - +'unit not been rendered correctly.'); + //log.warn('[' + requestId + '] unit "' + unit + '" has a onRequest method which does not return a value.This may lead to the ' + // +'unit not been rendered correctly.'); } viewModel = cbResult; } @@ -72,7 +72,7 @@ Handlebars.registerHelper('defineZone', function (zoneName, zoneContent) { var unit = unitsToRender[i]; if (Handlebars.innerZonesFromUnit == null || Handlebars.innerZonesFromUnit.unitName == unit.unitName) { var template = fuse.getFile(unit.originUnitName || unit.unitName, '', '.hbs'); - log.debug('[' + requestId + '] for zone "' + zone + '" including template :"' + template.getPath() + '"'); + //log.debug('[' + requestId + '] for zone "' + zone + '" including template :"' + template.getPath() + '"'); result += Handlebars.compileFile(template)(getScope(unit.unitName, zoneContent.data.root)); } } @@ -157,7 +157,7 @@ Handlebars.registerHelper('unit', function (unitName,options) { //TODO warn when unspecified decencies are included. fuseState.currentZone.push('main'); var template = fuse.getFile(baseUnit, '', '.hbs'); - log.debug('[' + requestId + '] including "' + baseUnit + '"'+" with configs "+stringify(templateConfigs)); + //log.debug('[' + requestId + '] including "' + baseUnit + '"'+" with configs "+stringify(templateConfigs)); var result = new Handlebars.SafeString(Handlebars.compileFile(template)(getScope(baseUnit,templateConfigs))); fuseState.currentZone.pop(); return result; @@ -176,7 +176,7 @@ Handlebars.compileFile = function (file) { } f.open('r'); - log.debug('[' + requestId + '] reading file "' + f.getPath() + '"'); + //log.debug('[' + requestId + '] reading file "' + f.getPath() + '"'); var content = f.readAll().trim(); f.close(); var compiled = Handlebars.compile(content); diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/less-rhino-1.7.5.js b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/less-rhino-1.7.5.js index 4a191ca4..b9d609e9 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/less-rhino-1.7.5.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/less-rhino-1.7.5.js @@ -14,7 +14,7 @@ function readFile(name) { var pathInfo = fuse.toRelativePath(name); f = fuse.getFile(pathInfo.unit, pathInfo.path); } - log.debug('[' + requestId + '] opening less file : "' + f.getPath() + '"'); + //log.debug('[' + requestId + '] opening less file : "' + f.getPath() + '"'); f.open('r'); return f.readAll(); } From d7c6c083a07dea4401f438469a06327b1280761f Mon Sep 17 00:00:00 2001 From: charithag Date: Mon, 27 Jul 2015 11:59:50 +0530 Subject: [PATCH 05/61] Add Sonar graph to analytics. Fix undefined content issue in device details --- .../jaggeryapps/iotserver/api/stats-api.jag | 1 + .../iotserver/pages/groups/analytics.hbs | 9 ++ .../iotserver/units/analytics/analytics.hbs | 3 +- .../iotserver/units/analytics/analytics.js | 9 ++ .../units/device-detail/device-detail.hbs | 121 ++++++++------- .../device-detail/public/js/device-detail.js | 51 +------ .../public/js/device-listing.js | 143 +++++++++--------- .../public/templates/device-listing.hbs | 4 +- 8 files changed, 168 insertions(+), 173 deletions(-) create mode 100644 modules/distribution/src/repository/jaggeryapps/iotserver/pages/groups/analytics.hbs diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag index 9f3fa5fb..852a8589 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag @@ -79,6 +79,7 @@ function getFireAlarmData(user, deviceId, from, to) { result['temperatureData'] = getSensorData("DEVICE_TEMPERATURE_SUMMARY", "TEMPERATURE", user, deviceId, from, to); result['fanData'] = getSensorData("DEVICE_FAN_USAGE_SUMMARY", "status", user, deviceId, from, to); result['bulbData'] = getSensorData("DEVICE_BULB_USAGE_SUMMARY", "status", user, deviceId, from, to); + result['sonarData'] = getSensorData("SONAR_SENSOR_SUMMARY", "sonar", user, deviceId, from, to); return result; } diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/groups/analytics.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/groups/analytics.hbs new file mode 100644 index 00000000..d34ba39c --- /dev/null +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/groups/analytics.hbs @@ -0,0 +1,9 @@ +{{authorized}} +{{layout "fluid"}} +{{#zone "title"}} + WSO2 DC | Analytics +{{/zone}} +{{#zone "body"}} + {{unit "appbar" link="analytics" title="Group Analytics"}} + {{unit "analytics"}} +{{/zone}} \ No newline at end of file diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs index 27abf139..5fa265cb 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.hbs @@ -1,9 +1,10 @@ {{#zone "main"}} +
-

Device Statistics

+

{{title}}

diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.js index 2a96b071..353852b2 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/analytics/analytics.js @@ -1,4 +1,13 @@ function onRequest(context){ context.sketchPath = "api/device/sketch"; + var groupId = request.getParameter("groupId"); + if (groupId){ + context.groupId = groupId; + context.title = "Group Analytics"; + }else{ + context.groupId = 0; + context.title = "Device Analytics"; + } + return context; } diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs index bf566146..b261e3bc 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs @@ -1,22 +1,22 @@ {{#zone "main"}}
-
-
- {{unit "operation-bar" deviceType=device.type}} + {{unit "operation-bar" deviceType=device.type}}
@@ -25,11 +25,12 @@
- +
Owner: {{device.owner}}
-
Date of Enrollment:
{{device.enrollment}}
+
Date of Enrollment:
{{device.dateOfEnrolment}}
@@ -45,7 +46,7 @@
- {{#if device.viewModel.BatteryLevel}} + {{#if device.viewModel.BatteryLevel}}
BATTERY
@@ -55,41 +56,47 @@
- {{/if}} + {{/if}} - {{#if device.viewModel.DeviceCapacity}} + {{#if device.viewModel.DeviceCapacity}}
STORAGE
-
{{device.viewModel.DeviceCapacityPercentage}}%{{device.viewModel.DeviceCapacityUsed}} GB Free
+
{{device.viewModel.DeviceCapacityPercentage}} + %{{device.viewModel.DeviceCapacityUsed}} + GB Free
- {{/if}} - {{#if device.viewModel.internal_memory.FreeCapacity}} + {{/if}} + {{#if device.viewModel.internal_memory.FreeCapacity}}
LOCAL STORAGE
-
{{device.viewModel.internal_memory.DeviceCapacityPercentage}}%{{device.viewModel.internal_memory.FreeCapacity}} GB Free
+
{{device.viewModel.internal_memory.DeviceCapacityPercentage}} + %{{device.viewModel.internal_memory.FreeCapacity}} + GB Free
- {{/if}} - {{#if device.viewModel.external_memory.FreeCapacity}} + {{/if}} + {{#if device.viewModel.external_memory.FreeCapacity}}
EXTERNAL STORAGE
-
{{device.viewModel.external_memory.DeviceCapacityPercentage}}%{{device.viewModel.external_memory.FreeCapacity}} GB Free
+
{{device.viewModel.external_memory.DeviceCapacityPercentage}} + %{{device.viewModel.external_memory.FreeCapacity}} + GB Free
- {{/if}} + {{/if}}
@@ -101,7 +108,8 @@
- @@ -120,22 +130,22 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -143,7 +153,8 @@
-
+
Not available yet
@@ -162,27 +174,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/public/js/device-detail.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/public/js/device-detail.js index c453c889..a86523fd 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/public/js/device-detail.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/public/js/device-detail.js @@ -16,54 +16,13 @@ * under the License. */ -function formatDates(){ - $(".formatDate").each(function(){ +function formatDates() { + $(".formatDate").each(function () { var timeStamp = $(this).html(); $(this).html(new Date(parseInt(timeStamp)).toUTCString()); }); } -(function () { - var deviceId = $(".device-id"); - var deviceIdentifier = deviceId.data("deviceid"); - var deviceType = deviceId.data("type"); - var payload = [deviceIdentifier]; - if (deviceType == "ios") { - var serviceUrl = "/ios/operation/deviceinfo"; - } else if (deviceType == "android") { - var serviceUrl = "/mdm-android-agent/operation/device-info"; - } - invokerUtil.post(serviceUrl, payload, - function(message){ - console.log(message); - }, function (message) { - console.log(message); - }); - $(document).ready(function(){ - loadOperationBar(deviceType); - loadMap(); - formatDates(); - }); - function loadMap(){ - var map; - function initialize() { - var mapOptions = { - zoom: 18 - }; - var lat = 6.9098591; - var long = 79.8523753; - map = new google.maps.Map(document.getElementById('device-location'), - mapOptions); - - var pos = new google.maps.LatLng(lat, - long); - var marker = new google.maps.Marker({ - position: pos, - map: map - }); - - map.setCenter(pos); - } - google.maps.event.addDomListener(window, 'load', initialize); - } -}()); +$(document).ready(function () { + formatDates(); +}); \ No newline at end of file diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js index acc0984c..c3b570ae 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js @@ -187,7 +187,7 @@ function loadDevices(searchType, searchParam) { addDeviceSelectedClass(this); }); attachEvents(); - //formatDates(); + formatDates(); } }; invokerUtil.get(serviceURL, @@ -374,81 +374,86 @@ function attachEvents() { * when a user clicks on "Group" link * on Device Management page in WSO2 MDM Console. */ - $("a.group-device-link").click(function () { - var deviceId = $(this).data("deviceid"); - var deviceType = $(this).data("devicetype"); - var endPoint = "/iotserver/api/group/all"; + if (groupId && groupId != "0") { + $("a.group-device-link").remove(); + }else{ + $("a.group-device-link").click(function () { + var deviceId = $(this).data("deviceid"); + var deviceType = $(this).data("devicetype"); + var endPoint = "/iotserver/api/group/all"; - $(modalPopupContent).html($('#group-device-modal-content').html()); - $('#user-groups').html("Loading..."); - $("a#group-device-yes-link").hide(); - showPopup(); + $(modalPopupContent).html($('#group-device-modal-content').html()); + $('#user-groups').html("Loading..."); + $("a#group-device-yes-link").hide(); + showPopup(); - invokerUtil.get(endPoint, - function (data, txtStatus, jqxhr) { - var groups = JSON.parse(data); - var status = jqxhr.status; - if (status == 200) { - if (groups.length <= 0) { - $('#user-groups').html("There is no any groups available"); - return; - } - var str = '
'; - $('#user-groups').html(str); - $("a#group-device-yes-link").show(); - $("a#group-device-yes-link").click(function () { - var selectedGroupId = $('#assign-group-selector').val(); - endPoint = "/iotserver/api/group/id/" + selectedGroupId + "/assign"; - var device = {"deviceId": deviceId, "deviceType": deviceType}; - invokerUtil.post( - endPoint, - device, - function (data, txtStatus, jqxhr) { - var status = jqxhr.status; - if (status == 200) { - $(modalPopupContent).html($('#group-associate-device-200-content').html()); - $("a#group-associate-device-200-link").click(function () { + invokerUtil.get(endPoint, + function (data, txtStatus, jqxhr) { + var groups = JSON.parse(data); + var status = jqxhr.status; + if (status == 200) { + if (groups.length <= 0) { + $('#user-groups').html("There is no any groups available"); + return; + } + var str = '
'; + $('#user-groups').html(str); + $("a#group-device-yes-link").show(); + $("a#group-device-yes-link").click(function () { + var selectedGroupId = $('#assign-group-selector').val(); + endPoint = "/iotserver/api/group/id/" + selectedGroupId + "/assign"; + var device = {"deviceId": deviceId, "deviceType": deviceType}; + invokerUtil.post( + endPoint, + device, + function (data, txtStatus, jqxhr) { + var status = jqxhr.status; + if (status == 200) { + $(modalPopupContent).html($('#group-associate-device-200-content').html()); + $("a#group-associate-device-200-link").click(function () { + hidePopup(); + }); + } else if (status == 400) { + $(modalPopupContent).html($('#device-400-content').html()); + $("a#device-400-link").click(function () { + hidePopup(); + }); + } else if (status == 403) { + $(modalPopupContent).html($('#device-403-content').html()); + $("a#device-403-link").click(function () { + hidePopup(); + }); + } else if (status == 409) { + $(modalPopupContent).html($('#device-409-content').html()); + $("a#device-409-link").click(function () { + hidePopup(); + }); + } + }, + function () { + $(modalPopupContent).html($('#device-unexpected-error-content').html()); + $("a#device-unexpected-error-link").click(function () { hidePopup(); }); - } else if (status == 400) { - $(modalPopupContent).html($('#device-400-content').html()); - $("a#device-400-link").click(function () { - hidePopup(); - }); - } else if (status == 403) { - $(modalPopupContent).html($('#device-403-content').html()); - $("a#device-403-link").click(function () { - hidePopup(); - }); - } else if (status == 409) { - $(modalPopupContent).html($('#device-409-content').html()); - $("a#device-409-link").click(function () { - hidePopup(); - }); - } - }, - function () { - $(modalPopupContent).html($('#device-unexpected-error-content').html()); - $("a#device-unexpected-error-link").click(function () { - hidePopup(); }); - }); + }); + } + }, + function () { + $(modalPopupContent).html($('#device-unexpected-error-content').html()); + $("a#device-unexpected-error-link").click(function () { + hidePopup(); }); - } - }, - function () { - $(modalPopupContent).html($('#device-unexpected-error-content').html()); - $("a#device-unexpected-error-link").click(function () { - hidePopup(); }); - }); - $("a#group-device-cancel-link").click(function () { - hidePopup(); + $("a#group-device-cancel-link").click(function () { + hidePopup(); + }); }); - }); + + } } diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs index f1fe2032..23eb0086 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs @@ -14,10 +14,10 @@

{{name}}

Device Type: {{type}} - Date of Enrollment: {{dateOfEnrolment}} + Date of Enrollment: {{enrolmentInfo.dateOfEnrolment}}
- {{owner}} + {{enrolmentInfo.owner}} {{status}}
From 055ae4300762553ff263a1b8d70384b649b9be24 Mon Sep 17 00:00:00 2001 From: charithag Date: Mon, 27 Jul 2015 12:19:55 +0530 Subject: [PATCH 06/61] Add policies to extended search --- .../iotserver/pages/policies/index.hbs | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs deleted file mode 100644 index cb210ed1..00000000 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs +++ /dev/null @@ -1,21 +0,0 @@ -{{authorized}} -{{layout "fluid"}} -{{#zone "title"}} - Policies -{{/zone}} -{{#zone "body"}} - {{unit "appbar" link="policies" title="My Policies"}} - {{unit "extended-search-box"}} -
-
- -
-
- -
- {{unit "policy-listing"}} -
- -
-
-{{/zone}} \ No newline at end of file From 9419c935ca62f65ac679cfe712bc8cedeb036a2d Mon Sep 17 00:00:00 2001 From: charithag Date: Mon, 27 Jul 2015 12:20:56 +0530 Subject: [PATCH 07/61] Add policies to extended search --- .../iotserver/pages/policies/index.hbs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs new file mode 100644 index 00000000..cb210ed1 --- /dev/null +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs @@ -0,0 +1,21 @@ +{{authorized}} +{{layout "fluid"}} +{{#zone "title"}} + Policies +{{/zone}} +{{#zone "body"}} + {{unit "appbar" link="policies" title="My Policies"}} + {{unit "extended-search-box"}} +
+
+ +
+
+ +
+ {{unit "policy-listing"}} +
+ +
+
+{{/zone}} \ No newline at end of file From f04cb206b6bc59d0f577e55fa27b32ea04307576 Mon Sep 17 00:00:00 2001 From: charithag Date: Mon, 27 Jul 2015 12:21:41 +0530 Subject: [PATCH 08/61] Add policies to extended search --- .../repository/jaggeryapps/iotserver/pages/policies/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs index cb210ed1..a2c83823 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/policies/index.hbs @@ -5,7 +5,7 @@ {{/zone}} {{#zone "body"}} {{unit "appbar" link="policies" title="My Policies"}} - {{unit "extended-search-box"}} + {{unit "extended-search-box" item="Policie"}}
From 2b9ebf1e2f37ecd1f2a4d825c777adcadc4f99bd Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Mon, 27 Jul 2015 15:25:26 +0530 Subject: [PATCH 09/61] changing policy holder values in login form --- .../repository/jaggeryapps/iotserver/units/login/login.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/login/login.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/login/login.hbs index 92d75a92..08eadaa5 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/login/login.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/login/login.hbs @@ -12,12 +12,12 @@