ADAM / AIAHTML5

Commit 90d6be647a2d3a6f9478a502aefaffc75a15929d

Authored by Birendra
1 parent a7e53625

improve report grid columns and other bugs

Inline Side-by-side
Showing 20 changed files with 423 additions and 303 deletions
400-SOURCECODE/AIAHTML5.API/Constants/ErrorHelper.cs
  View file @90d6be6
@@ -71,6 +71,8 @@ namespace AIAHTML5.API.Constants @@ -71,6 +71,8 @@ namespace AIAHTML5.API.Constants
71 public const int EDITION_NOT_EXIST = 3; 71 public const int EDITION_NOT_EXIST = 3;
72 public const int MASTER_SITEIP_NOT_EXIST = 2; 72 public const int MASTER_SITEIP_NOT_EXIST = 2;
73 public const int LICENSE_INACTIVE = 6; 73 public const int LICENSE_INACTIVE = 6;
  74 + public const int LICENSE_EXPIRED = 7;
  75 + public const int LICENSE_NOTSTARTED = 8;
74 76
75 77
76 /// <summary> 78 /// <summary>
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
  View file @90d6be6
@@ -307,15 +307,26 @@ namespace AIAHTML5.API.Controllers @@ -307,15 +307,26 @@ namespace AIAHTML5.API.Controllers
307 string expirationDate = null; 307 string expirationDate = null;
308 bool isLicenseExpired = false; 308 bool isLicenseExpired = false;
309 309
  310 + // validate license start date
  311 + string startDate = null;
  312 + bool isSubscriptionNotStart = false;
  313 +
310 if (userInfo.LicenseSubscriptions != null) 314 if (userInfo.LicenseSubscriptions != null)
311 { 315 {
  316 + isSubscriptionNotStart = AIAHTML5.API.Models.Users.checkIfLicenseNotStarted(userInfo.LicenseSubscriptions, out startDate);
  317 +
312 isLicenseExpired = AIAHTML5.API.Models.Users.checkIfLicenseExpired(userInfo.LicenseSubscriptions, out expirationDate); 318 isLicenseExpired = AIAHTML5.API.Models.Users.checkIfLicenseExpired(userInfo.LicenseSubscriptions, out expirationDate);
313 } 319 }
314 320
315 if (isLicenseExpired) 321 if (isLicenseExpired)
316 { 322 {
317 userInfo.IsSubscriptionExpired = isLicenseExpired; 323 userInfo.IsSubscriptionExpired = isLicenseExpired;
318 - userInfo.SubscriptionExpirationDate = expirationDate; 324 + userInfo.SubscriptionExpirationDate = expirationDate;
  325 + }
  326 + else if (isSubscriptionNotStart)
  327 + {
  328 + userInfo.IsSubscriptionNotStart = isSubscriptionNotStart;
  329 + userInfo.SubscriptionStartDate = startDate;
319 } 330 }
320 else 331 else
321 { 332 {
@@ -323,7 +334,6 @@ namespace AIAHTML5.API.Controllers @@ -323,7 +334,6 @@ namespace AIAHTML5.API.Controllers
323 334
324 userInfo.IsModestyOn = AIAHTML5.API.Models.Users.IsModestyActiveForThisLicense(userInfo.LicenseId, Convert.ToInt16(userInfo.EditionId)); 335 userInfo.IsModestyOn = AIAHTML5.API.Models.Users.IsModestyActiveForThisLicense(userInfo.LicenseId, Convert.ToInt16(userInfo.EditionId));
325 336
326 -  
327 } 337 }
328 } 338 }
329 339
400-SOURCECODE/AIAHTML5.API/Models/User.cs
  View file @90d6be6
@@ -47,7 +47,9 @@ namespace AIAHTML5.API.Models @@ -47,7 +47,9 @@ namespace AIAHTML5.API.Models
47 public License LicenseInfo { get; set; } 47 public License LicenseInfo { get; set; }
48 public LicenseSubscriptionDetails LicenseSubscriptions { get; set; } 48 public LicenseSubscriptionDetails LicenseSubscriptions { get; set; }
49 public LicenseUserExportedImageDetail UserExportImageDetail { get; set; } 49 public LicenseUserExportedImageDetail UserExportImageDetail { get; set; }
50 - 50 +
  51 + public bool IsSubscriptionNotStart { get; set; }
  52 + public string SubscriptionStartDate { get; set; }
51 public bool IsSubscriptionExpired { get; set; } 53 public bool IsSubscriptionExpired { get; set; }
52 public string SubscriptionExpirationDate { get; set; } 54 public string SubscriptionExpirationDate { get; set; }
53 public string TermsAndConditionsTitle { get; set; } 55 public string TermsAndConditionsTitle { get; set; }
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
  View file @90d6be6
@@ -159,6 +159,27 @@ namespace AIAHTML5.API.Models @@ -159,6 +159,27 @@ namespace AIAHTML5.API.Models
159 return false; 159 return false;
160 } 160 }
161 161
  162 + internal static bool checkIfLicenseNotStarted(LicenseSubscriptionDetails subscriptionDetail, out string startDate)
  163 + {
  164 + startDate = string.Empty;
  165 + bool IsSubscriptionNotStart = false;
  166 +
  167 + // validate stat date for new license
  168 + if (subscriptionDetail != null && subscriptionDetail.RenewalDate==null)
  169 + {
  170 + DateTime? SubscriptionValidFrom = subscriptionDetail.SubscriptionValidFrom;
  171 + if (SubscriptionValidFrom != null && SubscriptionValidFrom.Value.Date <= DateTime.Now.Date)
  172 + {
  173 + IsSubscriptionNotStart = false;
  174 + }
  175 + else
  176 + {
  177 + IsSubscriptionNotStart = true;
  178 + startDate = subscriptionDetail.SubscriptionValidFrom.Value.Date.ToString("MM/dd/yyyy").ToString();
  179 + }
  180 + }
  181 + return IsSubscriptionNotStart;
  182 + }
