mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
resolving conflicts
This commit is contained in:
thusithakalugamage
commit
0cbf647854
@ -21,7 +21,6 @@ package org.wso2.carbon.mdm.services.android.services;
|
||||
import io.swagger.annotations.*;
|
||||
import org.wso2.carbon.apimgt.annotations.api.API;
|
||||
import org.wso2.carbon.apimgt.annotations.api.Permission;
|
||||
import org.wso2.carbon.apimgt.annotations.api.Scope;
|
||||
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidApplication;
|
||||
import org.wso2.carbon.mdm.services.android.bean.wrapper.AndroidDevice;
|
||||
@ -330,7 +329,7 @@ public interface DeviceManagementService {
|
||||
message = "Internal Server Error. \n " +
|
||||
"Server error occurred while dis-enrolling the device.")
|
||||
})
|
||||
@Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
|
||||
@Permission(name = "Disenroll Device", permission = "/device-mgt/devices/disenroll/android")
|
||||
Response disEnrollDevice(
|
||||
@ApiParam(
|
||||
name = "id",
|
||||
|
||||
@ -179,8 +179,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
||||
notification.setOperationId(operation.getId());
|
||||
notification.setStatus(org.wso2.carbon.device.mgt.common.notification.mgt.Notification.
|
||||
Status.NEW.toString());
|
||||
notification.setDescription("Operation " + operation.getCode() + " failed to execute on device " +
|
||||
deviceName + " with identifier : " + deviceId);
|
||||
notification.setDescription(operation.getCode() + " operation did fail to execute on device " +
|
||||
deviceName + " with identifier " + deviceId);
|
||||
AndroidAPIUtils.getNotificationManagementService().addNotification(id, notification);
|
||||
}
|
||||
if (log.isDebugEnabled()) {
|
||||
|
||||
@ -124,6 +124,15 @@
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>GET Events</name>
|
||||
<path>/device-mgt/admin/events/get</path>
|
||||
<url>/events</url>
|
||||
<method>GET</method>
|
||||
</Permission>
|
||||
|
||||
|
||||
|
||||
<!-- End of event related permissions -->
|
||||
|
||||
<!-- Operations related permissions -->
|
||||
@ -156,6 +165,13 @@
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>Logcat</name>
|
||||
<path>/device-mgt/admin/device/android/operation/logcat</path>
|
||||
<url>/admin/devices/logcat</url>
|
||||
<method>POST</method>
|
||||
</Permission>
|
||||
|
||||
<Permission>
|
||||
<name>Configure VPN</name>
|
||||
<path>/device-mgt/admin/device/android/operation/configure-vpn</path>
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
}}
|
||||
|
||||
{{unit "cdmf.unit.ui.title" pageTitle="Device Management"}}
|
||||
|
||||
{{unit "cdmf.unit.data-tables-extended"}}
|
||||
@ -37,33 +38,23 @@
|
||||
|
||||
{{#zone "navbarActions"}}
|
||||
{{#if permissions.ENROLL_DEVICE}}
|
||||
<li id = "enroll-btn">
|
||||
<li id="enroll-btn" class="hidden">
|
||||
<a href="javascript:toggleEnrollment()">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-mobile fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-top">
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
|
||||
<i class="fw fw-circle fw-stack-2x"></i>
|
||||
<i class="fw fw-add fw-stack-1x"></i>
|
||||
</span>
|
||||
</span>
|
||||
Enroll Device
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-add fw-stack-1x"></i>
|
||||
</span>
|
||||
Add New Device
|
||||
</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{#if permissions.ADVANCED_SEARCH}}
|
||||
<li id = "advanced-search-btn">
|
||||
<li id="advanced-search-btn" class="hidden">
|
||||
<a href="{{appContext}}devices/search">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-mobile fw-stack-1x"></i>
|
||||
<span class="fw-stack fw-move-right fw-move-top">
|
||||
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
|
||||
<i class="fw fw-circle fw-stack-2x"></i>
|
||||
<i class="fw fw-search fw-stack-1x"></i>
|
||||
</span>
|
||||
</span>
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-search fw-stack-1x"></i>
|
||||
</span>
|
||||
Advanced Search
|
||||
</a>
|
||||
</li>
|
||||
@ -72,39 +63,56 @@
|
||||
|
||||
{{#zone "content"}}
|
||||
{{#if permissions.VIEW_DEVICES}}
|
||||
<div id="no-device-view" class="ast-container list-view hidden">
|
||||
<div class="ctrl-info-panel col-centered text-center wr-login">
|
||||
<h3 class="text-muted">
|
||||
<i class="fw fw-mobile fw-3x"></i>
|
||||
</h3>
|
||||
<h3 class="text-muted">You do not have any enrolled device at the moment</h3>
|
||||
<h3>
|
||||
<a href="javascript:toggleEnrollment()" class="btn-operations btn-default">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stack-2x"></i>
|
||||
<i class="fw fw-add fw-stack-1x"></i>
|
||||
</span>
|
||||
Add New Device
|
||||
</a>
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
<div id="device-table" class="hidden">
|
||||
<table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
|
||||
id="device-grid">
|
||||
<table id="device-grid"
|
||||
class="table table-striped table-hover list-table display responsive nowrap data-table grid-view">
|
||||
<thead>
|
||||
<tr class="sort-row">
|
||||
<th class="no-sort"></th>
|
||||
<th>By Device Name</th>
|
||||
<th>By Owner</th>
|
||||
<th>By Status</th>
|
||||
<th>By Platform</th>
|
||||
<th>By Ownership</th>
|
||||
<th class="no-sort"></th>
|
||||
</tr>
|
||||
<tr class="filter-row filter-box">
|
||||
<th class="no-sort"></th>
|
||||
<th data-for="By Device Name"></th>
|
||||
<th data-for="By Owner" class="text-filter"></th>
|
||||
<th data-for="By Status" class="select-filter"></th>
|
||||
<th data-for="By Platform" class="select-filter data-platform"></th>
|
||||
<th data-for="By Ownership" class="select-filter"></th>
|
||||
<th class="no-sort"></th>
|
||||
</tr>
|
||||
<tr class="bulk-action-row hidden">
|
||||
<th colspan="7">
|
||||
<div id="operation-bar">
|
||||
{{unit "mdm.unit.device.operation-bar"}}
|
||||
</div>
|
||||
<div id="operation-guide" class="bs-callout bs-callout-info">
|
||||
<h4>Enabling Device Operations</h4>
|
||||
<p>To enable device operations, select the desired platform from above filter.</p>
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
<tr class="sort-row">
|
||||
<th class="no-sort"></th>
|
||||
<th>By Device Name</th>
|
||||
<th>By Owner</th>
|
||||
<th>By Status</th>
|
||||
<th>By Platform</th>
|
||||
<th>By Ownership</th>
|
||||
<th class="no-sort"></th>
|
||||
</tr>
|
||||
<tr class="filter-row filter-box">
|
||||
<th class="no-sort"></th>
|
||||
<th data-for="By Device Name"></th>
|
||||
<th data-for="By Owner" class="text-filter"></th>
|
||||
<th data-for="By Status" class="select-filter"></th>
|
||||
<th data-for="By Platform" class="select-filter data-platform"></th>
|
||||
<th data-for="By Ownership" class="select-filter"></th>
|
||||
<th class="no-sort"></th>
|
||||
</tr>
|
||||
<tr class="bulk-action-row hidden">
|
||||
<th colspan="7">
|
||||
<div id="operation-bar">
|
||||
{{unit "mdm.unit.device.operation-bar"}}
|
||||
</div>
|
||||
<div id="operation-guide" class="bs-callout bs-callout-info">
|
||||
<h4>Enabling Device Operations</h4>
|
||||
<p>To enable device operations, select the desired platform from above filter.</p>
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="ast-container"></tbody>
|
||||
</table>
|
||||
@ -120,16 +128,6 @@
|
||||
<a href="#">By Ownership</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="no-device-view" class="ast-container list-view hidden">
|
||||
<div class="ctrl-info-panel col-centered text-center wr-login">
|
||||
<h3 class="text-muted">You do not have any enrolled device at the moment</h3>
|
||||
<h3 class="text-center">
|
||||
<a href="javascript:toggleEnrollment()" class="btn btn-primary">
|
||||
Add New Device
|
||||
</a>
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
{{else}}
|
||||
<h1 class="page-sub-title">
|
||||
Permission Denied
|
||||
|
||||
@ -76,17 +76,72 @@ function loadDevices() {
|
||||
return {};
|
||||
}
|
||||
|
||||
var fnCreatedRow = function (nRow, aData, dataIndex) {
|
||||
$(nRow).attr('data-type', 'selectable');
|
||||
$(nRow).attr('data-deviceid', aData.deviceIdentifier);
|
||||
$(nRow).attr('data-devicetype', aData.deviceType);
|
||||
var dataFilter = function (data) {
|
||||
var noDeviceView = "#no-device-view";
|
||||
|
||||
data = JSON.parse(data);
|
||||
var json;
|
||||
|
||||
if (data["count"] == 0) {
|
||||
if ($(noDeviceView).length) {
|
||||
$(noDeviceView).removeClass('hidden');
|
||||
}
|
||||
|
||||
$(".bulk-action-row").addClass('hidden');
|
||||
|
||||
json = {
|
||||
"recordsTotal": 0,
|
||||
"recordsFiltered": 0,
|
||||
"data": []
|
||||
};
|
||||
|
||||
return JSON.stringify(json);
|
||||
|
||||
} else if (data["count"] > 0) {
|
||||
$(noDeviceView).remove();
|
||||
$("#enroll-btn").removeClass('hidden');
|
||||
$("#advanced-search-btn").removeClass('hidden');
|
||||
$(".bulk-action-row").removeClass('hidden');
|
||||
$("#device-table").removeClass('hidden');
|
||||
|
||||
var objects = [];
|
||||
|
||||
$(data.devices).each(function (index) {
|
||||
objects.push(
|
||||
{
|
||||
model: getPropertyValue(data.devices[index].properties, "DEVICE_MODEL"),
|
||||
vendor: getPropertyValue(data.devices[index].properties, "VENDOR"),
|
||||
user: data.devices[index].enrolmentInfo.owner,
|
||||
status: data.devices[index].enrolmentInfo.status,
|
||||
ownership: data.devices[index].enrolmentInfo.ownership,
|
||||
deviceType: data.devices[index].type,
|
||||
deviceIdentifier: data.devices[index].deviceIdentifier,
|
||||
name : data.devices[index].name
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
json = {
|
||||
"recordsTotal": data["count"],
|
||||
"recordsFiltered": data["count"],
|
||||
"data": objects
|
||||
};
|
||||
|
||||
return JSON.stringify(json);
|
||||
}
|
||||
};
|
||||
|
||||
// possible params - nRow, aData, dataIndex
|
||||
var fnCreatedRow = function (nRow, aData) {
|
||||
$(nRow).attr('data-type', 'selectable');
|
||||
$(nRow).attr('data-devicetype', aData["deviceType"]);
|
||||
$(nRow).attr('data-deviceid', aData["deviceIdentifier"]);
|
||||
};
|
||||
|
||||
var columns = [
|
||||
{
|
||||
class : 'remove-padding icon-only content-fill viewEnabledIcon',
|
||||
data : 'icon',
|
||||
data : null,
|
||||
render: function (data, type, row) {
|
||||
var deviceType = row.deviceType;
|
||||
var deviceIdentifier = row.deviceIdentifier;
|
||||
@ -156,35 +211,6 @@ function loadDevices() {
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
var dataFilter = function (data) {
|
||||
data = JSON.parse(data);
|
||||
|
||||
var objects = [];
|
||||
|
||||
$(data.devices).each(function (index) {
|
||||
objects.push(
|
||||
{
|
||||
model: getPropertyValue(data.devices[index].properties, "DEVICE_MODEL"),
|
||||
vendor: getPropertyValue(data.devices[index].properties, "VENDOR"),
|
||||
user: data.devices[index].enrolmentInfo.owner,
|
||||
status: data.devices[index].enrolmentInfo.status,
|
||||
ownership: data.devices[index].enrolmentInfo.ownership,
|
||||
deviceType: data.devices[index].type,
|
||||
deviceIdentifier: data.devices[index].deviceIdentifier,
|
||||
name : data.devices[index].name
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
var json = {
|
||||
"recordsTotal": data.count,
|
||||
"recordsFiltered": data.count,
|
||||
"data": objects
|
||||
};
|
||||
return JSON.stringify(json);
|
||||
};
|
||||
|
||||
$('#device-grid').datatables_extended_serverside_paging(
|
||||
null,
|
||||
"/api/device-mgt/v1.0/devices",
|
||||
@ -220,29 +246,30 @@ function loadDevices() {
|
||||
//}
|
||||
|
||||
function initPage() {
|
||||
var currentUser = $("#device-listing").data("currentUser");
|
||||
var serviceURL = "/api/device-mgt/v1.0/devices";
|
||||
|
||||
invokerUtil.get(
|
||||
serviceURL,
|
||||
function (data) {
|
||||
if (data) {
|
||||
data = JSON.parse(data);
|
||||
if (data["count"] > 0) {
|
||||
$(".bulk-action-row").removeClass('hidden');
|
||||
$("#device-table").removeClass('hidden');
|
||||
loadDevices();
|
||||
} else {
|
||||
$("#enroll-btn").addClass('hidden');
|
||||
$("#advanced-search-btn").addClass('hidden');
|
||||
$("#device-table").addClass('hidden');
|
||||
$("#no-device-view").removeClass('hidden');
|
||||
}
|
||||
}
|
||||
}, function () {
|
||||
initPage();
|
||||
}
|
||||
);
|
||||
// var currentUser = $("#device-listing").data("currentUser");
|
||||
// var serviceURL = "/api/device-mgt/v1.0/devices";
|
||||
//
|
||||
// invokerUtil.get(
|
||||
// serviceURL,
|
||||
// function (data) {
|
||||
// if (data) {
|
||||
// data = JSON.parse(data);
|
||||
// if (data["count"] > 0) {
|
||||
// $(".bulk-action-row").removeClass('hidden');
|
||||
// $("#device-table").removeClass('hidden');
|
||||
// loadDevices();
|
||||
// } else {
|
||||
// $("#enroll-btn").addClass('hidden');
|
||||
// $("#advanced-search-btn").addClass('hidden');
|
||||
// $("#device-table").addClass('hidden');
|
||||
// $("#no-device-view").removeClass('hidden');
|
||||
// }
|
||||
// }
|
||||
// }, function () {
|
||||
// initPage();
|
||||
// }
|
||||
// );
|
||||
loadDevices();
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -49,7 +49,9 @@ var androidOperationConstants = {
|
||||
"VPN_OPERATION": "vpn",
|
||||
"VPN_OPERATION_CODE": "VPN",
|
||||
"APPLICATION_OPERATION":"app-restriction",
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
|
||||
"KIOSK_APPS_CODE":"KIOSK_APPS",
|
||||
"KIOSK_APPS":"cosu-whitelisted-applications"
|
||||
};
|
||||
|
||||
// Constants to define iOS Operation Constants
|
||||
@ -520,6 +522,93 @@ validateStep["policy-profile"] = function () {
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
|
||||
//If COSU whitelisting applications configured
|
||||
operation = androidOperationConstants["KIOSK_APPS"];
|
||||
// Initializing continueToCheckNextInputs to true
|
||||
continueToCheckNextInputs = true;
|
||||
|
||||
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Applications are not provided in application whitelist list.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
else {
|
||||
childInputCount = 0;
|
||||
childInputArray = [];
|
||||
emptyChildInputCount = 0;
|
||||
duplicatesExist = false;
|
||||
// Looping through each child input
|
||||
$(whitelistedApplicationsGridChildInputs).each(function () {
|
||||
childInputCount++;
|
||||
if (childInputCount % 2 == 0) {
|
||||
// If child input is of second column
|
||||
childInput = $(this).val();
|
||||
childInputArray.push(childInput);
|
||||
// Updating emptyChildInputCount
|
||||
if (!childInput) {
|
||||
// If child input field is empty
|
||||
emptyChildInputCount++;
|
||||
}
|
||||
}
|
||||
});
|
||||
// Checking for duplicates
|
||||
initialChildInputArrayLength = childInputArray.length;
|
||||
if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
|
||||
for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
|
||||
poppedChildInput = childInputArray.pop();
|
||||
for (n = 0; n < childInputArray.length; n++) {
|
||||
if (poppedChildInput == childInputArray[n]) {
|
||||
duplicatesExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (duplicatesExist) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Updating validationStatus
|
||||
if (emptyChildInputCount > 0) {
|
||||
// If empty child inputs are present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "One or more package names of " +
|
||||
"applications are empty.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
} else if (duplicatesExist) {
|
||||
// If duplicate input is present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Duplicate values exist with " +
|
||||
"for package names.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
validationStatus = {
|
||||
"error": false,
|
||||
"okFeature": operation
|
||||
};
|
||||
}
|
||||
|
||||
// Updating validationStatusArray with validationStatus
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
}
|
||||
}if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
|
||||
if (configuredOperations.length == 0) {
|
||||
|
||||
@ -77,14 +77,14 @@
|
||||
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-register fw-stack-2x"></i>
|
||||
</span>
|
||||
Whitelist Apps (COSU)
|
||||
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
<span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1329,14 +1329,14 @@
|
||||
</div>
|
||||
|
||||
<!-- cosu-whitelist-applications -->
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
|
||||
data-operation-code="KIOSK_APPS">
|
||||
<div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
|
||||
<div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Whitelist Applications (COSU)
|
||||
<label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelist-applications-body">
|
||||
<label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelisted-applications-body">
|
||||
<input type="checkbox"/>
|
||||
<span class="helper"></span>
|
||||
<span class="text"></span>
|
||||
@ -1350,10 +1350,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelist-applications-body">
|
||||
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelisted-applications-body">
|
||||
<hr/>
|
||||
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
|
||||
|
||||
@ -114,7 +114,9 @@ var androidOperationConstants = {
|
||||
"WIFI_OPERATION": "wifi",
|
||||
"WIFI_OPERATION_CODE": "WIFI",
|
||||
"APPLICATION_OPERATION":"app-restriction",
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
|
||||
"APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
|
||||
"KIOSK_APPS_CODE":"KIOSK_APPS",
|
||||
"KIOSK_APPS":"cosu-whitelisted-applications"
|
||||
};
|
||||
|
||||
// Constants to define Android Operation Constants
|
||||
@ -491,6 +493,93 @@ validateStep["policy-profile"] = function () {
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
|
||||
}
|
||||
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
|
||||
//If COSU whitelisting applications configured
|
||||
operation = androidOperationConstants["KIOSK_APPS"];
|
||||
// Initializing continueToCheckNextInputs to true
|
||||
continueToCheckNextInputs = true;
|
||||
|
||||
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Applications are not provided in application whitelist list.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
else {
|
||||
childInputCount = 0;
|
||||
childInputArray = [];
|
||||
emptyChildInputCount = 0;
|
||||
duplicatesExist = false;
|
||||
// Looping through each child input
|
||||
$(whitelistedApplicationsGridChildInputs).each(function () {
|
||||
childInputCount++;
|
||||
if (childInputCount % 2 == 0) {
|
||||
// If child input is of second column
|
||||
childInput = $(this).val();
|
||||
childInputArray.push(childInput);
|
||||
// Updating emptyChildInputCount
|
||||
if (!childInput) {
|
||||
// If child input field is empty
|
||||
emptyChildInputCount++;
|
||||
}
|
||||
}
|
||||
});
|
||||
// Checking for duplicates
|
||||
initialChildInputArrayLength = childInputArray.length;
|
||||
if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
|
||||
for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
|
||||
poppedChildInput = childInputArray.pop();
|
||||
for (n = 0; n < childInputArray.length; n++) {
|
||||
if (poppedChildInput == childInputArray[n]) {
|
||||
duplicatesExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (duplicatesExist) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Updating validationStatus
|
||||
if (emptyChildInputCount > 0) {
|
||||
// If empty child inputs are present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "One or more package names of " +
|
||||
"applications are empty.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
} else if (duplicatesExist) {
|
||||
// If duplicate input is present
|
||||
validationStatus = {
|
||||
"error": true,
|
||||
"subErrorMsg": "Duplicate values exist with " +
|
||||
"for package names.",
|
||||
"erroneousFeature": operation
|
||||
};
|
||||
continueToCheckNextInputs = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (continueToCheckNextInputs) {
|
||||
validationStatus = {
|
||||
"error": false,
|
||||
"okFeature": operation
|
||||
};
|
||||
}
|
||||
|
||||
// Updating validationStatusArray with validationStatus
|
||||
validationStatusArray.push(validationStatus);
|
||||
|
||||
}
|
||||
}
|
||||
} if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
|
||||
|
||||
@ -57,17 +57,6 @@
|
||||
<span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<!--COSU-->
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('android-for-work-cosu', this)">
|
||||
<span class="wr-hidden-operation-icon fw-stack">
|
||||
<i class="fw fw-service fw-stack-2x"></i>
|
||||
</span>
|
||||
COSU Configuration
|
||||
<span id="android-for-work-cosu-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="android-for-work-cosu-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="android-for-work-cosu-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<!--/COSU-->
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
|
||||
<span class="fw-stack fw-lg">
|
||||
<i class="fw fw-application fw-stack-1x"></i>
|
||||
@ -106,14 +95,14 @@
|
||||
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
|
||||
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
|
||||
<span class="wr-hidden-operations-icon fw-stack">
|
||||
<i class="fw fw-register fw-stack-2x"></i>
|
||||
</span>
|
||||
Whitelist Apps (COSU)
|
||||
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
<span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
|
||||
<span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -1469,14 +1458,14 @@
|
||||
</div>
|
||||
|
||||
<!-- cosu-whitelist-applications -->
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
|
||||
<div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
|
||||
<div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
|
||||
data-operation-code="KIOSK_APPS">
|
||||
<div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
|
||||
<div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
|
||||
<h2 class="sub-title panel-title">
|
||||
Whitelist Applications (COSU)
|
||||
<label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelist-applications-body">
|
||||
<label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
|
||||
data-target="#cosu-whitelisted-applications-body">
|
||||
<input type="checkbox"/>
|
||||
<span class="helper"></span>
|
||||
<span class="text"></span>
|
||||
@ -1491,10 +1480,10 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelist-applications-body">
|
||||
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
|
||||
aria-labelledby="cosu-whitelisted-applications-body">
|
||||
|
||||
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1951,6 +1951,24 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
|
||||
var selectedValueOnChange = selectElement.value;
|
||||
|
||||
var i, slideDownVotes = 0;
|
||||
for (i = 0; i < valueSet.length; i++) {
|
||||
if (selectedValueOnChange == valueSet[i]) {
|
||||
slideDownVotes++;
|
||||
}
|
||||
}
|
||||
|
||||
var paneSelector = "#" + paneID;
|
||||
if(slideDownVotes > 0) {
|
||||
$(paneSelector).removeClass("hidden");
|
||||
} else {
|
||||
$(paneSelector).addClass("hidden");
|
||||
}
|
||||
};
|
||||
// End of HTML embedded invoke methods
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -81,12 +81,13 @@
|
||||
<li class="visible-inline-block">
|
||||
<!--<a href="{{appContext}}notification-listing" title="Failures of operations on the device side will be listed here">-->
|
||||
<a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
|
||||
aria-expanded="false" rel="notifications-sidebar">
|
||||
<span class="icon fw-stack">
|
||||
aria-expanded="false" rel="notifications-sidebar">
|
||||
<span id="notification-bubble" class="badge notifications hidden"></span>
|
||||
<span id="notifications-icon" class="icon fw-stack hidden">
|
||||
<i class="fw fw-notification fw-stack-1x"></i>
|
||||
</span>
|
||||
<span class="hidden-xs">Notifications </span>
|
||||
<span class="badge notifications" id="notification-bubble"></span>
|
||||
</span>
|
||||
<span id="notifications-spacer" class="hidden"> </span>
|
||||
<span class="text-capitalize">Notifications</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@ -94,10 +95,19 @@
|
||||
{{#zone "sidePanes"}}
|
||||
<!--suppress HtmlUnknownAttribute -->
|
||||
<div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{permissions.LIST_NOTIFICATIONS}}"
|
||||
data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="60" data-spy="affix"
|
||||
data-side="right" data-width="300" data-sidebar-fixed="true" data-fixed-offset="60" data-spy="affix"
|
||||
data-offset-top="80">
|
||||
<ul class="sidebar-messages"></ul>
|
||||
<div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show All Notifications</a></div>
|
||||
<br>
|
||||
<div class="text-center">
|
||||
<a href="{{appContext}}notification-listing" class="btn-operations btn-default">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-ring fw-stroke fw-stack-2x"></i>
|
||||
<i class="fw fw-notification fw-stack-1x"></i>
|
||||
</span>
|
||||
View All Notifications
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
{{/zone}}
|
||||
{{#zone "bottomJs"}}
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
//---------------------------------------------------------------------
|
||||
// QRCode for JavaScript
|
||||
//
|
||||
// Copyright (c) 2009 Kazuhiko Arase
|
||||
//
|
||||
// URL: http://www.d-project.com/
|
||||
//
|
||||
// Licensed under the MIT license:
|
||||
// http://www.opensource.org/licenses/mit-license.php
|
||||
//
|
||||
// The word "QR Code" is registered trademark of
|
||||
// DENSO WAVE INCORPORATED
|
||||
// http://www.denso-wave.com/qrcode/faqpatent-e.html
|
||||
//
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
// QR8bitByte
|
||||
//---------------------------------------------------------------------
|
||||
(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
|
||||
write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
|
||||
for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
|
||||
7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
|
||||
0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
|
||||
setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
|
||||
j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
|
||||
b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
|
||||
c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
|
||||
0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
|
||||
(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
|
||||
78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
|
||||
j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
|
||||
a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
|
||||
a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
|
||||
2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
|
||||
LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
|
||||
this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
|
||||
[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
|
||||
116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
|
||||
43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
|
||||
3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
|
||||
55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
|
||||
45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
|
||||
(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
|
||||
correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
|
||||
j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
|
||||
d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
|
||||
@ -80,17 +80,23 @@ function toggleEnrollment() {
|
||||
|
||||
var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {
|
||||
var notificationBubble = "#notification-bubble";
|
||||
var notificationIcon = "#notifications-icon";
|
||||
var notificationSpacer = "#notifications-spacer";
|
||||
if (jqXHR.status == 200 && data) {
|
||||
var responsePayload = JSON.parse(data);
|
||||
var newNotificationsCount = responsePayload["count"];
|
||||
if (newNotificationsCount > 5) {
|
||||
$(notificationBubble).html("5 <sup>+</sup> NEW");
|
||||
$(notificationBubble).show();
|
||||
$(notificationBubble).removeClass("hidden");
|
||||
$(notificationSpacer).removeClass("hidden");
|
||||
} else if (newNotificationsCount <= 5 && newNotificationsCount > 0) {
|
||||
$(notificationBubble).html(newNotificationsCount + " NEW");
|
||||
$(notificationBubble).show();
|
||||
$(notificationBubble).removeClass("hidden");
|
||||
$(notificationSpacer).removeClass("hidden");
|
||||
} else {
|
||||
$(notificationBubble).hide();
|
||||
$(notificationBubble).addClass("hidden");
|
||||
$(notificationSpacer).addClass("hidden");
|
||||
$(notificationIcon).removeClass("hidden");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
Most Recent
|
||||
</h4>
|
||||
{{#each notifications}}
|
||||
<li class="message" data-type="selectable">
|
||||
<li class="message" data-type="selectable" >
|
||||
<h4>
|
||||
<i class="icon fw fw-mobile text-muted"></i>
|
||||
<a href="../device/{{deviceType}}?id={{deviceIdentifier}}"
|
||||
data-id="{{operationId}}"
|
||||
data-url="../device/{{deviceType}}?id={{deviceIdentifier}}"
|
||||
class="new-notification" data-click-event="remove-form">
|
||||
Notification on {{deviceType}} {{deviceName}}
|
||||
class="new-notification text-capitalize" data-click-event="remove-form">
|
||||
Failure on {{deviceType}} {{deviceName}}
|
||||
</a>
|
||||
</h4>
|
||||
<p>{{description}}</p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user