From c9e533dd2a7095106b4d87f963a191d6d63a529f Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Thu, 6 Jul 2017 09:36:40 +0530
Subject: [PATCH 1/2] adding ui params option to operations

---
 .../cdmf.unit.device.operation-bar/operation-bar.hbs   |  5 +++++
 .../public/js/operation-bar.js                         | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs
index 343098c3d75..abe7c886d3e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs
@@ -79,6 +79,11 @@
                                     <input type="{{type}}" id="{{name}}" placeholder="{{name}}" class="form-control" data-param-type="query" value="{{value}}" />
                                     <br />
                                 {{/each}}
+                                {{#each uiParams}}
+                                    <input type="{{type}}" id="{{id}}" name="{{name}}" data-param-type="form" value="{{value}}" />
+                                    <label>{{label}}</label>
+                                    <br />
+                                {{/each}}
                                 <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')" class="btn btn-default">&nbsp;&nbsp;&nbsp;&nbsp;Send
                                                        to Device&nbsp;&nbsp;&nbsp;&nbsp;</button>
                                 <label id="lblSending" class="wr-input-label hidden"><i
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
index 386e837d762..b51a69661a1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
@@ -42,14 +42,18 @@ function submitForm(formId) {
             uriencodedQueryStr += prefix + input.attr("id") + "=" + input.val();
         } else if (input.data("param-type") == "form") {
             var prefix = (uriencodedFormStr == "") ? "" : "&";
-            uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
-            //payload[input.attr("id")] = input.val();
+            if (input.attr("type") == "checkbox" || input.attr("type") == "radio"){
+                if (input.is(':checked')){
+                    uriencodedFormStr += prefix + input.attr("name") + "=" + input.val();
+                }
+            }else{
+                uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
+            }
         }
     });
     uri += uriencodedQueryStr;
     var httpMethod = form.attr("method").toUpperCase();
     var contentType = form.attr("enctype");
-    console.log(payload);
     var featurePayload = form.attr("data-payload");
     if (featurePayload) {
         contentType = "application/json";

From cb8208b8b7a010a7408564ed6ec6dde976cd9438 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Thu, 6 Jul 2017 13:15:52 +0530
Subject: [PATCH 2/2] Adding UI validation to check whether radio or checkbox
 options are selected or not.

---
 .../public/js/operation-bar.js                | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
index b51a69661a1..e1e88ed6401 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/public/js/operation-bar.js
@@ -33,6 +33,15 @@ function submitForm(formId) {
     var uriencodedQueryStr = "";
     var uriencodedFormStr = "";
     var payload = {};
+    var isItemSelected;
+
+    //setting responses callbacks
+    var content = $("#operation-response-template").find(".content");
+    var defaultStatusClasses = "fw fw-stack-1x";
+    var title = content.find("#title");
+    var statusIcon = content.find("#status-icon");
+    var description = content.find("#description");
+
     form.find("input").each(function () {
         var input = $(this);
         if (input.data("param-type") == "path") {
@@ -43,7 +52,12 @@ function submitForm(formId) {
         } else if (input.data("param-type") == "form") {
             var prefix = (uriencodedFormStr == "") ? "" : "&";
             if (input.attr("type") == "checkbox" || input.attr("type") == "radio"){
+
+                if (isItemSelected == undefined){
+                    isItemSelected = false;
+                }
                 if (input.is(':checked')){
+                    isItemSelected = true;
                     uriencodedFormStr += prefix + input.attr("name") + "=" + input.val();
                 }
             }else{
@@ -51,6 +65,14 @@ function submitForm(formId) {
             }
         }
     });
+
+    if (isItemSelected === false){
+        title.html("Please Select One Option");
+        statusIcon.attr("class", defaultStatusClasses + " fw-error");
+        $(modalPopupContent).html(content.html());
+        return false;
+    }
+
     uri += uriencodedQueryStr;
     var httpMethod = form.attr("method").toUpperCase();
     var contentType = form.attr("enctype");
@@ -63,12 +85,7 @@ function submitForm(formId) {
         contentType = "application/x-www-form-urlencoded";
         payload = uriencodedFormStr;
     }
-    //setting responses callbacks
-    var defaultStatusClasses = "fw fw-stack-1x";
-    var content = $("#operation-response-template").find(".content");
-    var title = content.find("#title");
-    var statusIcon = content.find("#status-icon");
-    var description = content.find("#description");
+
     var successCallBack = function (response) {
         var res = response;
         try {
@@ -82,7 +99,6 @@ function submitForm(formId) {
         $(modalPopupContent).html(content.html());
     };
     var errorCallBack = function (response) {
-        console.log(response);
         title.html("An Error Occurred!");
         statusIcon.attr("class", defaultStatusClasses + " fw-error");
         var reason = (response.responseText == "null")?response.statusText:response.responseText;
@@ -109,9 +125,9 @@ function submitForm(formId) {
 $(document).on('submit', 'form', function (e) {
     e.preventDefault();
     var postOperationRequest = $.ajax({
-                                          url: $(this).attr("action") + '&' + $(this).serialize(),
-                                          method: "post"
-                                      });
+        url: $(this).attr("action") + '&' + $(this).serialize(),
+        method: "post"
+    });
 
     var btnSubmit = $('#btnSend', this);
     btnSubmit.addClass('hidden');