162 internal static bool checkIfLicenseExpired(LicenseSubscriptionDetails subscriptionDetail, out string expirationDate) 183 internal static bool checkIfLicenseExpired(LicenseSubscriptionDetails subscriptionDetail, out string expirationDate)
163 { 184 {
164 expirationDate = string.Empty; 185 expirationDate = string.Empty;
@@ -507,9 +528,15 @@ namespace AIAHTML5.API.Models @@ -507,9 +528,15 @@ namespace AIAHTML5.API.Models
507 528
508 public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId) 529 public static User ValidateSiteLogin(String strSiteIP, String strAcccountNumber, String strUrlReferer, string strEdition, int intSiteId)
509 { 530 {
510 - bool isExpired = false;  
511 User userInfo = null; 531 User userInfo = null;
512 - 532 +
  533 + string expirationDate = null;
  534 + bool isLicenseExpired = false;
  535 +
  536 + // validate license start date
  537 + string startDate = null;
  538 + bool isSubscriptionNotStart = false;
  539 +
513 int intLicenseId = 0; 540 int intLicenseId = 0;
514 int intEditionId = Convert.ToInt16(strEdition); 541 int intEditionId = Convert.ToInt16(strEdition);
515 542
@@ -541,26 +568,32 @@ namespace AIAHTML5.API.Models @@ -541,26 +568,32 @@ namespace AIAHTML5.API.Models
541 //05.3 get licenseSubscription details 568 //05.3 get licenseSubscription details
542 userInfo.LicenseSubscriptions = AIAHTML5.API.Models.Users.getLicenseSubscriptionDetails( userInfo.LicenseInfo.Id); 569 userInfo.LicenseSubscriptions = AIAHTML5.API.Models.Users.getLicenseSubscriptionDetails( userInfo.LicenseInfo.Id);
543 570
544 - //05.4 check the License expiration irespective of either user is active or not because on AIA  
545 - //we shows the License expiration message for inactive users too  
546 - 571 + //05.4 check the License expiration irespective of either user is active or not because on AIA
  572 + //we shows the License expiration message for inactive users too
547 573
548 if (userInfo.LicenseSubscriptions != null) 574 if (userInfo.LicenseSubscriptions != null)
549 { 575 {
550 - DateTime? subscriptionValidThrough = userInfo.LicenseSubscriptions.SubscriptionValidThrough;  
551 - if (subscriptionValidThrough != null && subscriptionValidThrough.Value.Date >= DateTime.Now.Date)  
552 - {  
553 - isExpired = false;  
554 - }  
555 - else  
556 - {  
557 - isExpired = true;  
558 - }  
559 - } 576 + isSubscriptionNotStart = AIAHTML5.API.Models.Users.checkIfLicenseNotStarted(userInfo.LicenseSubscriptions, out startDate);
560 577
  578 + isLicenseExpired = AIAHTML5.API.Models.Users.checkIfLicenseExpired(userInfo.LicenseSubscriptions, out expirationDate);
  579 + }
561 580
  581 + if (Convert.ToBoolean(licRow["IsActive"]) != true)
  582 + {
  583 + userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE;
  584 + }
  585 + else if(isLicenseExpired)
  586 + {
  587 + userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_EXPIRED;
  588 + userInfo.SubscriptionExpirationDate = expirationDate;
  589 + }
  590 + else if (isSubscriptionNotStart)
  591 + {
  592 + userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_NOTSTARTED;
  593 + userInfo.SubscriptionStartDate = startDate;
562 594
563 - if (!isExpired && Convert.ToBoolean(licRow["IsActive"]) == true) 595 + }
  596 + else
564 { 597 {
565 //User objUserContext = new User(); 598 //User objUserContext = new User();
566 userInfo.Id = 0; 599 userInfo.Id = 0;
@@ -601,25 +634,19 @@ namespace AIAHTML5.API.Models @@ -601,25 +634,19 @@ namespace AIAHTML5.API.Models
601 // get edition features details 634 // get edition features details
602 userInfo.objEditionFeatures = objDBModel.GetEditionFeatures((Byte)intEditionId); 635 userInfo.objEditionFeatures = objDBModel.GetEditionFeatures((Byte)intEditionId);
603 636
604 -  
605 -  
606 if (intLicenseId > 0) 637 if (intLicenseId > 0)
607 userInfo.Modules = getModuleListByLicenseId(intLicenseId); 638 userInfo.Modules = getModuleListByLicenseId(intLicenseId);
608 else 639 else
609 userInfo.Modules = getAllModulesList(); 640 userInfo.Modules = getAllModulesList();
610 641
611 -  
612 // get exported image detail 642 // get exported image detail
613 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId); 643 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId);
614 644
615 - // insert login details  
616 - objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);  
617 -  
618 - }  
619 - else  
620 - {  
621 - userInfo.LoginFailureCauseId = ErrorHelper.LICENSE_INACTIVE; 645 + // insert login details
  646 + objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);
622 } 647 }
  648 +
  649 +
