resolve merge conflict

Birendra
1 parent 45356ddf
Showing 2 changed files with 33 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -6175,6 +6175,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         //$('#modal-settings').css("display", "none");
         //$("#modelsettingsbackground").css("display", "none");
     }
+
     $rootScope.saveSettings = function () {
         var currentSkintone = $rootScope.globalSetting.ethnicity;
@@ -6192,6 +6193,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                          $rootScope.errorMessage = AIAConstants.SETTINGS_SAVED ;
                          $('#modal-settings').css("display", "none");
                          $("#modelsettingsbackground").css("display", "none");
+                         //hide saveSettingsMessageModal
+                         $("#saveSettingsMessageModal").modal('hide');
                      }
                      else{
@@ -607,11 +607,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-primary" ng-click="UpdateAndCloseSetting(formsetting)">OK</button>
-
-                                <!--<button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>-->
-                                <button type="button" class="btn btn-primary" ng-click="CloseSetting()">Cancel</button>
+                            <div class="modal-footer">                      
+                                <button type="button" class="btn btn-primary" ng-click="CancelSetting()">Cancel</button>
                                 <button type="button" class="btn btn-primary" ng-click="UpdateSetting(formsetting)">Apply</button>
                             </div>
                         </div>
@@ -1079,6 +1076,34 @@
               </div>
+            <!-- Update Setting confirm modal-->
+             <div class="modal fade notfoundSystem" id="saveSettingsMessageModal" role="dialog" aria-labelledby="myModalLabel"
+                 style="z-index: 1200002; top:10%">
+
+                    <div class="modal-dialog modal-sm">
+
+                        <div class="modal-content">
+
+                            <div class="modal-header">
+
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+                            </div>
+
+                            <div class="modal-title"></div>
+
+                            <div class="modal-header"><p style="font-size:15px;">Do you want to save current settings?</p></div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary" ng-click="saveSettings()">Yes</button>
+                                <button type="button" data-dismiss="modal" class="btn btn-primary" ng-click="CancelSetting()">No</button>
+                            </div>
+                            
+                        </div>
+
+                    </div>
+
+              </div>
+
              <!--Profile not updated modal-->
              <div class=" fade ui-draggable in" data-keyboard="false" data-backdrop="static" id="profileUpdateModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; z-index: 1200002; position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; width:100% ;height:100%">
                     <div class="modal-dialog" role="document" style="width:400px">