-
Loading devices . . .
@@ -157,7 +214,7 @@
+ {{group.name}} group +
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ Overview
+
+ | Owner | +{{group.owner}} | +
| Shared with roles | +
+ {{#each roles}}
+ {{this}} + {{/each}} + |
+
| Device Count | +{{deviceCount}} | +
| Description | +{{group.description}} | +
+
+ Devices in {{group.name}} group +
+ {{/if}}
@@ -82,7 +140,6 @@
{{#if deviceCount}}
';
+ hasGroups = true;
}
}
+ if (hasGroups) {
+ html = '
' + html; + markAlreadyAssignedGroups(deviceId, deviceType); + $("a#group-device-yes-link").show(); + $("a#group-add-link").hide(); + } else { + $("a#group-device-yes-link").hide(); + $("a#group-add-link").show(); + html += '
-
+
{{groupName}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.js
index 19f783ed561..6a34a26b0c5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.js
@@ -19,8 +19,8 @@
function onRequest(context) {
var utility = require("/app/modules/utility.js").utility;
var groupModule = require("/app/modules/business-controllers/group.js")["groupModule"];
- var groupName = context.uriParams.name;
var groupId = context.uriParams.id;
+ var group = groupModule.getGroup(groupId);
var devices = [];
var deviceResponse = groupModule.getGroupDevices(groupId).responseText;
@@ -29,8 +29,9 @@ function onRequest(context) {
devices = deviceResponseObj.devices;
}
var page = {
- "groupName": groupName,
- "title": groupName + " Analytics"
+ "groupId": groupId,
+ "groupName": group.name,
+ "title": group.name + " Analytics"
};
if (devices) {
var deviceTypes = [];
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.json
index 2e2fea333e4..8535dab982d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.json
@@ -1,5 +1,5 @@
{
"version": "1.0.0",
- "uri": "/group/{name}/{id}/analytics",
+ "uri": "/group/{id}/analytics",
"layout": "cdmf.layout.default"
}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index 4597a712979..6661e775b4b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -16,18 +16,41 @@
* under the License.
*/
+/**
+ * Following function would execute
+ * when a user clicks on the list item
+ * initial mode and with out select mode.
+ */
+function InitiateViewOption(url) {
+ if ($(".select-enable-btn").text() == "Select") {
+ $(location).attr('href', url);
+ }
+}
+
+(function () {
+ var cache = {};
+ var validateAndReturn = function (value) {
+ return (value == undefined || value == null) ? "Unspecified" : value;
+ };
+ Handlebars.registerHelper("deviceMap", function (device) {
+ device.owner = validateAndReturn(device.owner);
+ device.ownership = validateAndReturn(device.ownership);
+ var arr = device.properties;
+ if (arr) {
+ device.properties = arr.reduce(function (total, current) {
+ total[current.name] = validateAndReturn(current.value);
+ return total;
+ }, {});
+ }
+ });
+})();
+
/*
* Setting-up global variables.
*/
var groupCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
var assetContainer = "#ast-container";
-function InitiateViewOption() {
- if ($(".select-enable-btn").text() == "Select") {
- $(location).attr('href', $(this).data("url"));
- }
-}
-
/*
* On Select All Groups button click function.
*
@@ -118,9 +141,9 @@ function loadGroups() {
});
var json = {
"recordsTotal": data.count,
+ "recordsFiltered": data.count,
"data": objects
- }
-
+ };
return JSON.stringify(json);
};
@@ -129,7 +152,14 @@ function loadGroups() {
data: 'id',
class: 'remove-padding icon-only content-fill',
render: function (data, type, row, meta) {
- return '
';
+ if ($.hasPermission("VIEW_GROUP_DEVICES")) {
+ return '![]()
';
+ } else {
+ return '![]()
';
+ }
}
},
{
@@ -154,13 +184,7 @@ function loadGroups() {
render: function (id, type, row, meta) {
var html = '';
if ($.hasPermission("VIEW_GROUP_DEVICES")) {
- html = '' +
- ''
- +
- '';
-
- html += '' +
''
+
@@ -224,21 +248,23 @@ function loadGroups() {
});
};
-
$('#group-grid').datatables_extended_serverside_paging(
- null,
- serviceURL,
- dataFilter,
- columns,
- fnCreatedRow,
- function (oSettings) {
- $(".icon .text").res_text(0.2);
- attachEvents();
- },
- {
- "placeholder": "Search By Group Name",
- "searchKey": "name"
- });
+ null,
+ serviceURL,
+ dataFilter,
+ columns,
+ fnCreatedRow,
+ function (oSettings) {
+ $(".icon .text").res_text(0.2);
+ attachEvents();
+ var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
+ thisTable.removeClass("table-selectable");
+ },
+ {
+ "placeholder": "Search By Group Name",
+ "searchKey": "name"
+ }
+ );
$(groupCheckbox).click(function () {
addGroupSelectedClass(this);
});
@@ -257,6 +283,11 @@ function openCollapsedNav() {
* DOM ready functions.
*/
$(document).ready(function () {
+ /* Adding selected class for selected devices */
+ $(groupCheckbox).each(function () {
+ addGroupSelectedClass(this);
+ });
+
var permissionSet = {};
//This method is used to setup permission for device listing
@@ -278,11 +309,6 @@ $(document).ready(function () {
loadGroups();
//$('#device-grid').datatables_extended();
- /* Adding selected class for selected devices */
- $(groupCheckbox).each(function () {
- addGroupSelectedClass(this);
- });
-
/* for device list sorting drop down */
$(".ctrl-filter-type-switcher").popover(
{
Please select device group(s)
' + html; + markAlreadyAssignedGroups(deviceId, deviceType); + $("a#group-device-yes-link").show(); + $("a#group-add-link").hide(); + } else { + $("a#group-device-yes-link").hide(); + $("a#group-add-link").show(); + html += '
You don\'t have any existing device groups. Please add new device group first.
' + } $('#user-groups').html(html); - markAlreadyAssignedGroups(deviceId, deviceType); - $("a#group-device-yes-link").show(); $("a#group-device-yes-link").click(function () { var deviceIdentifier = {"id": deviceId, "type": deviceType}; var deviceGroupIds = []; @@ -683,7 +692,7 @@ function attachDeviceEvents() { showPopup(); $("a#remove-device-yes-link").click(function () { - if (groupId && groupName) { + if (groupId) { var deviceIdentifiers = [{"id": deviceId, "type": deviceType}]; serviceURL = "/api/device-mgt/v1.0/groups/id/" + groupId + "/devices/remove"; invokerUtil.post(serviceURL, deviceIdentifiers, function (message) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs index 24d69f8ce4b..c7cfdffad31 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs @@ -37,7 +37,7 @@