623 } 650 }
624 else 651 else
625 { 652 {
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @90d6be6
@@ -2671,7 +2671,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2671,7 +2671,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2671 2671
2672 } 2672 }
2673 else if ((viewOrientationId == '5')) { 2673 else if ((viewOrientationId == '5')) {
2674 - totalCanvas = 4; 2674 + totalCanvas = 1;//used canvas only one for annotation text and clicked.
2675 2675
2676 } 2676 }
2677 else if ((viewOrientationId == '6')) { 2677 else if ((viewOrientationId == '6')) {
@@ -2681,15 +2681,35 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2681,15 +2681,35 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2681 2681
2682 if ($scope.ColoredImageSRC.length < totalCanvas) { 2682 if ($scope.ColoredImageSRC.length < totalCanvas) {
2683 2683
  2684 + if (viewOrientationId == '5')
  2685 + {
  2686 + if(bodyRegionId==6)//used for arms only
  2687 + {
  2688 + $scope.ColoredImageSRC.push(
  2689 + {
  2690 + "bodyRegionId": bodyRegionId, "SRC": src,
  2691 + "Height": h,
  2692 + "Width": w,
  2693 + "x": x,
  2694 + "y": y,
  2695 + "haveMirror": 'true'
  2696 + } );
  2697 + }
  2698 +
  2699 + }
  2700 + else
  2701 + {
2684 $scope.ColoredImageSRC.push( 2702 $scope.ColoredImageSRC.push(
2685 - {  
2686 - "bodyRegionId": bodyRegionId, "SRC": src,  
2687 - "Height": h,  
2688 - "Width": w,  
2689 - "x": x,  
2690 - "y": y,  
2691 - "haveMirror": 'true'  
2692 - } ); 2703 + {
  2704 + "bodyRegionId": bodyRegionId, "SRC": src,
  2705 + "Height": h,
  2706 + "Width": w,
  2707 + "x": x,
  2708 + "y": y,
  2709 + "haveMirror": 'true'
  2710 + } );
  2711 + }
  2712 +
2693 2713
2694 } 2714 }
2695 2715
@@ -2716,7 +2736,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2716,7 +2736,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2716 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) { 2736 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
2717 isEligibleForHighlight = true; 2737 isEligibleForHighlight = true;
2718 } 2738 }
2719 - else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) { 2739 + else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 1)) {
2720 isEligibleForHighlight = true; 2740 isEligibleForHighlight = true;
2721 } 2741 }
2722 else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) { 2742 else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
@@ -3161,7 +3181,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3161,7 +3181,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3161 3181
3162 } 3182 }
3163 else if ((viewOrientationId == '5')) { 3183 else if ((viewOrientationId == '5')) {
3164 - totalCanvas = 4; 3184 + totalCanvas = 1;
3165 3185
3166 } 3186 }
3167 else if ((viewOrientationId == '6')) { 3187 else if ((viewOrientationId == '6')) {
@@ -3170,15 +3190,34 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3170,15 +3190,34 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3170 3190
3171 if ($scope.ColoredImageSRC.length < totalCanvas) { 3191 if ($scope.ColoredImageSRC.length < totalCanvas) {
3172 3192
  3193 + if (viewOrientationId == '5')
  3194 + {
  3195 + if(bodyRegionId==6)//used for arms only
  3196 + {
  3197 + $scope.ColoredImageSRC.push(
  3198 + {
  3199 + "bodyRegionId": bodyRegionId, "SRC": src,
  3200 + "Height": h,
  3201 + "Width": w,
  3202 + "x": x,
  3203 + "y": y,
  3204 + "haveMirror": 'false'
  3205 + } );
  3206 + }
  3207 +
  3208 + }
  3209 + else
  3210 + {
3173 $scope.ColoredImageSRC.push( 3211 $scope.ColoredImageSRC.push(
3174 - {  
3175 - "bodyRegionId": bodyRegionId, "SRC": src,  
3176 - "Height": h,  
3177 - "Width": w,  
3178 - "x": x,  
3179 - "y": y,  
3180 - "haveMirror": 'false'  
3181 - } ); 3212 + {
  3213 + "bodyRegionId": bodyRegionId, "SRC": src,
  3214 + "Height": h,
  3215 + "Width": w,
  3216 + "x": x,
  3217 + "y": y,
  3218 + "haveMirror": 'false'
  3219 + } );
  3220 + }
3182 3221
3183 } 3222 }
3184 3223
@@ -3205,7 +3244,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3205,7 +3244,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3205 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) { 3244 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
3206 isEligibleForHighlight = true; 3245 isEligibleForHighlight = true;
3207 } 3246 }
3208 - else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) { 3247 + else if ((viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 1)) {
3209 isEligibleForHighlight = true; 3248 isEligibleForHighlight = true;
3210 } 3249 }
3211 else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) { 3250 else if ((viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
@@ -3731,8 +3770,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3731,8 +3770,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3731 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) { 3770 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
3732 loopLength = 5; 3771 loopLength = 5;
3733 } 3772 }
3734 - else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {  
3735 - loopLength = 4; 3773 + else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
  3774 + loopLength = 1;
3736 } 3775 }
3737 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) { 3776 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
3738 loopLength = 1; 3777 loopLength = 1;
@@ -3912,7 +3951,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3912,7 +3951,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3912 $scope.SetwindowStoreData(windowviewid,'currentLayerNumber',nlayer); 3951 $scope.SetwindowStoreData(windowviewid,'currentLayerNumber',nlayer);
3913 3952
3914 $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val()); 3953 $scope.SetwindowStoreData(windowviewid,'layerNumber',$("#txtLayerNumberDA_" + windowviewid).val());
3915 - $scope.DisableUI(); 3954 + //$scope.DisableUI();
3916 console.log('HighlightBodyByTermList is called'); 3955 console.log('HighlightBodyByTermList is called');
3917 3956
3918 $scope.highlightedBR = []; 3957 $scope.highlightedBR = [];
@@ -3929,8 +3968,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3929,8 +3968,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3929 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) { 3968 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
3930 loopLength = 5; 3969 loopLength = 5;
3931 } 3970 }
3932 - else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {  
3933 - loopLength = 4; 3971 + else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
  3972 + loopLength = 1;
3934 } 3973 }
3935 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) { 3974 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
3936 loopLength = 1; 3975 loopLength = 1;
@@ -3977,12 +4016,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -3977,12 +4016,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3977 else { 4016 else {
3978 if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) { 4017 if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) {
3979 4018
3980 - if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) { 4019 + if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined){
3981 grayImageDataVar = grayImageMRDataList[bodyRegionId]; 4020 grayImageDataVar = grayImageMRDataList[bodyRegionId];
3982 } 4021 }
3983 } 4022 }
3984 else { 4023 else {
3985 - if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] != undefined) { 4024 + if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] != undefined) {
3986 grayImageDataVar = updatedGrayMRDataList[bodyRegionId] 4025 grayImageDataVar = updatedGrayMRDataList[bodyRegionId]
3987 } 4026 }
3988 } 4027 }
@@ -4002,12 +4041,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -4002,12 +4041,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4002 4041
4003 //on layer change we need the fresh data not the updated one 4042 //on layer change we need the fresh data not the updated one
4004 if ($scope.isLayerChange == true) { 4043 if ($scope.isLayerChange == true) {
4005 - if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined)) { 4044 + if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] !=null || updatedGrayDataList[bodyRegionId - 1] != undefined)) {
4006 4045
4007 grayImageDataVar = updatedGrayDataList[bodyRegionId - 1]; 4046 grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
4008 } 4047 }
4009 4048
4010 - else if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) { 4049 + else if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] !=undefined) {
4011 grayImageDataVar = grayImageDataList[bodyRegionId - 1]; 4050 grayImageDataVar = grayImageDataList[bodyRegionId - 1];
4012 4051
4013 } 4052 }
@@ -4015,15 +4054,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -4015,15 +4054,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4015 } else { 4054 } else {
4016 // this code is for the case where user first click on normal mode then extract then again highlight then we need to call highlight body in gray mode 4055 // this code is for the case where user first click on normal mode then extract then again highlight then we need to call highlight body in gray mode
4017 //and then highlight the previously selected body regions at the time of normal mode. 4056 //and then highlight the previously selected body regions at the time of normal mode.
4018 - if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) 4057 + if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] ==undefined)
4019 { 4058 {
4020 - if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) { 4059 + if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
4021 grayImageDataVar = grayImageDataList[bodyRegionId - 1]; 4060 grayImageDataVar = grayImageDataList[bodyRegionId - 1];
4022 } 4061 }
4023 4062
4024 } 4063 }
4025 else { 4064 else {
4026 - if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined) { 4065 + if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] !=undefined) {
4027 // for normal case means without interdepency button case. 4066 // for normal case means without interdepency button case.
4028 grayImageDataVar = updatedGrayDataList[bodyRegionId - 1]; 4067 grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
4029 } 4068 }
@@ -9138,7 +9177,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9138,7 +9177,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9138 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) { 9177 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
9139 doHighlightOrExtract = true; 9178 doHighlightOrExtract = true;
9140 } 9179 }
9141 - else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 4)) { 9180 + else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 1)) {
9142 doHighlightOrExtract = true; 9181 doHighlightOrExtract = true;
9143 } 9182 }
9144 else if (((viewOrientationId == '6')) && (ColoredImageSRC.length == 1)) { 9183 else if (((viewOrientationId == '6')) && (ColoredImageSRC.length == 1)) {
@@ -9274,7 +9313,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9274,7 +9313,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9274 9313
9275 } 9314 }
9276 else if ((viewOrientationId == '5')) { 9315 else if ((viewOrientationId == '5')) {
9277 - totalCanvas = 4; 9316 + totalCanvas = 1;
9278 9317
9279 } 9318 }
9280 else if ((viewOrientationId == '6')) { 9319 else if ((viewOrientationId == '6')) {
@@ -9320,7 +9359,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -9320,7 +9359,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9320 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) { 9359 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
9321 isEligibleForHighlightBodyByTermList = true; 9360 isEligibleForHighlightBodyByTermList = true;
9322 } 9361 }
9323 - else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) { 9362 + else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 1)) {
9324 isEligibleForHighlightBodyByTermList = true; 9363 isEligibleForHighlightBodyByTermList = true;
9325 } 9364 }
9326 else if (((viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) { 9365 else if (((viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
@@ -10330,7 +10369,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -10330,7 +10369,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10330 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (grayedBR.length == 5)) { 10369 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (grayedBR.length == 5)) {
10331 $scope.isAlreadyHighlighted = true; 10370 $scope.isAlreadyHighlighted = true;
10332 } 10371 }
10333 - else if (((viewOrientationId == '5')) && (grayedBR.length == 4)) { 10372 + else if (((viewOrientationId == '5')) && (grayedBR.length == 1)) {
10334 $scope.isAlreadyHighlighted = true; 10373 $scope.isAlreadyHighlighted = true;
10335 } 10374 }
10336 else if (((viewOrientationId == '6')) && (grayedBR.length == 1)) { 10375 else if (((viewOrientationId == '6')) && (grayedBR.length == 1)) {
@@ -10514,7 +10553,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -10514,7 +10553,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10514 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) { 10553 else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
10515 $scope.EnableUI(); 10554 $scope.EnableUI();
10516 } 10555 }
10517 - else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) { 10556 + else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
10518 $scope.EnableUI(); 10557 $scope.EnableUI();
10519 } 10558 }
10520 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) { 10559 else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @90d6be6
@@ -995,6 +995,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -995,6 +995,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
995 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.'; 995 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
996 $("#messageModal").modal('show'); 996 $("#messageModal").modal('show');
997 } 997 }
  998 + else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && (result.IsSubscriptionNotStart)) {
  999 + // validation for new license which license start date is future date .
  1000 + $rootScope.isVisibleLogin = true;
  1001 + $rootScope.LoginEnableUI();
  1002 + $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
  1003 + $("#messageModal").modal('show');
  1004 + }
