From f3da8d4a57dc3b236693e51762e1e97cdc4383f0 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 14 Mar 2018 22:07:20 +0530
Subject: [PATCH] Adding filter value options for data-dep-status and
 data-boolean

---
 .../jaggeryapps/devicemgt/api/data-tables-invoker-api.jag | 1 +
 .../public/js/dataTables.extended.js                      | 8 ++++++++
 .../public/js/dataTables.extended.serversidepaging.js     | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
index a0ddd0e294..146abcf0d0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
@@ -74,6 +74,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker/filters")) {
     }
     //Adding policy compliance
     result.compliance = ["MONITOR", "ENFORCE", "WARN", "BLOCK"];
+    result.depStatus = ["Empty", "Assigned", "Pushed", "Removed"];
     response["status"] = 200;
     response["content"] =  result;
     response["contentType"] = "application/json";
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
index d33cc3b4df..7422a3c1f3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
@@ -134,6 +134,14 @@ $.fn.datatables_extended = function (settings) {
                                     var compliance = cachedFilterRes.compliance[i];
                                     select.append('<option value="' + compliance + '">' + compliance + '</option>')
                                 }
+                            } else if (filterColumn.eq(column.index()).hasClass('data-dep-status')) {
+                                for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+                                    var depStatus = cachedFilterRes.depStatus[i];
+                                    select.append('<option value="' + depStatus + '">' + depStatus + '</option>')
+                                }
+                            } else if (filterColumn.eq(column.index()).hasClass('data-boolean')) {
+                                select.append('<option value="true">Enabled</option>');
+                                select.append('<option value="false">Disabled</option>');
                             } else if ($(column.nodes()).attr('data-search')) {
                                 var values = [];
                                 column.nodes().unique().sort().each(function (d, j) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
index 85af438c1c..58a26211d4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
@@ -202,6 +202,14 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                                     var compliance = cachedFilterRes.compliance[i];
                                     select.append('<option value="' + compliance + '">' + compliance + '</option>')
                                 }
+                            } else if (filterColumn.eq(column.index()).hasClass('data-dep-status')) {
+                                for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){
+                                    var depStatus = cachedFilterRes.depStatus[i];
+                                    select.append('<option value="' + depStatus + '">' + depStatus + '</option>')
+                                }
+                            } else if (filterColumn.eq(column.index()).hasClass('data-boolean')) {
+                                select.append('<option value="true">Enabled</option>');
+                                select.append('<option value="false">Disabled</option>');
                             } else if ($(column.nodes()).attr('data-search')) {
                                 var titles = [];
                                 column.nodes().unique().sort().each(function (d, j) {