From 92bb2969055020fbf1f2f9c9040e00f23fb4c50d Mon Sep 17 00:00:00 2001 From: birendra.kumar Date: Mon, 16 Dec 2019 14:18:52 +0530 Subject: [PATCH] more updated CI module to open in CB --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 16 ++++++++++------ 400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html | 6 +++++- 400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts | 20 +++++++++++--------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 09340e0..7e5a105 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -825,7 +825,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout theme: 'success', currentController: 'CIController', parentSlug: $scope.GetCIwindowStoreData(windowviewid, 'parentSlugName'), - content: '
' + + content: '
' + '
' + '
' + '

' + selectedImageCISummary + '

' + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index f1e3fb7..c99690a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1320,6 +1320,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.disableSubMenu = "disableSubMenu"; $("#annotationToolBarOptions").removeClass("disableSubMenu"); $("#optionsListManagerTab").addClass("disableSubMenu"); + $("#optiontSetting").addClass("disableSubMenu"); $rootScope.disableFileMenu = " "; $rootScope.openResources = "openResources"; $rootScope.OpenPitures = "OpenPitures"; @@ -1333,6 +1334,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A else if ($location.url() == "/module-item-view") { $rootScope.disableMenuannotation = " "; $rootScope.disableMenuoption = " "; + $("#optiontSetting").addClass("disableSubMenu"); $rootScope.disableSubMenu = "disableSubMenu"; $("#annotationToolBarOptions").removeClass("disableSubMenu"); $rootScope.disableFileMenu = " "; @@ -1348,7 +1350,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A else if ($location.url() == "/clinical-animations-detail") { $rootScope.disableMenuannotation = "disableMenuannotation"; - $rootScope.disableMenuoption = " "; + $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.disableSubMenu = "disableSubMenu"; $("#annotationToolBarOptions").addClass("disableSubMenu"); $("#optionsListManagerTab").addClass("disableSubMenu"); @@ -5324,7 +5326,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); - }, 1000); + }, 500); } else { $('#termList option[selected="selected"]').prop("selected", false); @@ -5369,7 +5371,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); - }, 1000); + }, 500); } $("#optionsListManagerTab").addClass("active"); var viewNameAftrSplit; @@ -5391,6 +5393,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.CloseListManager = function () { + + $('#listManager').css('display', 'none'); + $("#listManager").css("visibility", "hidden"); + $scope.GetDocumentElement(); var canvasPaintElement = $scope.canvasPaintElement; if (canvasPaintElement == null) return; @@ -5427,9 +5433,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.selectedBodySystemName = $("#AABodySystems").val(); $rootScope.selectedBodySystemId = $('#AABodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').attr("id"); } - $('#listManager').css('display', 'none'); - $("#listManager").css("visibility", "hidden"); - + $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); //$('#spinner').css('display', 'none'); diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html index 91e732c..bf45b20 100644 --- a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html +++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html @@ -39,7 +39,11 @@
-
Confirm Password is required
+
Confirm Password is required
+ +
+ Password not match. +
diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts index 28eeccf..53d69d6 100644 --- a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts @@ -196,31 +196,33 @@ export class AddUser implements OnInit, AfterViewInit { this.alerts = ''; - if (this.adduserFrm.value.UserName == '') { + if (this.adduserFrm.value.UserName == '' ||(!this.adduserFrm.controls.UserName.valid)) + { this.alerts += 'User Name of minimum 8 characters is required.'; } - if (this.adduserFrm.value.Password == '') { + if (this.adduserFrm.value.Password == '' ||(!this.adduserFrm.controls.Password.valid )) { this.alerts += '
Password of minimum 8 characters is required.'; } if (this.adduserFrm.value.ConfirmPassword == '') { this.alerts += '
Confirm Password is required.'; } - if (this.adduserFrm.value.EmailId == '') { + if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) { + this.alerts += '
Password and confirm password must be same'; + } + + if (this.adduserFrm.value.EmailId == '' ||(!this.adduserFrm.controls.EmailId.valid)) { this.alerts += '
Email Id is required.'; } - //if(this.LicenseTypeId!=1) - //{ + if (this.adduserFrm.value.FirstName == '') { this.alerts += '
First Name is required.'; } if (this.adduserFrm.value.LastName == '') { this.alerts += '
Last Name is required.'; } - // } - if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) { - this.alerts += '
Password and confirm password must be same'; - } + + if (this.adduserFrm.value.AccountNumberId == '0') { this.alerts += '
Please select account number'; } -- libgit2 0.21.4