From 0836b2c99ecbc0fc61b5dfc464c281ab456eb59f Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Fri, 12 Aug 2016 14:46:17 +0530
Subject: [PATCH] Fixing user create page QR-generation issues

---
 .../app/pages/cdmf.page.user.create/create.hbs     | 10 ++++++----
 .../app/pages/cdmf.page.user.create/create.js      |  1 +
 .../cdmf.page.user.create/public/js/bottomJs.js    | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
index af9184b5f6..8716965fd2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
@@ -113,15 +113,17 @@
             <div id="user-created-msg" class="container col-centered wr-content hidden">
                 <div class="wr-form">
                     <p class="page-sub-title">User was added successfully.</p>
-                    <br>
-                    An invitation mail will be sent to this user to initiate device enrollment.
-                    Below QR code can also be used to enroll a device.
-
+                    <p>
+                        An invitation mail will be sent to this user to initiate device enrollment.
+                        Below QR code can also be used to enroll a device.
+                    </p>
                     <div class="panel panel-default">
+                        <div id="qr-code-modal" class="hidden" data-enrollment-url="{{enrollmentURL}}"></div>
                         <div class="panel-body">
                             <div class="qr-code col-lg-5 col-md-6 col-centered"></div>
                         </div>
                     </div>
+
                     <br>Please click <b>"Add Another User"</b>, if you wish to add another user or click
                     <b>"View User List"</b> to complete the process and go back to the user list.
                     <hr/>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js
index a93b1a48cc..5ba8114a04 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js
@@ -39,6 +39,7 @@ function onRequest() {
     page["firstnameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["firstnameRegExViolationErrorMsg"];
     page["lastnameJSRegEx"] = devicemgtProps["userValidationConfig"]["lastnameJSRegEx"];
     page["lastnameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["lastnameRegExViolationErrorMsg"];
+    page["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["enrollmentDir"];
 
     return page;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
index 44eb92993d..b417a8bd40 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
@@ -86,7 +86,7 @@ validateInline["user-name"] = function () {
 validateInline["first-name"] = function () {
     var firstnameInput = $("input#firstname");
     if (firstnameInput.val()) {
-        disableInlineError("firstNameField", "fnError");
+       disableInlineError("firstNameField", "fnError");
     } else {
         enableInlineError("firstNameField", "fnError");
     }
@@ -161,6 +161,18 @@ function emailIsValid(email) {
     return regExp.test(email);
 }
 
+/*
+ * QR-code generation function.
+ */
+function generateQRCode(qrCodeClass) {
+    var enrollmentURL = $("#qr-code-modal").data("enrollment-url");
+    $(qrCodeClass).qrcode({
+        text: enrollmentURL,
+        width: 200,
+        height: 200
+    });
+}
+
 $("#userStore").change(
     function () {
         var str = "";