more updated CI module to open in CB

Birendra Kumar
1 parent 906b18f0
Showing 4 changed files with 27 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html
400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
@@ -825,7 +825,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                 theme: 'success',
                 currentController: 'CIController',
                 parentSlug: $scope.GetCIwindowStoreData(windowviewid, 'parentSlugName'),
-                content: '<div class="row" id="canvasDivCI_' + windowviewid + '"><div style="align:left;"><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="1340" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="1340" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas></div>' +
+                content: '<div class="row" id="canvasDivCI_' + windowviewid + '"><div style="align:left;"><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="1340" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)"  width="1340" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas></div>' +
                 '<div class="col-sm-12 img-thumbnail" align="center">' +
                 '<img src="' + selectedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
                 '<div align="left" id="sid_' + windowviewid + '"><p>' + selectedImageCISummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button>' +
@@ -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');
@@ -39,7 +39,11 @@
                     <label for="inputPassword3" class="col-sm-4 control-label">Confirm Password <span class="red">*</span> :</label>
                     <div class="col-sm-7">
                       <input type="password" class="form-control input-sm" id="cpassword" placeholder="" formControlName="ConfirmPassword">
-                      <div *ngIf="!adduserFrm.controls.ConfirmPassword.valid && adduserFrm.controls.ConfirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm Password is required</div>
+                      <div *ngIf="!adduserFrm.controls.ConfirmPassword.valid && !adduserFrm.controls.ConfirmPassword.value && adduserFrm.controls.ConfirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm Password is required</div>
+                     
+                      <div *ngIf="adduserFrm.controls.ConfirmPassword.value!=adduserFrm.controls.Password.value && adduserFrm.controls.ConfirmPassword.valid" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">
+                        Password not match.
+                      </div>
                     </div>
                   </div>
                   <div class="form-group">
@@ -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 += '<span>User Name of minimum 8 characters is required.</span>';
     }
-    if (this.adduserFrm.value.Password == '') {
+    if (this.adduserFrm.value.Password == '' ||(!this.adduserFrm.controls.Password.valid )) {
       this.alerts += '</br><span>Password of minimum 8 characters is required.</span>';
     }
     if (this.adduserFrm.value.ConfirmPassword == '') {
       this.alerts += '</br><span>Confirm Password is required.</span>';
     }
-    if (this.adduserFrm.value.EmailId == '') {
+    if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
+      this.alerts += '</br><span>Password and confirm password must be same</span>';
+    }
+    
+    if (this.adduserFrm.value.EmailId == '' ||(!this.adduserFrm.controls.EmailId.valid)) {
       this.alerts += '</br><span>Email Id is required.</span>';
     }
-    //if(this.LicenseTypeId!=1)
-    //{        
+          
     if (this.adduserFrm.value.FirstName == '') {
     this.alerts += '</br><span>First Name is required.</span>';
     }
     if (this.adduserFrm.value.LastName == '') {
     this.alerts += '</br><span>Last Name is required.</span>';
      }
-     // }
-    if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
-      this.alerts += '</br><span>Password and confirm password must be same</span>';
-    }
+ 
+  
     if (this.adduserFrm.value.AccountNumberId == '0') {
       this.alerts += '</br><span>Please select account number</span>';
     }