Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x

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/public/js/device-detail.js

@@ -22,6 +22,7 @@ var InitiateViewOption = null;
     var deviceId = $(".device-id");
     var deviceIdentifier = deviceId.data("deviceid");
     var deviceType = deviceId.data("type");
+    var ownership = deviceId.data("ownership");
     var payload = [deviceIdentifier];
     var operationTable;
     var serviceUrl;
@@ -125,6 +126,87 @@ var InitiateViewOption = null;
         });
     });
     
+    function loadOperationsLog(update) {
+        var owner = $("#device-owner").data("owner");
+        var operationsLogTable = "#operations-log-table";
+        if (update) {
+            operationTable = $(operationsLogTable).DataTable();
+            operationTable.ajax.reload(false);
+            return;
+        }
+        operationTable = $(operationsLogTable).datatables_extended({
+            serverSide: true,
+            processing: false,
+            searching: false,
+            ordering:  false,
+            pageLength : 10,
+            order: [],
+            ajax: {
+                url: "/devicemgt/api/operation/paginate",
+                data: {deviceId : deviceIdentifier, deviceType: deviceType, owner:owner},
+                dataSrc: function (json) {
+                    $("#operations-spinner").addClass("hidden");
+                    $("#operations-log-container").empty();
+                    return json.data;
+                }
+            },
+            columnDefs: [
+                {targets: 0, data: "code" },
+                {targets: 1, data: "status", render:
+                    function (status) {
+                        var html;
+                        switch (status) {
+                            case "COMPLETED" :
+                                html = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                break;
+                            case "PENDING" :
+                                html = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
+                                break;
+                            case "ERROR" :
+                                html = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
+                                break;
+                            case "IN_PROGRESS" :
+                                html = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                break;
+                            case "REPEATED" :
+                                html = "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                break;
+                        }
+                        return html;
+                    }
+                },
+                {targets: 2, data: "createdTimeStamp", render:
+                    function (date) {
+                        var value = String(date);
+                        return value.slice(0, 16);
+                    }
+                }
+            ],
+            "createdRow": function(row, data) {
+                $(row).attr("data-type", "selectable");
+                $(row).attr("data-id", data["id"]);
+                $.each($("td", row),
+                    function(colIndex) {
+                        switch(colIndex) {
+                            case 1:
+                                $(this).attr("data-grid-label", "Code");
+                                $(this).attr("data-display", data["code"]);
+                                break;
+                            case 2:
+                                $(this).attr("data-grid-label", "Status");
+                                $(this).attr("data-display", data["status"]);
+                                break;
+                            case 3:
+                                $(this).attr("data-grid-label", "Created Timestamp");
+                                $(this).attr("data-display", data["createdTimeStamp"]);
+                                break;
+                        }
+                    }
+                );
+            }
+        });
+    }
+
     function loadApplicationsList() {
         var applicationsList = $("#applications-list");
         var applicationListingTemplate = applicationsList.attr("src");

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.policy-edit/public/templates/android-policy-edit.hbs

@@ -85,7 +85,7 @@
             <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hide">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
             <span class="wr-hidden-operation-icon fw-stack">
                 <i class="fw fw-import fw-stack-2x"></i>
             </span>
@@ -96,7 +96,7 @@
                     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-whitelisted-applications', this)" class="hide">
+        <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>
@@ -1203,7 +1203,7 @@
             </div>
         </div>
         <!-- cosu-system-update-policy -->
-        <div class="wr-hidden-operation hidden hide" data-operation="cosu-system-update-policy">
+        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
             <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
                  data-operation-code="SYSTEM_UPDATE_POLICY">
                 <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
@@ -1222,7 +1222,7 @@
                         to modify these settings on their devices.
                     </div>
                 </div>
-                <div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse"
+                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse"
                      role="tabpanel"
                      aria-labelledby="cosu-system-update-policy-body">
                     <hr/>
@@ -1273,7 +1273,7 @@
                             </span>
                         </label>
                     </div>
-                    <div id="cosu-system-update-policy-window-select" class="hidden">
+                    <div id="cosu-system-update-policy-window-select">
                         <div>
                             <ul class="message message-info">
                                 <i class="icon fw fw-info"></i>
@@ -1360,7 +1360,7 @@
             </div>
         </div>
         <!-- cosu-whitelist-applications -->
-        <div class="wr-hidden-operation hidden hide" data-operation="cosu-whitelisted-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-whitelisted-applications-heading" class="panel-heading" role="tab">

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java

@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
+import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -52,6 +53,11 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
         return AndroidDeviceManagementService.DEVICE_TYPE_ANDROID;
     }
 
+    @Override
+    public List<TaskOperation> getTasksForPlatform() {
+        return null;
+    }
+
     @Override
     public void init() throws DeviceManagementException {
         this.deviceManager = new AndroidDeviceManager();

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.mobile.android.impl.config.task;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+/**
+ *
+ */
+@XmlRootElement(name = "TaskConfiguration")
+public class TaskConfiguration {
+
+
+    private boolean enabled;
+    private List<Operation> operations;
+
+    @XmlElement(name = "Enable", required = true)
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @XmlElementWrapper(name="Operations")
+    @XmlElement(name = "Operation", required = true)
+    public List<Operation> getOperations() {
+        return operations;
+    }
+
+    public void setOperations(List<Operation> operations) {
+        this.operations = operations;
+    }
+
+    @XmlRootElement(name = "Operation")
+    public static class Operation {
+
+        private String operationName;
+        private int recurrency;
+
+        @XmlElement(name = "Name", required = true)
+        public String getOperationName() {
+            return operationName;
+        }
+
+        public void setOperationName(String operationName) {
+            this.operationName = operationName;
+        }
+
+        @XmlElement(name = "RecurrentTimes", required = true)
+        public int getRecurrency() {
+            return recurrency;
+        }
+
+        public void setRecurrency(int recurrency) {
+            this.recurrency = recurrency;
+        }
+
+    }
+}

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java

@@ -18,14 +18,11 @@
 
 package org.wso2.carbon.device.mgt.mobile.windows.impl;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
@@ -45,6 +42,11 @@ public class WindowsDeviceManagementService implements DeviceManagementService {
         return WindowsDeviceManagementService.DEVICE_TYPE_WINDOWS;
     }
 
+    @Override
+    public List<TaskOperation> getTasksForPlatform() {
+        return null;
+    }
+
     @Override
     public void init() throws DeviceManagementException {
         this.deviceManager = new WindowsDeviceManager();

features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml

@@ -328,5 +328,20 @@
             <Description>Unlock the device</Description>
         </Feature>
     </Features>
-
+    <TaskConfiguration>
+        <Operations>
+            <Operation>
+                <Name>DEVICE_INFO</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>APPLICATION_LIST</Name>
+                <RecurrentTimes>5</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>DEVICE_LOCATION</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+        </Operations>
+    </TaskConfiguration>
 </DeviceTypeConfiguration>