998 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) { 1005 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
999 $rootScope.isVisibleLogin = true; 1006 $rootScope.isVisibleLogin = true;
1000 $rootScope.LoginEnableUI(); 1007 $rootScope.LoginEnableUI();
@@ -1376,7 +1383,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -1376,7 +1383,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1376 .then( 1383 .then(
1377 function (result) { 1384 function (result) {
1378 console.log(result); 1385 console.log(result);
1379 - if (result != null) { 1386 + if (result != null)
  1387 + {
1380 console.log(result); 1388 console.log(result);
1381 if (result == LoginConstants.INVALID_CLIENT) { 1389 if (result == LoginConstants.INVALID_CLIENT) {
1382 $rootScope.isVisibleLogin = true; 1390 $rootScope.isVisibleLogin = true;
@@ -1390,7 +1398,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -1390,7 +1398,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1390 $rootScope.errorMessage = LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER; 1398 $rootScope.errorMessage = LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER;
1391 $("#messageModal").modal('show'); 1399 $("#messageModal").modal('show');
1392 } 1400 }
1393 -  
1394 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_ACCOUNT_NUMBER_NOT_NULL) { 1401 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_ACCOUNT_NUMBER_NOT_NULL) {
1395 $rootScope.isVisibleLogin = true; 1402 $rootScope.isVisibleLogin = true;
1396 $rootScope.LoginEnableUI(); 1403 $rootScope.LoginEnableUI();
@@ -1415,159 +1422,169 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -1415,159 +1422,169 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1415 $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE; 1422 $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
1416 $("#messageModal").modal('show'); 1423 $("#messageModal").modal('show');
1417 } 1424 }
  1425 + else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_EXPIRED) {
  1426 + $rootScope.isVisibleLogin = true;
  1427 + $rootScope.LoginEnableUI();
  1428 + $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1429 + $("#messageModal").modal('show');
  1430 + }
  1431 + else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_NOTSTARTED) {
  1432 + $rootScope.isVisibleLogin = true;
  1433 + $rootScope.LoginEnableUI();
  1434 + $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
  1435 + $("#messageModal").modal('show');
  1436 + }
  1437 + else
  1438 + {
  1439 + // update result with session detail
  1440 + result.aiaIdleTime=$rootScope.aiaIdleTime;
  1441 + result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
  1442 + result.aiaPingInterval=$rootScope.aiaPingInterval;
  1443 + result.SessionId=siteInfo.SessionId;
  1444 + //display user name
  1445 + $rootScope.userName=result.FirstName+" "+result.LastName;
  1446 + if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {
  1447 + //code for modesty setting
  1448 + if (result.LicenseInfo != null) {
  1449 + if (result.Modesty) {
  1450 + $rootScope.isModestyOn = true;
  1451 + $rootScope.isModestyOff = false;
  1452 + localStorage.setItem("globalModesty", "Y");
  1453 + $rootScope.formsetting = {
  1454 + ethnicity: null,
  1455 + modesty: "Y"
  1456 + }
  1457 + $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
  1458 + }
  1459 + else {
  1460 + $rootScope.isModestyOn = false;
  1461 + $rootScope.isModestyOff = true;
  1462 + localStorage.setItem("globalModesty", "N");
  1463 + $rootScope.formsetting = {
  1464 + ethnicity: null,
  1465 + modesty: "N"
  1466 + }
  1467 + $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
  1468 + }
  1469 + }
  1470 + else {
  1471 + $rootScope.isModestyOn = true;
  1472 + $rootScope.isModestyOff = false;
  1473 + localStorage.setItem("globalModesty", "Y");
  1474 + $rootScope.formsetting = {
  1475 + ethnicity: null,
  1476 + modesty: "Y"
  1477 + }
  1478 + $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
  1479 + }
  1480 + //code for modesty setting
  1481 + $rootScope.aiaModesty = $rootScope.formsetting.modesty;
1418 1482
  1483 + $rootScope.siteId = result.siteId;
1419 1484
1420 - else {  
1421 - // update result with session detail  
1422 - result.aiaIdleTime=$rootScope.aiaIdleTime;  
1423 - result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;  
1424 - result.aiaPingInterval=$rootScope.aiaPingInterval;  
1425 - result.SessionId=siteInfo.SessionId;  
1426 - //display user name  
1427 - $rootScope.userName=result.FirstName+" "+result.LastName;  
1428 - if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {  
1429 - //code for modesty setting  
1430 - if (result.LicenseInfo != null) {  
1431 - if (result.Modesty) {  
1432 - $rootScope.isModestyOn = true;  
1433 - $rootScope.isModestyOff = false;  
1434 - localStorage.setItem("globalModesty", "Y");  
1435 - $rootScope.formsetting = {  
1436 - ethnicity: null,  
1437 - modesty: "Y"  
1438 - }  
1439 - $rootScope.UpdateAndCloseSetting($rootScope.formsetting)  
1440 - }  
1441 - else {  
1442 - $rootScope.isModestyOn = false;  
1443 - $rootScope.isModestyOff = true;  
1444 - localStorage.setItem("globalModesty", "N");  
1445 - $rootScope.formsetting = {  
1446 - ethnicity: null,  
1447 - modesty: "N"  
1448 - }  
1449 - $rootScope.UpdateAndCloseSetting($rootScope.formsetting)  
1450 - }  
1451 - }  
1452 - else {  
1453 - $rootScope.isModestyOn = true;  
1454 - $rootScope.isModestyOff = false;  
1455 - localStorage.setItem("globalModesty", "Y");  
1456 - $rootScope.formsetting = {  
1457 - ethnicity: null,  
1458 - modesty: "Y"  
1459 - }  
1460 - $rootScope.UpdateAndCloseSetting($rootScope.formsetting)  
1461 - }  
1462 - //code for modesty setting  
1463 - $rootScope.aiaModesty = $rootScope.formsetting.modesty;  
1464 -  
1465 - $rootScope.siteId = result.siteId;  
1466 -  
1467 - // birendra// initialize exp img detail object  
1468 - $rootScope.initializeUserForExportImage(result.Id);  
1469 -  
1470 - //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true  
1471 - if (result.LicenseId == 0) {  
1472 - $rootScope.haveRoleAdmin = true; 1485 + // birendra// initialize exp img detail object
  1486 + $rootScope.initializeUserForExportImage(result.Id);
1473 1487
1474 - // set license id -1 for admin  
1475 - $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1) 1488 + //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
  1489 + if (result.LicenseId == 0) {
  1490 + $rootScope.haveRoleAdmin = true;
1476 1491
1477 - // set enable export image for admin  
1478 - $scope.UpdateUserExportImageData(result.Id,'isExportImage',true); 1492 + // set license id -1 for admin
  1493 + $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1)
1479 1494
1480 - $rootScope.userData = result;  
1481 - $rootScope.userModules = result.Modules; 1495 + // set enable export image for admin
  1496 + $scope.UpdateUserExportImageData(result.Id,'isExportImage',true);
1482 1497
1483 - localStorage.setItem('loggedInUserDetails', JSON.stringify(result));  
1484 -  
1485 - if (isCommingSoonModel == true) { 1498 + $rootScope.userData = result;
  1499 + $rootScope.userModules = result.Modules;
1486 1500
1487 - ShowAssignedModulesPopup(result.Modules); 1501 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
  1502 +
  1503 + if (isCommingSoonModel == true) {
1488 1504
  1505 + ShowAssignedModulesPopup(result.Modules);
1489 1506
1490 - sessionStorage.setItem("loginSession", "true");  
1491 - localStorage.setItem('isCommingSoonModel', false);  
1492 1507
1493 - $rootScope.isVisibleLogin = false;  
1494 - } 1508 + sessionStorage.setItem("loginSession", "true");
  1509 + localStorage.setItem('isCommingSoonModel', false);
1495 1510
  1511 + $rootScope.isVisibleLogin = false;
  1512 + }
1496 1513
1497 - $location.path('/');  
1498 1514
1499 - }  
1500 - else {  
1501 - if (result.LicenseInfo != null ) { 1515 + $location.path('/');
1502 1516
1503 - //only site instructor allowed to change modesty  
1504 - if(result.EditionId!=1 && result.EditionId!=2)  
1505 - {  
1506 - $("#modestyDiv").css("pointer-events", "none");  
1507 - $("#modestyDiv").css("opacity", 0.5);  
1508 - $("#modestyDiv").find("*").prop('disabled', true);  
1509 - } 1517 + }
  1518 + else {
  1519 + if (result.LicenseInfo != null ) {
1510 1520
1511 - // set license id  
1512 - $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId) 1521 + //only site instructor allowed to change modesty
  1522 + if(result.EditionId!=1 && result.EditionId!=2)
  1523 + {
  1524 + $("#modestyDiv").css("pointer-events", "none");
  1525 + $("#modestyDiv").css("opacity", 0.5);
  1526 + $("#modestyDiv").find("*").prop('disabled', true);
  1527 + }
1513 1528
1514 - // set license type :note 5 for demo/test license  
1515 - $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId); 1529 + // set license id
  1530 + $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
1516 1531
1517 - if(result.UserExportImageDetail!=null)  
1518 - {  
1519 - // set already export image count  
1520 - $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage); 1532 + // set license type :note 5 for demo/test license
  1533 + $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
1521 1534
1522 - // set Image limit  
1523 - $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit); 1535 + if(result.UserExportImageDetail!=null)
  1536 + {
  1537 + // set already export image count
  1538 + $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
1524 1539
1525 - // set is enable for export image  
1526 - $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);  
1527 - } 1540 + // set Image limit
  1541 + $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
1528 1542
  1543 + // set is enable for export image
  1544 + $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
  1545 + }
1529 1546
1530 - $rootScope.userData = result;  
1531 - $rootScope.userModules = result.Modules;  
1532 1547
1533 - //1. set haveRoleAdmin = false because LicenseInfo is not null  
1534 - $rootScope.haveRoleAdmin = false; 1548 + $rootScope.userData = result;
  1549 + $rootScope.userModules = result.Modules;
1535 1550
1536 - //2.  
1537 - localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); 1551 + //1. set haveRoleAdmin = false because LicenseInfo is not null
  1552 + $rootScope.haveRoleAdmin = false;
1538 1553
1539 - //5.  
1540 - sessionStorage.setItem("loginSession", "true");  
1541 - $rootScope.isVisibleLogin = false; 1554 + //2.
  1555 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
1542 1556
1543 - //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time  
1544 - // localStorage.setItem('isCommingSoonModel', false); 1557 + //5.
  1558 + sessionStorage.setItem("loginSession", "true");
  1559 + $rootScope.isVisibleLogin = false;
1545 1560
1546 - $location.path('/'); 1561 + //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
  1562 + // localStorage.setItem('isCommingSoonModel', false);
1547 1563
1548 - }  
1549 - else {  
1550 - if ($('#dvTerms').length > 0) {  
1551 - $('#dvTerms').html(result.TermsAndConditionsText);  
1552 - }  
1553 - $rootScope.isVisibleLogin = true;  
1554 - $rootScope.LoginEnableUI();  
1555 - $('#dvTermCondition').fadeIn();  
1556 - $rootScope.userData = result;  
1557 - $rootScope.haveRoleAdmin = false;  
1558 - localStorage.setItem('loggedInUserDetails', JSON.stringify(result));  
1559 - $location.path('/');  
1560 - }  
1561 - }  
1562 - $rootScope.LoginEnableUI();  
1563 - // set user session time  
1564 - $rootScope.loadUserSession(); 1564 + $location.path('/');
1565 1565
1566 - } 1566 + }
  1567 + else {
  1568 + if ($('#dvTerms').length > 0) {
  1569 + $('#dvTerms').html(result.TermsAndConditionsText);
  1570 + }
  1571 + $rootScope.isVisibleLogin = true;
  1572 + $rootScope.LoginEnableUI();
  1573 + $('#dvTermCondition').fadeIn();
  1574 + $rootScope.userData = result;
  1575 + $rootScope.haveRoleAdmin = false;
  1576 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
  1577 + $location.path('/');
  1578 + }
  1579 + }
  1580 + $rootScope.LoginEnableUI();
  1581 + // set user session time
  1582 + $rootScope.loadUserSession();
