ADAM / AIAHTML5

Commit c4b04495c10dcdd66f0f8c6753aca71ec8423104

Authored by Amrita Vishnoi
2 parents 897b655d ad7edd35

Merge branch 'CAApplybuttonissue' into Develop

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @c4b0449
... ... @@ -53,7 +53,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
53 53 $scope.CAAllBodySystem = BodySystems;
54 54 $scope.CAAllSpeciality = MedicalSpecialties;
55 55 $scope.scroll();
56   -
  56 + //push the details of open module in array $rootScope.openModules
  57 + $rootScope.openModules.push({ "ModuleId": 5 });
57 58 //set the local storage
58 59  
59 60 var curtab = $rootScope.getLocalStorageValue("currentCATabView");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c4b0449
... ... @@ -3859,6 +3859,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3859 3859  
3860 3860  
3861 3861 $rootScope.UpdateSetting = function (setting) {
  3862 +
3862 3863 $rootScope.isApplyBtnClicked = true;
3863 3864 var isReloadingViewRequired = false;
3864 3865 //1.
... ... @@ -3916,8 +3917,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3916 3917 }
3917 3918 else {
3918 3919  
3919   - // $('#modal-settings').css("display", "none");
3920   - // $("#modelsettingsbackground").css("display", "none");
  3920 + $('#modal-settings').css("display", "none");
  3921 + $("#modelsettingsbackground").css("display", "none");
3921 3922 }
3922 3923 $rootScope.lexiconRemovedLanguage = [];
3923 3924 $("#secondLax option").each(function () {
... ...