Commit 1ee8a72bdece4c30ae119c024407b2d09662613b
1 parent
fe45f1cf
setting cancel is done
now need to save selected skintone n modesty in DB and load saved settings at time of login
Showing
1 changed file
with
20 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -701,6 +701,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -701,6 +701,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
701 | 701 | ||
702 | } | 702 | } |
703 | 703 | ||
704 | + if (result.UserTypeId == 6) { | ||
705 | + $('#modestyDiv').css('pointerEvent', 'none'); | ||
706 | + $('#modestyDiv').css('opacity', 0.4); | ||
707 | + $("#modestyDiv").find("*").prop('disabled', true); | ||
708 | + } | ||
709 | + | ||
704 | if (result.LicenseInfo != null) { | 710 | if (result.LicenseInfo != null) { |
705 | 711 | ||
706 | // set license id | 712 | // set license id |
@@ -5883,10 +5889,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -5883,10 +5889,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
5883 | if (currentmodsetting == 'Y') { | 5889 | if (currentmodsetting == 'Y') { |
5884 | $rootScope.isModestyOn = true; | 5890 | $rootScope.isModestyOn = true; |
5885 | $rootScope.isModestyOff = false; | 5891 | $rootScope.isModestyOff = false; |
5892 | + $("#modon").prop("checked", true); | ||
5893 | + $("#modoff").prop("checked", false); | ||
5894 | + | ||
5886 | } | 5895 | } |
5887 | else { | 5896 | else { |
5888 | $rootScope.isModestyOn = false; | 5897 | $rootScope.isModestyOn = false; |
5889 | $rootScope.isModestyOff = true; | 5898 | $rootScope.isModestyOff = true; |
5899 | + $("#modon").prop("checked", false); | ||
5900 | + $("#modoff").prop("checked", true); | ||
5890 | } | 5901 | } |
5891 | } | 5902 | } |
5892 | 5903 | ||
@@ -5942,10 +5953,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -5942,10 +5953,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
5942 | 5953 | ||
5943 | } | 5954 | } |
5944 | $rootScope.isApplyBtnClicked = false; | 5955 | $rootScope.isApplyBtnClicked = false; |
5945 | - $rootScope.CloseSetting = function () { | 5956 | + $rootScope.CancelSetting = function () { |
5946 | $rootScope.isCloseSettingClicked = true; | 5957 | $rootScope.isCloseSettingClicked = true; |
5947 | $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity); | 5958 | $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity); |
5948 | $rootScope.setModestySettings($rootScope.globalSetting.modesty); | 5959 | $rootScope.setModestySettings($rootScope.globalSetting.modesty); |
5960 | + | ||
5961 | + | ||
5962 | + | ||
5949 | if ($rootScope.isApplyBtnClicked == false) { | 5963 | if ($rootScope.isApplyBtnClicked == false) { |
5950 | 5964 | ||
5951 | $rootScope.deSelectLanguageOptions(); | 5965 | $rootScope.deSelectLanguageOptions(); |
@@ -5957,6 +5971,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -5957,6 +5971,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
5957 | $('#modal-settings').css("display", "none"); | 5971 | $('#modal-settings').css("display", "none"); |
5958 | $("#modelsettingsbackground").css("display", "none"); | 5972 | $("#modelsettingsbackground").css("display", "none"); |
5959 | } | 5973 | } |
5974 | + $rootScope.CloseSetting = function () { | ||
5975 | + | ||
5976 | + $('#modal-settings').css("display", "none"); | ||
5977 | + $("#modelsettingsbackground").css("display", "none"); | ||
5978 | + } | ||
5960 | 5979 | ||
5961 | $rootScope.UpdateAndCloseSetting = function (setting) { | 5980 | $rootScope.UpdateAndCloseSetting = function (setting) { |
5962 | 5981 |