Merge branch 'master' into 'master'

Add checkbox to force connect wifi

See merge request entgra/carbon-device-mgt-plugins!122

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.operation-mod/public/js/operation-mod.js

@@ -168,6 +168,7 @@ var androidOperationModule = function () {
                 payload = {
                     "wifiSSID": operationPayload["ssid"],
                     "wifiPassword": operationPayload["password"],
+                    "wifiForceConnectEnabled":operationPayload["forceConnectEnabled"],
                     "wifiType": operationPayload["type"],
                     "wifiEAP": operationPayload["eap"],
                     "wifiPhase2": operationPayload["phase2"],
@@ -450,6 +451,7 @@ var androidOperationModule = function () {
                         "ssid": operationData["wifiSSID"],
                         "type": operationData["wifiType"],
                         "password": operationData["wifiPassword"],
+                        "forceConnectEnabled": operationData["wifiForceConnectEnabled"],
                         "eap": operationData["wifiEAP"],
                         "phase2": operationData["wifiPhase2"],
                         "provisioning": operationData["wifiProvisioning"],

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

@@ -1237,6 +1237,17 @@
                         <input id="wifi-password" type="password" class="form-control operationDataKeys"
                                data-key="wifiPassword" maxlength="100"/>
                     </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label checkbox">
+                            <input id="force-connect-to-WiFi-enabled" type="checkbox"
+                            class="operationDataKeys" data-key="wifiForceConnectEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable force-connect-to-WiFi-enabled in the device">
+                                Enable force connect to WiFi
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
                     <!--</div>-->
                 </div>
             </div>

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

@@ -1242,6 +1242,17 @@
                         <input id="wifi-password" type="password" class="form-control operationDataKeys"
                                data-key="wifiPassword" maxlength="100" disabled/>
                     </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label checkbox">
+                            <input id="force-connect-to-WiFi-enabled" type="checkbox"
+                            class="operationDataKeys" data-key="wifiForceConnectEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable force-connect-to-WiFi-enabled in the device">
+                                Enable force connect to WiFi
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
                     <!--</div>-->
                 </div>
             </div>

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

@@ -1257,6 +1257,17 @@
                         <input id="wifi-password" type="password" class="form-control operationDataKeys"
                                data-key="wifiPassword" maxlength="100"/>
                     </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label checkbox">
+                            <input id="force-connect-to-WiFi-enabled" type="checkbox"
+                            class="operationDataKeys" data-key="wifiForceConnectEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable force-connect-to-WiFi-enabled in the device">
+                                Enable force connect to WiFi
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
                     <!--</div>-->
                 </div>
             </div>