1567 1583
  1584 + }
1568 1585
1569 - }  
1570 } 1586 }
  1587 + }
1571 1588
1572 }, 1589 },
1573 1590
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @90d6be6
@@ -397,7 +397,9 @@ AIA.constant(&quot;LoginConstants&quot;, { @@ -397,7 +397,9 @@ AIA.constant(&quot;LoginConstants&quot;, {
397 "ACCOUNT_NUMBER_NOT_EXIST": "1", 397 "ACCOUNT_NUMBER_NOT_EXIST": "1",
398 "EDITION_NOT_EXIST": "3", 398 "EDITION_NOT_EXIST": "3",
399 "MASTER_SITEIP_NOT_EXIST": "2", 399 "MASTER_SITEIP_NOT_EXIST": "2",
400 - "LICENSE_INACTIVE": "6", 400 + "LICENSE_INACTIVE": "6",
  401 + "SITELICENSE_EXPIRED": "7",
  402 + "SITELICENSE_NOTSTARTED": "8",
401 "INVALID_CLIENT": "Clinet is not valid", 403 "INVALID_CLIENT": "Clinet is not valid",
402 "MSG_NOT_AUTHORIZE_SITE_USER": "User is not authorized.", 404 "MSG_NOT_AUTHORIZE_SITE_USER": "User is not authorized.",
403 }); 405 });
@@ -422,6 +424,7 @@ AIA.constant(&quot;LoginMessageConstants&quot;, { @@ -422,6 +424,7 @@ AIA.constant(&quot;LoginMessageConstants&quot;, {
422 "PASSWORD_UPDATE_SUCCESS": "Password updated successfully", 424 "PASSWORD_UPDATE_SUCCESS": "Password updated successfully",
423 "PASSWORD_UPDATE_FAILED": "Password update failed", 425 "PASSWORD_UPDATE_FAILED": "Password update failed",
424 "SUBSCRIPTION_EXPIRATION_MESSAGE": "Your license is expired since ", 426 "SUBSCRIPTION_EXPIRATION_MESSAGE": "Your license is expired since ",
  427 + "SUBSCRIPTION_NOT_START_MESSAGE": "Your license Subscription is not started yet. It will continue on ",
425 "LICENSE_INACTIVE_MESSAGE": "Your license is inactive.", 428 "LICENSE_INACTIVE_MESSAGE": "Your license is inactive.",
426 "INVALID_USER": "Invalid UserID", 429 "INVALID_USER": "Invalid UserID",
427 "USER_INACTIVE_MESSAGE": "User ID is inactive.", 430 "USER_INACTIVE_MESSAGE": "User ID is inactive.",
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @90d6be6
@@ -286,7 +286,7 @@ @@ -286,7 +286,7 @@
286 <input name="inlineRadioOptions" id="inlineRadio1" value="unblock" type="radio"> Unblock 286 <input name="inlineRadioOptions" id="inlineRadio1" value="unblock" type="radio"> Unblock
287 </label> 287 </label>
288 <label class="radio-inline"> 288 <label class="radio-inline">
289 - <input name="inlineRadioOptions" id="inlineRadio2" value="forgotpwd" type="radio"> Forgot Password 289 + <input name="inlineRadioOptions" id="inlineRadio2" value="forgotpwd" type="radio" checked="true"> Forgot Password
290 </label> 290 </label>
291 </div> 291 </div>
292 </div> 292 </div>
400-SOURCECODE/Admin/src/app/app.component.ts
  View file @90d6be6
@@ -81,8 +81,10 @@ export class AppComponent implements OnInit { @@ -81,8 +81,10 @@ export class AppComponent implements OnInit {
81 // console.log("You\'ve gone idle!"); 81 // console.log("You\'ve gone idle!");
82 // }); 82 // });
83 83
84 - if(window.location.hostname=="localhost") 84 + if(window.location.host=="localhost:4200")
85 { 85 {
  86 + // for 'ng serve --open' command
  87 + //**** for localhost:4200 *****//
86 //insert new session 88 //insert new session
87 this.loginManageStatus('insert'); 89 this.loginManageStatus('insert');
88 } 90 }
@@ -149,7 +151,7 @@ export class AppComponent implements OnInit { @@ -149,7 +151,7 @@ export class AppComponent implements OnInit {
149 this._loadingService.HideLoading("global-loading"); 151 this._loadingService.HideLoading("global-loading");
150 } 152 }
151 153
152 - if(window.location.hostname!="localhost") 154 + if(window.location.host!="localhost:4200")
153 { 155 {
154 localStorage.removeItem('loggedInUserDetails'); 156 localStorage.removeItem('loggedInUserDetails');
155 window.location.href = window.location.origin; 157 window.location.href = window.location.origin;
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
  View file @90d6be6
@@ -480,7 +480,8 @@ @@ -480,7 +480,8 @@
480 <div class="col-sm-12"> 480 <div class="col-sm-12">
481 <div class="row"> 481 <div class="row">
482 <div class="col-sm-12 marginTop10 text-right"> 482 <div class="col-sm-12 marginTop10 text-right">
483 - <button class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Add</button> 483 + <button *ngIf="license.LicenseId <= 0" class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Add</button>
  484 + <button *ngIf="license.LicenseId > 0" class="btn btn-primary btn-sm" type="submit" [disabled]="!insertUpdateLicenseFrm.valid || alerts != '' || this.editionLoginsText == ''"><i class="fa fa-plus-circle "></i> Update</button>
484 <button *ngIf="license.LicenseId > 0" class="btn btn-primary btn-sm" type="button" (click)="CancelAddEdit()"><i class="fa fa-close"></i>Cancel</button> 485 <button *ngIf="license.LicenseId > 0" class="btn btn-primary btn-sm" type="button" (click)="CancelAddEdit()"><i class="fa fa-close"></i>Cancel</button>
485 </div> 486 </div>
486 </div> 487 </div>
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
  View file @90d6be6
@@ -12,6 +12,7 @@ import { BsModalRef } from &#39;ngx-bootstrap/modal/bs-modal-ref.service&#39;; @@ -12,6 +12,7 @@ import { BsModalRef } from &#39;ngx-bootstrap/modal/bs-modal-ref.service&#39;;
12 import { ContenteditableModelDirective } from '../../shared/contenteditabledirective'; 12 import { ContenteditableModelDirective } from '../../shared/contenteditabledirective';
13 import { NumberOnlyDirective } from '../../shared/numberonlydirective'; 13 import { NumberOnlyDirective } from '../../shared/numberonlydirective';
14 import { ConfirmService } from '../../shared/confirm/confirm.service'; 14 import { ConfirmService } from '../../shared/confirm/confirm.service';
  15 +import { LoadingService } from '../../shared/loading.service';
15 @Component({ 16 @Component({
16 templateUrl: './addlicense.component.html' 17 templateUrl: './addlicense.component.html'
17 }) 18 })
@@ -50,7 +51,7 @@ export class AddLicense implements OnInit { @@ -50,7 +51,7 @@ export class AddLicense implements OnInit {
50 dateEndInvalid: boolean = false; 51 dateEndInvalid: boolean = false;
51 dateRenewInvalid: boolean = false; 52 dateRenewInvalid: boolean = false;
52 NumberOfRows:number=0; 53 NumberOfRows:number=0;
53 - constructor(private licenseService: LicenseService, private globalService: GlobalService, 54 + constructor(private _loadingService: LoadingService,private licenseService: LicenseService, private globalService: GlobalService,
54 private router: Router, private activeRoute: ActivatedRoute, 55 private router: Router, private activeRoute: ActivatedRoute,
55 private fb: FormBuilder, private modalService: BsModalService,private _confirmService: ConfirmService) { 56 private fb: FormBuilder, private modalService: BsModalService,private _confirmService: ConfirmService) {
56 57
@@ -528,25 +529,29 @@ export class AddLicense implements OnInit { @@ -528,25 +529,29 @@ export class AddLicense implements OnInit {
528 AfterInsertData(data, template) { 529 AfterInsertData(data, template) {
529 if (data.Status == "false") { 530 if (data.Status == "false") {
530 this.alerts = "<span>License save unsuccessfull.</span>"; 531 this.alerts = "<span>License save unsuccessfull.</span>";
531 - } else { 532 + }
  533 + else
  534 + {
532 if(this.insertUpdateLicenseFrm.controls['licenseTypeId'].value==4) 535 if(this.insertUpdateLicenseFrm.controls['licenseTypeId'].value==4)
533 { 536 {
534 this._confirmService.activate("License saved successfully. Mail has been sent", "alertMsg"); 537 this._confirmService.activate("License saved successfully. Mail has been sent", "alertMsg");
535 } 538 }
536 else{ 539 else{
537 this._confirmService.activate("License saved successfully.", "alertMsg"); 540 this._confirmService.activate("License saved successfully.", "alertMsg");
538 - }  
539 - 541 + }
540 } 542 }
  543 + this._loadingService.HideLoading("global-loading");
541 } 544 }
542 545
543 AfterUpdateData(data, template) { 546 AfterUpdateData(data, template) {
544 if (data.Status == "false") { 547 if (data.Status == "false") {
545 this.alerts = "<span>License update unsuccessfull.</span>"; 548 this.alerts = "<span>License update unsuccessfull.</span>";
546 - } else {  
547 - this._confirmService.activate("License updated successfully.", "alertMsg");  
548 - 549 + }
  550 + else
  551 + {
  552 + this._confirmService.activate("License updated successfully.", "alertMsg");
549 } 553 }
  554 + this._loadingService.HideLoading("global-loading");
550 } 555 }
551 556
552 OnLoginBlur() { 557 OnLoginBlur() {
@@ -707,8 +712,17 @@ export class AddLicense implements OnInit { @@ -707,8 +712,17 @@ export class AddLicense implements OnInit {
707 } 712 }
708 else { 713 else {
709 this.insertUpdateLicenseFrm.controls['editionLoginArr'].value.forEach(element => { 714 this.insertUpdateLicenseFrm.controls['editionLoginArr'].value.forEach(element => {
710 - if (element.Login > 0) {  
711 - this.editionLoginsText += element.Id.toString() + '-' + element.Login + '|'; 715 + if (element.Checked > 0) {
  716 + if(element.Login=='')
  717 + {
  718 + //set 0 edition for update license
  719 + this.editionLoginsText += element.Id.toString() + '-' + 0 + '|';
  720 + }
  721 + else
  722 + {
  723 + this.editionLoginsText += element.Id.toString() + '-' + element.Login + '|';
  724 + }
  725 +
712 } 726 }
713 }); 727 });
714 } 728 }
@@ -724,7 +738,9 @@ export class AddLicense implements OnInit { @@ -724,7 +738,9 @@ export class AddLicense implements OnInit {
724 if (response == 'True') { 738 if (response == 'True') {
725 this.alerts += '<span>Account number already exists. Enter a different account number.</span>'; 739 this.alerts += '<span>Account number already exists. Enter a different account number.</span>';
726 } 740 }
727 - if (this.alerts == '') { 741 + if (this.alerts == '')
  742 + {
  743 + this._loadingService.ShowLoading("global-loading");
728 return this.licenseService.InsertLicense(obj) 744 return this.licenseService.InsertLicense(obj)
729 .subscribe( 745 .subscribe(
730 n => (this.AfterInsertData(n, template)), 746 n => (this.AfterInsertData(n, template)),
@@ -733,13 +749,15 @@ export class AddLicense implements OnInit { @@ -733,13 +749,15 @@ export class AddLicense implements OnInit {
733 }, 749 },
734 error => this.error = <any>error); 750 error => this.error = <any>error);
735 } 751 }
736 - else { 752 + else
  753 + {
737 if (this.insertUpdateLicenseFrm.controls['renew'].value && this.insertUpdateLicenseFrm.controls['renewDate'].value == undefined) { 754 if (this.insertUpdateLicenseFrm.controls['renew'].value && this.insertUpdateLicenseFrm.controls['renewDate'].value == undefined) {
738 this.alerts = 'Renew date is required'; 755 this.alerts = 'Renew date is required';
739 } 756 }
740 if (this.alerts == '') { 757 if (this.alerts == '') {
741 - console.log(this.insertUpdateLicenseFrm.controls['subscriptionStartDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['subscriptionEndDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['renewDate'].value);  
742 - console.log(obj.subscriptionStartDate + ', ' + obj.subscriptionEndDate + ', ' + obj.renewDate); 758 + //console.log(this.insertUpdateLicenseFrm.controls['subscriptionStartDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['subscriptionEndDate'].value + ', ' + this.insertUpdateLicenseFrm.controls['renewDate'].value);
  759 + // console.log(obj.subscriptionStartDate + ', ' + obj.subscriptionEndDate + ', ' + obj.renewDate);
  760 + this._loadingService.ShowLoading("global-loading");
743 return this.licenseService.UpdateLicense(obj) 761 return this.licenseService.UpdateLicense(obj)
744 .subscribe( 762 .subscribe(
745 n => (this.AfterUpdateData(n, template)), 763 n => (this.AfterUpdateData(n, template)),
400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
  View file @90d6be6
@@ -99,22 +99,22 @@ export class DiscountCodeReport implements OnInit { @@ -99,22 +99,22 @@ export class DiscountCodeReport implements OnInit {
99 width: "100%", 99 width: "100%",
100 height: this.scrHeight, 100 height: this.scrHeight,
101 colModal: [ 101 colModal: [
102 - { width: 180, align: 'center' }, 102 + { width: 200, align: 'center' },
103 { width: 230, align: 'center' }, 103 { width: 230, align: 'center' },
104 - { width: 150, align: 'Center' },  
105 - { width: 150, align: 'Center' }, 104 + { width: 250, align: 'Center' },
  105 + { width: 250, align: 'Center' },
106 { width: 350, align: 'Center' }, 106 { width: 350, align: 'Center' },
107 { width: 500, align: 'Center' }, 107 { width: 500, align: 'Center' },
108 - { width: 130, align: 'Center' },  
109 - { width: 120, align: 'center' },  
110 - { width: 280, align: 'Center' },  
111 - { width: 180, align: 'center' },  
112 - { width: 200, align: 'center' },  
113 - { width: 170, align: 'center' },  
114 - { width: 80, align: 'center' },  
115 - { width: 150, align: 'center' },  
116 - { width: 150, align: 'center' },  
117 - { width: 180, align: 'Center' }, 108 + // { width: 130, align: 'Center' },
  109 + // { width: 120, align: 'center' },
  110 + // { width: 280, align: 'Center' },
  111 + // { width: 180, align: 'center' },
  112 + // { width: 200, align: 'center' },
  113 + // { width: 170, align: 'center' },
  114 + // { width: 80, align: 'center' },
  115 + // { width: 150, align: 'center' },
  116 + // { width: 150, align: 'center' },
  117 + // { width: 180, align: 'Center' },
118 //{ width: 400, align: 'Center' }, 118 //{ width: 400, align: 'Center' },
119 //{ width: 150, align: 'center' }, 119 //{ width: 150, align: 'center' },
120 //{ width: 110, align: 'center' }, 120 //{ width: 110, align: 'center' },
400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.ts
  View file @90d6be6
@@ -116,22 +116,22 @@ export class ExpiringSubscriptionReport implements OnInit, AfterViewChecked { @@ -116,22 +116,22 @@ export class ExpiringSubscriptionReport implements OnInit, AfterViewChecked {
116 width: "100%", 116 width: "100%",
117 height: this.scrHeight, 117 height: this.scrHeight,
118 colModal: [ 118 colModal: [
  119 + { width: 160, align: 'center' },
119 { width: 180, align: 'center' }, 120 { width: 180, align: 'center' },
120 - { width: 230, align: 'center' },  
121 { width: 150, align: 'Center' }, 121 { width: 150, align: 'Center' },
122 - { width: 150, align: 'Center' },  
123 - { width: 350, align: 'Center' },  
124 - { width: 500, align: 'Center' }, 122 + { width: 250, align: 'Center' },
  123 + { width: 160, align: 'Center' },
  124 + { width: 130, align: 'Center' },
125 { width: 130, align: 'Center' }, 125 { width: 130, align: 'Center' },
126 { width: 150, align: 'center' }, 126 { width: 150, align: 'center' },
127 - { width: 280, align: 'Center' },  
128 - { width: 180, align: 'center' },  
129 - { width: 200, align: 'center' },  
130 - { width: 170, align: 'center' },  
131 - { width: 80, align: 'center' },  
132 - { width: 150, align: 'center' }, 127 + { width: 160, align: 'Center' },
133 { width: 150, align: 'center' }, 128 { width: 150, align: 'center' },
134 - { width: 180, align: 'Center' }, 129 + { width: 160, align: 'center' },
  130 + // { width: 170, align: 'center' },
  131 + // { width: 80, align: 'center' },
  132 + // { width: 150, align: 'center' },
  133 + // { width: 150, align: 'center' },
  134 + // { width: 180, align: 'Center' },
135 //{ width: 400, align: 'Center' }, 135 //{ width: 400, align: 'Center' },
136 //{ width: 150, align: 'center' }, 136 //{ width: 150, align: 'center' },
137 //{ width: 110, align: 'center' }, 137 //{ width: 110, align: 'center' },
400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
  View file @90d6be6
@@ -92,14 +92,13 @@ export class ImageExportReport implements OnInit { @@ -92,14 +92,13 @@ export class ImageExportReport implements OnInit {
92 width: "100%", 92 width: "100%",
93 height: this.scrHeight, 93 height: this.scrHeight,
94 colModal: [ 94 colModal: [
95 - { width: 180, align: 'center' },  
96 - { width: 230, align: 'center' }, 95 + { width: 250, align: 'center' },
  96 + { width: 200, align: 'center' },
  97 + { width: 200, align: 'Center' },
  98 + { width: 250, align: 'Center' },
  99 + { width: 200, align: 'Center' },
97 { width: 150, align: 'Center' }, 100 { width: 150, align: 'Center' },
98 - //{ width: 150, align: 'Center' },  
99 - { width: 350, align: 'Center' },  
100 - { width: 300, align: 'Center' },  
101 - { width: 130, align: 'Center' },  
102 - { width: 120, align: 'center' }, 101 + { width: 200, align: 'center' },
103 { width: 150, align: 'center' }, 102 { width: 150, align: 'center' },
104 { width: 180, align: 'center' }, 103 { width: 180, align: 'center' },
105 ], 104 ],
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
  View file @90d6be6
@@ -101,20 +101,20 @@ export class NetAdSubscriptionReport implements OnInit { @@ -101,20 +101,20 @@ export class NetAdSubscriptionReport implements OnInit {
101 colModal: [ 101 colModal: [
102 { width: 180, align: 'center' }, 102 { width: 180, align: 'center' },
103 { width: 230, align: 'center' }, 103 { width: 230, align: 'center' },
104 - { width: 150, align: 'Center' }, 104 + { width: 250, align: 'Center' },
105 { width: 150, align: 'Center' }, 105 { width: 150, align: 'Center' },
106 { width: 350, align: 'Center' }, 106 { width: 350, align: 'Center' },
107 { width: 200, align: 'Center' }, 107 { width: 200, align: 'Center' },
108 - { width: 200, align: 'Center' }, 108 + { width: 250, align: 'Center' },
109 { width: 120, align: 'center' }, 109 { width: 120, align: 'center' },
110 - { width: 280, align: 'Center' },  
111 - { width: 180, align: 'center' },  
112 - { width: 200, align: 'center' },  
113 - { width: 170, align: 'center' },  
114 - { width: 80, align: 'center' },  
115 - { width: 150, align: 'center' },  
116 - { width: 150, align: 'center' },  
117 - { width: 180, align: 'Center' }, 110 + // { width: 280, align: 'Center' },
  111 + // { width: 180, align: 'center' },
  112 + // { width: 200, align: 'center' },
  113 + // { width: 170, align: 'center' },
  114 + // { width: 80, align: 'center' },
  115 + // { width: 150, align: 'center' },
  116 + // { width: 150, align: 'center' },
  117 + // { width: 180, align: 'Center' },
118 ], 118 ],
119 sort: true 119 sort: true
120 }); 120 });
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
  View file @90d6be6
@@ -98,21 +98,21 @@ export class SiteLicenseUsageReport implements OnInit { @@ -98,21 +98,21 @@ export class SiteLicenseUsageReport implements OnInit {
98 height: this.scrHeight, 98 height: this.scrHeight,
99 colModal: [ 99 colModal: [
100 { width: 180, align: 'center' }, 100 { width: 180, align: 'center' },
101 - { width: 230, align: 'center' },  
102 - { width: 150, align: 'Center' }, 101 + { width: 250, align: 'center' },
  102 + { width: 250, align: 'Center' },
103 { width: 150, align: 'Center' }, 103 { width: 150, align: 'Center' },
104 { width: 350, align: 'Center' }, 104 { width: 350, align: 'Center' },
105 { width: 500, align: 'Center' }, 105 { width: 500, align: 'Center' },
106 { width: 130, align: 'Center' }, 106 { width: 130, align: 'Center' },
107 - { width: 120, align: 'center' },  
108 - { width: 280, align: 'Center' },  
109 - { width: 180, align: 'center' },  
110 - { width: 200, align: 'center' },  
111 - { width: 170, align: 'center' },  
112 - { width: 80, align: 'center' },  
113 - { width: 150, align: 'center' },  
114 - { width: 150, align: 'center' },  
115 - { width: 180, align: 'Center' }, 107 + // { width: 120, align: 'center' },
  108 + // { width: 280, align: 'Center' },
  109 + // { width: 180, align: 'center' },
  110 + // { width: 200, align: 'center' },
  111 + // { width: 170, align: 'center' },
  112 + // { width: 80, align: 'center' },
  113 + // { width: 150, align: 'center' },
  114 + // { width: 150, align: 'center' },
  115 + // { width: 180, align: 'Center' },
116 ], 116 ],
117 sort: true 117 sort: true
118 }); 118 });
400-SOURCECODE/Admin/src/app/components/Reports/subscriptioncancellationreport.component.ts
  View file @90d6be6
@@ -108,22 +108,22 @@ export class SubscriptionCancellationReport implements OnInit { @@ -108,22 +108,22 @@ export class SubscriptionCancellationReport implements OnInit {
108 width: "100%", 108 width: "100%",
109 height: this.scrHeight, 109 height: this.scrHeight,
110 colModal: [ 110 colModal: [
111 - { width: 180, align: 'center' },  
112 - { width: 230, align: 'center' },  
113 - { width: 150, align: 'Center' }, 111 + { width: 140, align: 'center' },
  112 + { width: 170, align: 'center' },
114 { width: 150, align: 'Center' }, 113 { width: 150, align: 'Center' },
115 - { width: 350, align: 'Center' },  
116 - { width: 500, align: 'Center' }, 114 + { width: 160, align: 'Center' },
117 { width: 130, align: 'Center' }, 115 { width: 130, align: 'Center' },
  116 + { width: 400, align: 'Center' },
  117 + { width: 100, align: 'Center' },
  118 + { width: 140, align: 'center' },
  119 + { width: 100, align: 'Center' },
  120 + { width: 140, align: 'center' },
118 { width: 150, align: 'center' }, 121 { width: 150, align: 'center' },
119 - { width: 280, align: 'Center' },  
120 - { width: 180, align: 'center' },  
121 - { width: 200, align: 'center' },  
122 - { width: 170, align: 'center' },  
123 - { width: 80, align: 'center' },  
124 - { width: 150, align: 'center' },  
125 - { width: 150, align: 'center' },  
126 - { width: 180, align: 'Center' }, 122 + // { width: 170, align: 'center' },
  123 + // { width: 80, align: 'center' },
  124 + // { width: 150, align: 'center' },
  125 + // { width: 150, align: 'center' },
  126 + // { width: 180, align: 'Center' },
127 //{ width: 400, align: 'Center' }, 127 //{ width: 400, align: 'Center' },
128 //{ width: 150, align: 'center' }, 128 //{ width: 150, align: 'center' },
129 //{ width: 110, align: 'center' }, 129 //{ width: 110, align: 'center' },
400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.ts
  View file @90d6be6
@@ -110,22 +110,22 @@ export class SubscriptionReport implements OnInit { @@ -110,22 +110,22 @@ export class SubscriptionReport implements OnInit {
110 width: "100%", 110 width: "100%",
111 height: this.scrHeight, 111 height: this.scrHeight,
112 colModal: [ 112 colModal: [
113 - { width: 180, align: 'center' },  
114 - { width: 230, align: 'center' }, 113 + { width: 140, align: 'center' },
  114 + { width: 170, align: 'center' },
115 { width: 150, align: 'Center' }, 115 { width: 150, align: 'Center' },
116 { width: 150, align: 'Center' }, 116 { width: 150, align: 'Center' },
117 - { width: 350, align: 'Center' },  
118 - { width: 500, align: 'Center' },  
119 - { width: 130, align: 'Center' },  
120 - { width: 150, align: 'center' },  
121 - { width: 280, align: 'Center' },  
122 - { width: 180, align: 'center' },  
123 - { width: 200, align: 'center' },  
124 - { width: 170, align: 'center' },  
125 - { width: 80, align: 'center' }, 117 + { width: 140, align: 'Center' },
  118 + { width: 400, align: 'Center' },
  119 + { width: 100, align: 'Center' },
126 { width: 150, align: 'center' }, 120 { width: 150, align: 'center' },
  121 + { width: 100, align: 'Center' },
  122 + { width: 140, align: 'center' },
127 { width: 150, align: 'center' }, 123 { width: 150, align: 'center' },
128 - { width: 180, align: 'Center' }, 124 + // { width: 170, align: 'center' },
  125 + // { width: 80, align: 'center' },
  126 + // { width: 150, align: 'center' },
  127 + // { width: 150, align: 'center' },
  128 + // { width: 180, align: 'Center' },
129 //{ width: 400, align: 'Center' }, 129 //{ width: 400, align: 'Center' },
130 //{ width: 150, align: 'center' }, 130 //{ width: 150, align: 'center' },
131 //{ width: 110, align: 'center' }, 131 //{ width: 110, align: 'center' },
400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
  View file @90d6be6
@@ -184,25 +184,25 @@ export class UsageReport implements OnInit, AfterViewChecked { @@ -184,25 +184,25 @@ export class UsageReport implements OnInit, AfterViewChecked {
184 width: "100%", 184 width: "100%",
185 height: this.scrHeight, 185 height: this.scrHeight,
186 colModal: [ 186 colModal: [
187 - { width: 180, align: 'center' },  
188 - { width: 230, align: 'center' }, 187 + { width: 150, align: 'center' },
  188 + { width: 150, align: 'center' },
189 { width: 150, align: 'Center' }, 189 { width: 150, align: 'Center' },
190 { width: 150, align: 'Center' }, 190 { width: 150, align: 'Center' },
191 - { width: 350, align: 'Center' },  
192 - { width: 500, align: 'Center' }, 191 + { width: 300, align: 'Center' },
  192 + { width: 150, align: 'Center' },
193 { width: 130, align: 'Center' }, 193 { width: 130, align: 'Center' },
194 { width: 120, align: 'center' }, 194 { width: 120, align: 'center' },
195 - { width: 280, align: 'Center' },  
196 - { width: 180, align: 'center' },  
197 - { width: 200, align: 'center' },  
198 - { width: 170, align: 'center' },  
199 - { width: 120, align: 'center' },  
200 - { width: 150, align: 'center' },  
201 - { width: 150, align: 'center' },  
202 - { width: 180, align: 'Center' },  
203 - { width: 400, align: 'Center' }, 195 + { width: 150, align: 'Center' },
  196 + { width: 140, align: 'center' },
  197 + { width: 100, align: 'center' },
204 { width: 150, align: 'center' }, 198 { width: 150, align: 'center' },
205 - { width: 110, align: 'center' }, 199 + { width: 120, align: 'center' },
  200 + // { width: 150, align: 'center' },
  201 + // { width: 150, align: 'center' },
  202 + // { width: 180, align: 'Center' },
  203 + // { width: 400, align: 'Center' },
  204 + // { width: 150, align: 'center' },
  205 + // { width: 110, align: 'center' },
206 ], 206 ],
207 sort: true 207 sort: true
208 }); 208 });
400-SOURCECODE/Admin/src/app/shared/global.ts
  View file @90d6be6
@@ -48,7 +48,7 @@ export class GlobalService { @@ -48,7 +48,7 @@ export class GlobalService {
48 48
49 this.NoRecords = 'No Record Found.'; 49 this.NoRecords = 'No Record Found.';
50 50
51 - this.hostURL = "http://192.168.43.9/API/Adminapi/";//Birendra Machine IP 51 + this.hostURL = "http://localhost/API/Adminapi/";
52 this.LiveAPIURL = "http://interactiveanatomy.com/API/Adminapi/"; 52 this.LiveAPIURL = "http://interactiveanatomy.com/API/Adminapi/";
53 this.QAAPIURL = "http://qa.beta.interactiveanatomy.com/API/Adminapi/"; 53 this.QAAPIURL = "http://qa.beta.interactiveanatomy.com/API/Adminapi/";
54 this.LocalURL = "http://localhost:4200"; 54 this.LocalURL = "http://localhost:4200";
@@ -56,7 +56,7 @@ export class GlobalService { @@ -56,7 +56,7 @@ export class GlobalService {
56 // get protocol type 56 // get protocol type
57 this.ProtocolType = window.location.protocol+"//"; 57 this.ProtocolType = window.location.protocol+"//";
58 58
59 - if(window.location.hostname=="localhost") 59 + if(window.location.host=="localhost:4200")
60 { 60 {
61 // for 'ng serve --open' command 61 // for 'ng serve --open' command
62 //**** for localhost:4200 *****// 62 //**** for localhost:4200 *****//
@@ -69,8 +69,8 @@ export class GlobalService { @@ -69,8 +69,8 @@ export class GlobalService {
69 69
70 } 70 }
71 71
72 - if (this.resourceBaseUrl == this.ProtocolType+"192.168.43.9/API/Adminapi/") {  
73 - if(window.location.hostname=="localhost") 72 + if (this.resourceBaseUrl == this.ProtocolType+"localhost/API/Adminapi/") {
  73 + if(window.location.host=="localhost:4200")
74 { 74 {
75 // for 'ng serve --open' command 75 // for 'ng serve --open' command
76 //**** for localhost:4200 *****// 76 //**** for localhost:4200 *****//