ADAM / AIAHTML5

Commit 92bb2969055020fbf1f2f9c9040e00f23fb4c50d

Authored by Birendra Kumar
1 parent 906b18f0

more updated CI module to open in CB

Inline Side-by-side
Showing 4 changed files with 27 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @92bb296
... ... @@ -825,7 +825,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
825 825 theme: 'success',
826 826 currentController: 'CIController',
827 827 parentSlug: $scope.GetCIwindowStoreData(windowviewid, 'parentSlugName'),
828   - 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>' +
  828 + 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>' +
829 829 '<div class="col-sm-12 img-thumbnail" align="center">' +
830 830 '<img src="' + selectedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
831 831 '<div align="left" id="sid_' + windowviewid + '"><p>' + selectedImageCISummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button>' +
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @92bb296
... ... @@ -1320,6 +1320,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1320 1320 $rootScope.disableSubMenu = "disableSubMenu";
1321 1321 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1322 1322 $("#optionsListManagerTab").addClass("disableSubMenu");
  1323 + $("#optiontSetting").addClass("disableSubMenu");
1323 1324 $rootScope.disableFileMenu = " ";
1324 1325 $rootScope.openResources = "openResources";
1325 1326 $rootScope.OpenPitures = "OpenPitures";
... ... @@ -1333,6 +1334,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1333 1334 else if ($location.url() == "/module-item-view") {
1334 1335 $rootScope.disableMenuannotation = " ";
1335 1336 $rootScope.disableMenuoption = " ";
  1337 + $("#optiontSetting").addClass("disableSubMenu");
1336 1338 $rootScope.disableSubMenu = "disableSubMenu";
1337 1339 $("#annotationToolBarOptions").removeClass("disableSubMenu");
1338 1340 $rootScope.disableFileMenu = " ";
... ... @@ -1348,7 +1350,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
1348 1350  
1349 1351 else if ($location.url() == "/clinical-animations-detail") {
1350 1352 $rootScope.disableMenuannotation = "disableMenuannotation";
1351   - $rootScope.disableMenuoption = " ";
  1353 + $rootScope.disableMenuoption = "disableMenuoption";
1352 1354 $rootScope.disableSubMenu = "disableSubMenu";
1353 1355 $("#annotationToolBarOptions").addClass("disableSubMenu");
1354 1356 $("#optionsListManagerTab").addClass("disableSubMenu");
... ... @@ -5324,7 +5326,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5324 5326 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
5325 5327 $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
5326 5328  
5327   - }, 1000);
  5329 + }, 500);
5328 5330 }
5329 5331 else {
5330 5332 $('#termList option[selected="selected"]').prop("selected", false);
... ... @@ -5369,7 +5371,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5369 5371 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
5370 5372 $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
5371 5373  
5372   - }, 1000);
  5374 + }, 500);
5373 5375 }
5374 5376 $("#optionsListManagerTab").addClass("active");
5375 5377 var viewNameAftrSplit;
... ... @@ -5391,6 +5393,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5391 5393  
5392 5394 $rootScope.CloseListManager = function () {
5393 5395  
  5396 +
  5397 + $('#listManager').css('display', 'none');
  5398 + $("#listManager").css("visibility", "hidden");
  5399 +
5394 5400 $scope.GetDocumentElement();
5395 5401 var canvasPaintElement = $scope.canvasPaintElement;
5396 5402 if (canvasPaintElement == null) return;
... ... @@ -5427,9 +5433,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
5427 5433 $rootScope.selectedBodySystemName = $("#AABodySystems").val();
5428 5434 $rootScope.selectedBodySystemId = $('#AABodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').attr("id");
5429 5435 }
5430   - $('#listManager').css('display', 'none');
5431   - $("#listManager").css("visibility", "hidden");
5432   -
  5436 +
5433 5437 $rootScope.isLoading = false;
5434 5438 $('#spinner').css('visibility', 'hidden');
5435 5439 //$('#spinner').css('display', 'none');
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.html
  View file @92bb296
... ... @@ -39,7 +39,11 @@
39 39 <label for="inputPassword3" class="col-sm-4 control-label">Confirm Password <span class="red">*</span> :</label>
40 40 <div class="col-sm-7">
41 41 <input type="password" class="form-control input-sm" id="cpassword" placeholder="" formControlName="ConfirmPassword">
42   - <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>
  42 + <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>
  43 +
  44 + <div *ngIf="adduserFrm.controls.ConfirmPassword.value!=adduserFrm.controls.Password.value && adduserFrm.controls.ConfirmPassword.valid" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">
  45 + Password not match.
  46 + </div>
43 47 </div>
44 48 </div>
45 49 <div class="form-group">
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
  View file @92bb296
... ... @@ -196,31 +196,33 @@ export class AddUser implements OnInit, AfterViewInit {
196 196  
197 197 this.alerts = '';
198 198  
199   - if (this.adduserFrm.value.UserName == '') {
  199 + if (this.adduserFrm.value.UserName == '' ||(!this.adduserFrm.controls.UserName.valid))
  200 + {
200 201 this.alerts += '<span>User Name of minimum 8 characters is required.</span>';
201 202 }
202   - if (this.adduserFrm.value.Password == '') {
  203 + if (this.adduserFrm.value.Password == '' ||(!this.adduserFrm.controls.Password.valid )) {
203 204 this.alerts += '</br><span>Password of minimum 8 characters is required.</span>';
204 205 }
205 206  
206 207 if (this.adduserFrm.value.ConfirmPassword == '') {
207 208 this.alerts += '</br><span>Confirm Password is required.</span>';
208 209 }
209   - if (this.adduserFrm.value.EmailId == '') {
  210 + if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
  211 + this.alerts += '</br><span>Password and confirm password must be same</span>';
  212 + }
  213 +
  214 + if (this.adduserFrm.value.EmailId == '' ||(!this.adduserFrm.controls.EmailId.valid)) {
210 215 this.alerts += '</br><span>Email Id is required.</span>';
211 216 }
212   - //if(this.LicenseTypeId!=1)
213   - //{
  217 +
214 218 if (this.adduserFrm.value.FirstName == '') {
215 219 this.alerts += '</br><span>First Name is required.</span>';
216 220 }
217 221 if (this.adduserFrm.value.LastName == '') {
218 222 this.alerts += '</br><span>Last Name is required.</span>';
219 223 }
220   - // }
221   - if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
222   - this.alerts += '</br><span>Password and confirm password must be same</span>';
223   - }
  224 +
  225 +
224 226 if (this.adduserFrm.value.AccountNumberId == '0') {
225 227 this.alerts += '</br><span>Please select account number</span>';
226 228 }
... ...