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 @@
  • Applications
  • Policy Compliance
  • +
  • Extensive Device Information
  • Remote Session
  • {{/zone}} @@ -143,6 +144,147 @@
    +
    +
    + {{#if device.deviceInfoAvailable}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + IMEI + + {{#if device.imei}}{{device.imei}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + IMSI + + {{#if device.imsi}}{{device.imsi}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Serial Number + + {{#if device.serial}}{{device.serial}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + MAC Address + + {{#if device.macAddress}}{{device.macAddress}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + OS Version + + {{#if device.OSVersion}}{{device.OSVersion}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + OS Build Date + + {{#if device.osBuildDate}}{{device.osBuildDate}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Vendor + + {{#if device.vendor}}{{device.vendor}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Model + + {{#if device.model}}{{device.model}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + CPU Usage + + {{#if device.cpuUsage}}{{device.cpuUsage.value}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + SSID + + {{#if device.ssid}}{{device.ssid}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Connection Type + + {{#if device.connectionType}}{{device.connectionType}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Operator + + {{#if device.operator}}{{device.operator}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + Phone Number + + {{#if device.phoneNumber}}{{device.phoneNumber}} + {{else}}

    This information is not available yet.

    + {{/if}} +
    + {{else}}

    Extensive information is not available yet.

    + {{/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 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("+"));