From 3a7dbb81ea416370ae13611e9005f37dfcb3cf44 Mon Sep 17 00:00:00 2001 From: dilanua Date: Fri, 23 Sep 2016 06:59:12 +0530 Subject: [PATCH] Fix for JIRA: https://wso2.org/jira/browse/EMM-1616 --- .../app/units/mdm.unit.device.view/view.hbs | 30 +++++++++++++------ .../app/units/mdm.unit.device.view/view.js | 4 +++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs index 894a78098..70ef8f508 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs @@ -25,27 +25,27 @@ {{#if device.viewModel.deviceIdentifier}} - ID + Device ID {{device.viewModel.deviceIdentifier}} {{/if}} {{#if device.viewModel.deviceName}} - Name + Name {{device.viewModel.deviceName}} {{/if}} {{#if device.viewModel.vendor}} {{#if device.viewModel.model}} - Model + Model {{device.viewModel.vendor}} {{device.viewModel.model}} {{/if}} {{/if}} {{#if device.status}} - Status + Status {{#equal device.status "ACTIVE"}}  Active{{/equal}} {{#equal device.status "INACTIVE"}}  Inactive{{/equal}} @@ -56,34 +56,46 @@ {{/if}} {{#if device.viewModel.owner}} - Owner + Owner {{device.viewModel.owner}} {{/if}} + {{#if device.viewModel.ownership}} + + Ownership + {{device.viewModel.ownership}} + + {{/if}} {{#if device.viewModel.imei}} - IMEI + IMEI {{device.viewModel.imei}} {{/if}} {{#if device.viewModel.udid}} - UDID + UDID {{device.viewModel.udid}} {{/if}} {{#if device.viewModel.os_build_date}} - Firmware Build Date + Firmware Build Date {{device.viewModel.os_build_date}} {{/if}} {{#if device.viewModel.phoneNumber}} - Phone Number + Phone Number {{device.viewModel.phoneNumber}} {{/if}} + {{#if device.viewModel.lastUpdatedTime}} + + Last Update + {{device.viewModel.lastUpdatedTime}} + + {{/if}} {{/defineZone}} diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js index f7111d10e..494a9379d 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js @@ -58,6 +58,10 @@ function onRequest(context) { viewModel["model"] = device["deviceInfo"]["deviceModel"]; viewModel["vendor"] = device["deviceInfo"]["vendor"]; viewModel["owner"] = device["owner"]; + viewModel["ownership"] = device["ownership"]; + viewModel["lastUpdatedTime"] = device["deviceInfo"]["updatedTime"]. + substr(0, device["deviceInfo"]["updatedTime"].indexOf("+")); + var osBuildDate = device["properties"]["OS_BUILD_DATE"]; if (osBuildDate != null && osBuildDate != "0") { viewModel["os_build_date"] = new Date(osBuildDate * 1000);