community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #868 from inoshperera/master

Browse Source 
Device information in device view are incorrect and also needs tooltips
This commit is contained in:
inoshperera 2018-01-19 14:22:02 +05:30 committed by GitHub
commit 723e41ce7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
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
View File

@ -55,22 +55,33 @@
<div class="vital-strip">
{{#if device.deviceInfoAvailable}}
{{#if device.BatteryLevel}}
<p><i class="icon fw fw-battery fw-2x"></i> <span>{{device.BatteryLevel.value}}%</span></p>
<p title="Battery level percentage" data-toggle="tooltip">
<i class="icon fw fw-battery fw-2x"></i>
<span>{{device.BatteryLevel.value}}%</span>
</p>
{{/if}}
{{#if device.ramUsage}}
<p><i class="icon fw fw-hardware fw-2x fw-rotate-90"></i> <span>{{device.ramUsage.value}}%</span></p>
<p title="RAM usage percentage" data-toggle="tooltip">
<i class="icon fw fw-hardware fw-2x fw-rotate-90"></i>
<span>{{device.ramUsage.value}}%</span>
</p>
{{/if}}
{{#if device.internalMemory}}
<p><i class="icon fw fw-hdd fw-2x fw-rotate-90"></i> <span>{{device.internalMemory.usage}}</span>
<span class="memory-amt">GB/{{device.internalMemory.total}}GB</span></p>
<p title="Free space / Total available internal storage" data-toggle="tooltip">
<i class="icon fw fw-hdd fw-2x fw-rotate-90"></i>
<span>{{device.internalMemory.usage}}</span>
<span class="memory-amt">GB Free/{{device.internalMemory.total}}GB Total</span>
</p>
{{/if}}
{{#if device.externalMemory}}
<p><i class="icon fw fw-usb-drive fw-2x"></i> <span>{{device.externalMemory.usage}}</span>
<span class="memory-amt">GB/{{device.externalMemory.total}}GB</span></p>
<p title="Free space / Total available external storage" data-toggle="tooltip">
<i class="icon fw fw-usb-drive fw-2x"></i>
<span>{{device.externalMemory.usage}}</span>
<span class="memory-amt">GB Free/{{device.externalMemory.total}}GB Total</span>
</p>
{{/if}}
{{else}}
<p>Battery, RAM and Storage related information are not
available yet.</p>
<p>Battery, RAM and Storage related information are not available yet.</p>
{{/if}}
</div>
{{/zone}}

17
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
View File

@ -153,23 +153,22 @@ function onRequest(context) {
}
viewModel["internalMemory"] = {};
viewModel["internalMemory"]["total"] = replaceNaNVal(Math.
round(filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 100) / 100);
if (filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] != 0) {
viewModel["internalMemory"]["usage"] = replaceNaNVal(Math.round((filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] -
filteredDeviceData["latestDeviceInfo"]["internalAvailableMemory"]) * 100) / 100);
viewModel["internalMemory"]["total"] = replaceNaNVal(Math.round
(filteredDeviceData["latestDeviceInfo"]["internalTotalMemory"] * 100) / 100);
viewModel["internalMemory"]["usage"] = replaceNaNVal(Math.round
(filteredDeviceData["latestDeviceInfo"]["internalAvailableMemory"] * 100) / 100);
} else {
viewModel["internalMemory"]["usage"] = 0;
}
viewModel["externalMemory"] = {};
viewModel["externalMemory"]["total"] = replaceNaNVal(Math.
round(filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 100) / 100);
if (filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] != 0) {
viewModel["externalMemory"]["total"] = replaceNaNVal(Math.round
(filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 100) / 100);
viewModel["externalMemory"]["usage"] = replaceNaNVal(Math.
round((filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] -
filteredDeviceData["latestDeviceInfo"]["externalAvailableMemory"])
/ filteredDeviceData["latestDeviceInfo"]["externalTotalMemory"] * 10000) / 100);
round(filteredDeviceData["latestDeviceInfo"]["externalAvailableMemory"]* 100)
/100);
} else {
viewModel["externalMemory"]["usage"] = 0;
}