From 9535aa5cedf1bf4f74f86ddfc49535828242afcf Mon Sep 17 00:00:00 2001
From: Amanda <74random.amanda@gmail.com>
Date: Fri, 18 Oct 2019 10:50:15 +0530
Subject: [PATCH 1/2] Show extensive device info

---
 .../device-view.hbs                           | 142 ++++++++++++++++++
 .../device-view.js                            |  39 +++++
 2 files changed, 181 insertions(+)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index b191408c2..93d18ff95 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -97,6 +97,7 @@
             </li>
             <li><a data-toggle="tab" href="#app">Applications</a></li>
             <li><a data-toggle="tab" href="#policy">Policy Compliance</a></li>
+            <li><a data-toggle="tab" href="#device-info">Extensive Device Information</a></li>
 	    <li><a data-toggle="tab" href="#remote-session">Remote Session</a></li>
         {{/zone}}
 
@@ -143,6 +144,147 @@
               <div id="policy-list-container">
               </div>
             </div>
+            <div id="device-info" class="tab-pane fade">
+                <div id="device-info-container">
+                    {{#if device.deviceInfoAvailable}}
+                        <table class="table table-striped table-hover table-bordered display data-table"
+                               id="device-info-table">
+                            <tr>
+                                <td>
+                                    IMEI
+                                </td>
+                                <td>
+                                    {{#if device.imei}}<span>{{device.imei}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    IMSI
+                                </td>
+                                <td>
+                                    {{#if device.imsi}}<span>{{device.imsi}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Serial Number
+                                </td>
+                                <td>
+                                    {{#if device.serial}}<span>{{device.serial}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    MAC Address
+                                </td>
+                                <td>
+                                    {{#if device.macAddress}}<span>{{device.macAddress}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    OS Version
+                                </td>
+                                <td>
+                                    {{#if device.OSVersion}}<span>{{device.OSVersion}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    OS Build Date
+                                </td>
+                                <td>
+                                    {{#if device.osBuildDate}}<span>{{device.osBuildDate}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Vendor
+                                </td>
+                                <td>
+                                    {{#if device.vendor}}<span>{{device.vendor}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Model
+                                </td>
+                                <td>
+                                    {{#if device.model}}<span>{{device.model}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    CPU Usage
+                                </td>
+                                <td>
+                                    {{#if device.cpuUsage}}<span>{{device.cpuUsage.value}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    SSID
+                                </td>
+                                <td>
+                                    {{#if device.ssid}}<span>{{device.ssid}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Connection Type
+                                </td>
+                                <td>
+                                    {{#if device.connectionType}}<span>{{device.connectionType}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Operator
+                                </td>
+                                <td>
+                                    {{#if device.operator}}<span>{{device.operator}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    Phone Number
+                                </td>
+                                <td>
+                                    {{#if device.phoneNumber}}<span>{{device.phoneNumber}}</span>
+                                    {{else}}<p>This information is not available yet.</p>
+                                    {{/if}}
+                                </td>
+                            </tr>
+                        </table>
+                    {{else}}<p>Extensive information is not available yet.</p>
+                    {{/if}}
+                </div>
+            </div>
+
             <div id="remote-session" class="tab-pane fade" data-remote-session-uri="{{remoteSessionEndpoint}}">
                 <div class="remote-session-container">
                     <div class="tab-actions">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
index 7d4c02820..ca5863059 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
@@ -81,6 +81,30 @@ function onRequest(context) {
                 if (filteredDeviceData["initialDeviceInfo"]["IMEI"]) {
                     viewModel["imei"] = filteredDeviceData["initialDeviceInfo"]["IMEI"];
                 }
+                if (filteredDeviceData["initialDeviceInfo"]["IMSI"]) {
+                    viewModel["imsi"] = filteredDeviceData["initialDeviceInfo"]["IMSI"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["OS_VERSION"]) {
+                    viewModel["OSVersion"] = filteredDeviceData["initialDeviceInfo"]["OS_VERSION"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["OS_VERSION"]) {
+                    viewModel["OSVersion"] = filteredDeviceData["initialDeviceInfo"]["OS_VERSION"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"]) {
+                    viewModel["model"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["VENDOR"]) {
+                    viewModel["vendor"] = filteredDeviceData["initialDeviceInfo"]["VENDOR"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["SERIAL"]) {
+                    viewModel["serial"] = filteredDeviceData["initialDeviceInfo"]["SERIAL"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["MAC_ADDRESS"]) {
+                    viewModel["macAddress"] = filteredDeviceData["initialDeviceInfo"]["MAC_ADDRESS"];
+                }
+                if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"]) {
+                    viewModel["osBuildDate"] = filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"];
+                }
                 if (!filteredDeviceData["latestDeviceInfo"]) {
                     if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"]) {
                         if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"] != "0") {
@@ -109,6 +133,12 @@ function onRequest(context) {
                             } else {
                                 viewModel["internalMemory"]["usage"] = 0;
                             }
+                        if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["OPERATOR"]) {
+                            viewModel["operator"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["OPERATOR"];
+                        }
+                        if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["PHONE_NUMBER"]) {
+                            viewModel["phoneNumber"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["PHONE_NUMBER"];
+                        }
 
                             viewModel["externalMemory"] = {};
                             viewModel["externalMemory"]["total"] = replaceNaNVal(Math.
@@ -142,6 +172,15 @@ function onRequest(context) {
                     viewModel["vendor"] = filteredDeviceData["latestDeviceInfo"]["vendor"];
                     viewModel["model"] = filteredDeviceData["latestDeviceInfo"]["deviceModel"];
                 }
+                if (filteredDeviceData["latestDeviceInfo"]["osVersion"]) {
+                    viewModel["osVersion"] = filteredDeviceData["latestDeviceInfo"]["osVersion"];
+                }
+                if (filteredDeviceData["latestDeviceInfo"]["connectionType"]) {
+                    viewModel["connectionType"] = filteredDeviceData["latestDeviceInfo"]["connectionType"];
+                }
+                if (filteredDeviceData["latestDeviceInfo"]["ssid"]) {
+                    viewModel["ssid"] = filteredDeviceData["latestDeviceInfo"]["ssid"];
+                }
                 if (filteredDeviceData["latestDeviceInfo"]["updatedTime"]) {
                     viewModel["lastUpdatedTime"] = filteredDeviceData["latestDeviceInfo"]["updatedTime"].
                     substr(0, filteredDeviceData["latestDeviceInfo"]["updatedTime"].indexOf("+"));

From 269b11ed41d26302362412a6730be8e8c6c09b76 Mon Sep 17 00:00:00 2001
From: Amanda <74random.amanda@gmail.com>
Date: Wed, 23 Oct 2019 10:59:45 +0530
Subject: [PATCH 2/2] Improve code

---
 .../device-view.hbs                           | 140 ++----------------
 .../device-view.js                            |  31 ++--
 2 files changed, 26 insertions(+), 145 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 93d18ff95..f360de27b 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -149,136 +149,16 @@
                     {{#if device.deviceInfoAvailable}}
                         <table class="table table-striped table-hover table-bordered display data-table"
                                id="device-info-table">
-                            <tr>
-                                <td>
-                                    IMEI
-                                </td>
-                                <td>
-                                    {{#if device.imei}}<span>{{device.imei}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    IMSI
-                                </td>
-                                <td>
-                                    {{#if device.imsi}}<span>{{device.imsi}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Serial Number
-                                </td>
-                                <td>
-                                    {{#if device.serial}}<span>{{device.serial}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    MAC Address
-                                </td>
-                                <td>
-                                    {{#if device.macAddress}}<span>{{device.macAddress}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    OS Version
-                                </td>
-                                <td>
-                                    {{#if device.OSVersion}}<span>{{device.OSVersion}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    OS Build Date
-                                </td>
-                                <td>
-                                    {{#if device.osBuildDate}}<span>{{device.osBuildDate}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Vendor
-                                </td>
-                                <td>
-                                    {{#if device.vendor}}<span>{{device.vendor}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Model
-                                </td>
-                                <td>
-                                    {{#if device.model}}<span>{{device.model}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    CPU Usage
-                                </td>
-                                <td>
-                                    {{#if device.cpuUsage}}<span>{{device.cpuUsage.value}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    SSID
-                                </td>
-                                <td>
-                                    {{#if device.ssid}}<span>{{device.ssid}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Connection Type
-                                </td>
-                                <td>
-                                    {{#if device.connectionType}}<span>{{device.connectionType}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Operator
-                                </td>
-                                <td>
-                                    {{#if device.operator}}<span>{{device.operator}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    Phone Number
-                                </td>
-                                <td>
-                                    {{#if device.phoneNumber}}<span>{{device.phoneNumber}}</span>
-                                    {{else}}<p>This information is not available yet.</p>
-                                    {{/if}}
-                                </td>
-                            </tr>
+                            {{#each device.extensiveDeviceInfo}}
+                                <tr>
+                                    <td>
+                                        {{@key}}
+                                    </td>
+                                    <td>
+                                        <span>{{this}}</span>
+                                    </td>
+                                </tr>
+                            {{/each}}
                         </table>
                     {{else}}<p>Extensive information is not available yet.</p>
                     {{/if}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
index ca5863059..35ba3e891 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
@@ -76,34 +76,33 @@ function onRequest(context) {
                     viewModel["ownership"] = filteredDeviceData["enrolmentInfo"]["ownership"];
                 }
             }
+            var extensiveDeviceInfo = {};
             if (filteredDeviceData["initialDeviceInfo"]) {
                 viewModel["deviceInfoAvailable"] = true;
                 if (filteredDeviceData["initialDeviceInfo"]["IMEI"]) {
                     viewModel["imei"] = filteredDeviceData["initialDeviceInfo"]["IMEI"];
+                    extensiveDeviceInfo["IMEI"] = filteredDeviceData["initialDeviceInfo"]["IMEI"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["IMSI"]) {
-                    viewModel["imsi"] = filteredDeviceData["initialDeviceInfo"]["IMSI"];
+                    extensiveDeviceInfo["IMSI"] = filteredDeviceData["initialDeviceInfo"]["IMSI"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["OS_VERSION"]) {
-                    viewModel["OSVersion"] = filteredDeviceData["initialDeviceInfo"]["OS_VERSION"];
-                }
-                if (filteredDeviceData["initialDeviceInfo"]["OS_VERSION"]) {
-                    viewModel["OSVersion"] = filteredDeviceData["initialDeviceInfo"]["OS_VERSION"];
+                    extensiveDeviceInfo["OS Version"] = filteredDeviceData["initialDeviceInfo"]["OS_VERSION"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"]) {
-                    viewModel["model"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"];
+                    extensiveDeviceInfo["Model"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_MODEL"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["VENDOR"]) {
-                    viewModel["vendor"] = filteredDeviceData["initialDeviceInfo"]["VENDOR"];
+                    extensiveDeviceInfo["Vendor"] = filteredDeviceData["initialDeviceInfo"]["VENDOR"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["SERIAL"]) {
-                    viewModel["serial"] = filteredDeviceData["initialDeviceInfo"]["SERIAL"];
+                    extensiveDeviceInfo["Serial Number"] = filteredDeviceData["initialDeviceInfo"]["SERIAL"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["MAC_ADDRESS"]) {
-                    viewModel["macAddress"] = filteredDeviceData["initialDeviceInfo"]["MAC_ADDRESS"];
+                    extensiveDeviceInfo["MAC Address"] = filteredDeviceData["initialDeviceInfo"]["MAC_ADDRESS"];
                 }
                 if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"]) {
-                    viewModel["osBuildDate"] = filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"];
+                    extensiveDeviceInfo["OS Build Date"] = filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"];
                 }
                 if (!filteredDeviceData["latestDeviceInfo"]) {
                     if (filteredDeviceData["initialDeviceInfo"]["OS_BUILD_DATE"]) {
@@ -134,10 +133,10 @@ function onRequest(context) {
                                 viewModel["internalMemory"]["usage"] = 0;
                             }
                         if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["OPERATOR"]) {
-                            viewModel["operator"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["OPERATOR"];
+                            extensiveDeviceInfo["Operator"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["OPERATOR"];
                         }
                         if (filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["PHONE_NUMBER"]) {
-                            viewModel["phoneNumber"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["PHONE_NUMBER"];
+                            extensiveDeviceInfo["Phone Number"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["PHONE_NUMBER"];
                         }
 
                             viewModel["externalMemory"] = {};
@@ -173,13 +172,13 @@ function onRequest(context) {
                     viewModel["model"] = filteredDeviceData["latestDeviceInfo"]["deviceModel"];
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["osVersion"]) {
-                    viewModel["osVersion"] = filteredDeviceData["latestDeviceInfo"]["osVersion"];
+                    extensiveDeviceInfo["OS Version"] = filteredDeviceData["latestDeviceInfo"]["osVersion"];
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["connectionType"]) {
-                    viewModel["connectionType"] = filteredDeviceData["latestDeviceInfo"]["connectionType"];
+                    extensiveDeviceInfo["Connection Type"] = filteredDeviceData["latestDeviceInfo"]["connectionType"];
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["ssid"]) {
-                    viewModel["ssid"] = filteredDeviceData["latestDeviceInfo"]["ssid"];
+                    extensiveDeviceInfo["SSID"] = filteredDeviceData["latestDeviceInfo"]["ssid"];
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["updatedTime"]) {
                     viewModel["lastUpdatedTime"] = filteredDeviceData["latestDeviceInfo"]["updatedTime"].
@@ -190,6 +189,7 @@ function onRequest(context) {
 
                 viewModel["cpuUsage"] = {};
                 viewModel["cpuUsage"]["value"] = filteredDeviceData["latestDeviceInfo"]["cpuUsage"];
+                extensiveDeviceInfo["CPU Usage"] = filteredDeviceData["latestDeviceInfo"]["cpuUsage"];
 
                 viewModel["ramUsage"] = {};
                 if (filteredDeviceData["latestDeviceInfo"]["totalRAMMemory"] != 0) {
@@ -222,6 +222,7 @@ function onRequest(context) {
                     viewModel["externalMemory"]["usage"] = 0;
                 }
             }
+            viewModel["extensiveDeviceInfo"] = extensiveDeviceInfo;
             if (!filteredDeviceData["initialDeviceInfo"] && !filteredDeviceData["latestDeviceInfo"]) {
                 viewModel["deviceInfoAvailable"] = false;
             }