rajitha
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1225 from rasika/master

Browse Source 
Adding filter value options for data-dep-status and data-boolean
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
parent d2163025f2 b04af49594
commit 5d1e4ed99e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
Unescape View File

@ -74,6 +74,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker/filters")) {
} }
//Adding policy compliance //Adding policy compliance
result.compliance = ["MONITOR", "ENFORCE", "WARN", "BLOCK"]; result.compliance = ["MONITOR", "ENFORCE", "WARN", "BLOCK"];
result.depStatus = ["Empty", "Assigned", "Pushed", "Removed"];
response["status"] = 200; response["status"] = 200;
response["content"] = result; response["content"] = result;
response["contentType"] = "application/json"; response["contentType"] = "application/json";

16
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
Unescape View File

@ -109,17 +109,17 @@ $.fn.datatables_extended = function (settings) {
$(column).each(function () { $(column).each(function () {
var i; var i;
if (filterColumn.eq(column.index()).hasClass('data-status')) { if (filterColumn.eq(column.index()).hasClass('data-status')) {
for(i = 0; i < cachedFilterRes.status.length; i++){ for (i = 0; i < cachedFilterRes.status.length; i++) {
var status = cachedFilterRes.status[i]; var status = cachedFilterRes.status[i];
select.append('<option value="' + status + '">' + status + '</option>') select.append('<option value="' + status + '">' + status + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-ownership')) { } else if (filterColumn.eq(column.index()).hasClass('data-ownership')) {
for(i = 0; i < cachedFilterRes.ownership.length; i++){ for (i = 0; i < cachedFilterRes.ownership.length; i++) {
var ownership = cachedFilterRes.ownership[i]; var ownership = cachedFilterRes.ownership[i];
select.append('<option value="' + ownership + '">' + ownership + '</option>') select.append('<option value="' + ownership + '">' + ownership + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) { } else if (filterColumn.eq(column.index()).hasClass('data-platform')) {
for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var deviceTypes = cachedFilterRes.deviceTypes[i]; var deviceTypes = cachedFilterRes.deviceTypes[i];
var name = deviceTypes; var name = deviceTypes;
var value = deviceTypes; var value = deviceTypes;
@ -130,10 +130,18 @@ $.fn.datatables_extended = function (settings) {
select.append('<option value="' + value + '">' + name + '</option>') select.append('<option value="' + value + '">' + name + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) { } else if (filterColumn.eq(column.index()).hasClass('data-compliance')) {
for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var compliance = cachedFilterRes.compliance[i]; var compliance = cachedFilterRes.compliance[i];
select.append('<option value="' + compliance + '">' + compliance + '</option>') 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')) { } else if ($(column.nodes()).attr('data-search')) {
var values = []; var values = [];
column.nodes().unique().sort().each(function (d, j) { column.nodes().unique().sort().each(function (d, j) {

16
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
Unescape View File

@ -177,17 +177,17 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
$(column).each(function () { $(column).each(function () {
var i; var i;
if (filterColumn.eq(column.index()).hasClass('data-status')) { if (filterColumn.eq(column.index()).hasClass('data-status')) {
for(i = 0; i < cachedFilterRes.status.length; i++){ for (i = 0; i < cachedFilterRes.status.length; i++) {
var status = cachedFilterRes.status[i]; var status = cachedFilterRes.status[i];
select.append('<option value="' + status + '">' + status + '</option>') select.append('<option value="' + status + '">' + status + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-ownership')) { } else if (filterColumn.eq(column.index()).hasClass('data-ownership')) {
for(i = 0; i < cachedFilterRes.ownership.length; i++){ for (i = 0; i < cachedFilterRes.ownership.length; i++) {
var ownership = cachedFilterRes.ownership[i]; var ownership = cachedFilterRes.ownership[i];
select.append('<option value="' + ownership + '">' + ownership + '</option>') select.append('<option value="' + ownership + '">' + ownership + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-platform')) { } else if (filterColumn.eq(column.index()).hasClass('data-platform')) {
for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var deviceTypes = cachedFilterRes.deviceTypes[i]; var deviceTypes = cachedFilterRes.deviceTypes[i];
var name = deviceTypes; var name = deviceTypes;
var value = deviceTypes; var value = deviceTypes;
@ -198,10 +198,18 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
select.append('<option value="' + value + '">' + name + '</option>') select.append('<option value="' + value + '">' + name + '</option>')
} }
} else if (filterColumn.eq(column.index()).hasClass('data-compliance')) { } else if (filterColumn.eq(column.index()).hasClass('data-compliance')) {
for(i = 0; i < cachedFilterRes.deviceTypes.length; i++){ for (i = 0; i < cachedFilterRes.deviceTypes.length; i++) {
var compliance = cachedFilterRes.compliance[i]; var compliance = cachedFilterRes.compliance[i];
select.append('<option value="' + compliance + '">' + compliance + '</option>') 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')) { } else if ($(column.nodes()).attr('data-search')) {
var titles = []; var titles = [];
column.nodes().unique().sort().each(function (d, j) { column.nodes().unique().sort().each(function (d, j) {

Write Preview
Loading…
Cancel
Save