fixed AIA hightlight termlist and admin bugs

Birendra Kumar
1 parent a4479b38
Showing 12 changed files with 129 additions and 66 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts
400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.ts
@@ -11164,7 +11164,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 }                                         
-                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
                 var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
              if (actualTermNumber >0) {
@@ -12056,7 +12056,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
              $("#typedTermName_" + windowviewid).attr("name", "0");
-             $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+             $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff" });
              var actualTermNumber=$scope.GetwindowStoreData(windowviewid,'actualTermNumber');
@@ -3647,7 +3647,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     }, 200);  
                 }  
-                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
                 var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
                 if (activePinArray.length >0) {
@@ -3750,7 +3750,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
          $("#selectedTermName_" + windowviewid).attr("name", "0");
-         $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+         $('#termlistfilter_' + windowviewid).find("option").css({ "background-color": "#ffffff"});
          var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
          var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
@@ -242,7 +242,7 @@
                                 {{item.StateName}}
                               </option>
                             </select>
-                            <div *ngIf="insertUpdateLicenseFrm.get('stateId').hasError('min')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
+                            <div *ngIf="insertUpdateLicenseFrm.get('stateId').hasError('min') && insertUpdateLicenseFrm.controls.stateId.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
                           </div>
                         </div>
                       </div>
@@ -270,6 +270,7 @@
                           <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
                             <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                             <div *ngIf="insertUpdateLicenseFrm.controls.zip.hasError('required') && insertUpdateLicenseFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                            <div *ngIf="insertUpdateLicenseFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                           </div>
                         </div>
                       </div>
@@ -79,7 +79,7 @@ export class AddLicense implements OnInit {
       city: ['', [Validators.required,this.noWhitespaceValidator]],
       stateId: [0, [Validators.min(1)]],
       countryId: [0, Validators.min(1)],
-      zip: ['', [Validators.required]],
+      zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
       emailId: ['', [Validators.required]],
       //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
       phone: ['', [Validators.required]],
@@ -272,8 +272,8 @@ UpdatePhoneValidation()
     else
     {
       this.IsUniteState=false;
-     // this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9]*$')]);
-      this.PhoneNumber.setValidators([Validators.required]);
+      this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+     // this.PhoneNumber.setValidators([Validators.required]);
       this.PhoneNumber.updateValueAndValidity(); 
       this.OtherFormatPhoneNumber(phoneno);
     }
@@ -110,6 +110,7 @@
                       <div class="col-sm-7">
                         <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                         <div *ngIf="updateLicenseBasicSettingsFrm.controls.zip.hasError('required') && updateLicenseBasicSettingsFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                        <div *ngIf="updateLicenseBasicSettingsFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                       </div>
                     </div>
@@ -122,7 +123,7 @@
                             {{item.StateName}}
                           </option>
                         </select>
-                        <div *ngIf="updateLicenseBasicSettingsFrm.get('stateId').hasError('min')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
+                        <div *ngIf="updateLicenseBasicSettingsFrm.get('stateId').hasError('min') && updateLicenseBasicSettingsFrm.controls.stateId.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">State is required</div>
                       </div>
                     </div>
@@ -56,7 +56,7 @@ export class EditLicenseBasicSettings implements OnInit {
       city: ['', [Validators.required,this.noWhitespaceValidator]],
       stateId: [0, [Validators.min(1)]],
       countryId: [0],
-      zip: ['', [Validators.required]],
+      zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
       emailId: ['', [Validators.required]],
       //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
       phone: ['', [Validators.required]]
@@ -193,8 +193,8 @@ UpdatePhoneValidation()
     else
     {
       this.IsUniteState=false;
-     // this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9]*$')]);
-      this.PhoneNumber.setValidators([Validators.required]);
+      this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+      //this.PhoneNumber.setValidators([Validators.required]);
       this.PhoneNumber.updateValueAndValidity(); 
       this.OtherFormatPhoneNumber(phoneno);
     }
@@ -310,7 +310,7 @@
                         <label for="Country" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Country <span class="red">*</span> :</label>
                       </div>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                          <select class="form-control input-sm " id="State" formControlName="countryId" (change)="OnCountryChange($event.target)">
+                          <select class="form-control input-sm " id="Country" formControlName="countryId" (change)="OnCountryChange($event.target)">
                               <option value="0">Select</option>
                               <option *ngFor="let item of lstCountry" value="{{item.Id}}">
                                   {{item.CountryName}}
@@ -324,8 +324,9 @@
                     <div class="form-group marginTop5">
                       <label for="Zip" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Zip <span class="red">*</span> : </label>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                        <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20">
+                        <input type="text" class="form-control input-sm" id="Zip" formControlName="zip" maxlength="20" (keydown.space)="$event.preventDefault();">
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.zip.hasError('required') && insertUpdateSiteLicenseFrm.controls.zip.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is required</div>
+                        <div *ngIf="insertUpdateSiteLicenseFrm.controls.zip.hasError('pattern')" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Zip is invalid</div>
                       </div>
                       </div>
                   </div>
@@ -335,9 +336,8 @@
                         <label for="Phone" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Phone <span class="red">*</span> :</label>
                         </div>
                       <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                        <input type="phone" class="form-control input-sm" id="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)">
-                        <!--<div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('required') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>-->
-                        <span class="help-block">(xxx-xxx-xxxx)</span>
+                        <input type="phone" class="form-control input-sm" id="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)" (keydown.space)="$event.preventDefault();">   
+                        <span *ngIf="IsUniteState" class="help-block">(xxx-xxx-xxxx)</span>
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('required') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>
                         <div *ngIf="insertUpdateSiteLicenseFrm.controls.phone.hasError('pattern') && insertUpdateSiteLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is invalid</div>
                       </div>
@@ -56,6 +56,7 @@ export class SiteLicenseAccount implements OnInit {
 	  pageNo:1,
       pageLength:10	  
     };
+    IsUniteState:Boolean=false;
     @HostListener('window:resize', ['$event'])
     getScreenSize(event?) {
@@ -102,9 +103,10 @@ export class SiteLicenseAccount implements OnInit {
             city: ['', [Validators.required,this.noWhitespaceValidator]],
             countryId: [0, Validators.min(1)],
             stateId: [0, Validators.min(1)],
-            zip: ['', [Validators.required,this.noWhitespaceValidator]],
-            phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]],
-            //phone: ['', Validators.required],
+            zip: ['', [Validators.required,Validators.pattern('^[0-9]*$')]],
+            //zip: ['', [Validators.required,this.noWhitespaceValidator]],
+            //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]],
+            phone: ['', Validators.required],
             clientAdminId: [0, Validators.min(1)],
             clientAdminEmail: [{value: '', disabled: true}, this.noWhitespaceValidator],
             isActive: [0],
@@ -217,48 +219,54 @@ export class SiteLicenseAccount implements OnInit {
      }
      onKeyUp(event: any) {      
-        var mobno = event.target.value;
-        var newnum=mobno;   
-          if(mobno!="" && event.key!="Backspace")
+      var mobno = event.target.value;
+      var countryName =$("#Country option:selected").text().trim();
+      if(mobno!="" && event.key!="Backspace")
+      {
+        if(countryName=="United States")
+        {  
+            this.USFormatPhoneNumber(mobno);
+        }
+        else
+        {
+          this.OtherFormatPhoneNumber(mobno);
+        }
+      }   
+    };
+    OtherFormatPhoneNumber(mobno:any)
+    {
+      //var regex = /\d+/g;
+      //var matches = mobno.match(regex); //extract digit only
+      //var currentNum= matches==null?"" :matches.join('');
+      this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(mobno);
+    }
+    
+    USFormatPhoneNumber(mobno:any)
+    {
+      var newformat="";
+      if(mobno!="" && mobno!=null)
+      {
+        var regex = /\d+/g;
+        var matches = mobno.match(regex); //extract digit only
+        var currentNum= matches==null?"" :matches.join('');
+    
+        for(var ind=0;ind<currentNum.length;ind++)
+        {
+          if(newformat.length==3)
           {
-            var tempArr = mobno.split('-');
-      
-                if(tempArr.length==1)
-                {
-                  var countdigit=tempArr[0].length;
-                  newnum=tempArr[0];
-                  if(countdigit==3)
-                  {
-                    newnum=tempArr[0]+"-";
-                  }
-                  else if(countdigit>3)
-                  {
-                    newnum=tempArr[0].substr(0,3)+"-"+tempArr[0].substr(3,1);
-                  }
-                  
-                }
-                else if(tempArr.length==2)
-                {
-                  newnum=tempArr[0]+"-"+tempArr[1];
-                  var countdigit=tempArr[1].length;
-                  if(countdigit==3)
-                  {
-                    newnum=tempArr[0]+"-"+tempArr[1]+"-";
-                  }
-                  else if(countdigit>3)
-                  {
-                    newnum= tempArr[0]+"-"+tempArr[1].substr(0,3)+"-"+tempArr[1].substr(3,1);
-                  }
-                }
-                else
-                  {
-                    newnum=tempArr[0]+"-"+tempArr[1]+"-"+tempArr[2];
-                  }
-      
+            newformat=newformat+"-";
+          }
+          else if(newformat.length==7)
+          {
+            newformat=newformat+"-";
+          }   
+          newformat=newformat+currentNum[ind];
         }
-        this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(newnum);   
-      };
-
+    
+       }
+       this.insertUpdateSiteLicenseFrm.controls['phone'].setValue(newformat);
+    }
+    
     openModal(template: TemplateRef<any>) {
         this.modalRef = this.modalService.show(template);
     }
@@ -376,6 +384,7 @@ export class SiteLicenseAccount implements OnInit {
             this.insertUpdateSiteLicenseFrm.controls['clientAdminId'].setValue(this.licenseSite.SiteUserId);
             this.insertUpdateSiteLicenseFrm.controls['clientAdminEmail'].setValue(this.licenseSite.SiteUserEmailId);
             this.GetSiteAccountEditions();
+            this.UpdatePhoneValidation();
          }, error => this.error = <any>error); 
     }
@@ -597,10 +606,39 @@ export class SiteLicenseAccount implements OnInit {
         }
         else {
           this.license.StateId = 0;
-          this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);
-		}
+          this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);     
+	    	}
+        this.UpdatePhoneValidation();
+      
+    }
+  //get Property
+  get PhoneNumber() {
+    return this.insertUpdateSiteLicenseFrm.get('phone');
+  } 
+  UpdatePhoneValidation()
+    {
+      var phoneno=this.PhoneNumber.value==null?"":this.PhoneNumber.value;
+    
+      var countryName =$("#Country option:selected").text().trim();
+      if(countryName=="United States")
+        {
+          // validate first phone number
+          this.IsUniteState=true;
+          this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]);
+          this.PhoneNumber.updateValueAndValidity();
+          this.USFormatPhoneNumber(phoneno);
+        }
+        else
+        {
+          this.IsUniteState=false;
+          this.PhoneNumber.setValidators([Validators.required, Validators.pattern('^[0-9-()+]*$')]);
+         // this.PhoneNumber.setValidators([Validators.required]);
+          this.PhoneNumber.updateValueAndValidity(); 
+          this.OtherFormatPhoneNumber(phoneno);
+        }
     }
+
     OnStateChange(element: any) {
         this.license.StateId = parseInt(element.value);
         if (this.lstState.find(C => C.Id == this.license.StateId).StateName != "Other") {
@@ -123,7 +123,7 @@
                 <td>{{item.NetAdSubscription}}</td>
               </tr>
             </tbody>
-            <tfoot *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;">
+            <tfoot *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;position:relative;">
               <tr>
                 <td>{{total.LicenseType}}</td>
                 <td>{{total.AccountType}}</td>
@@ -136,6 +136,22 @@
               </tr>
             </tfoot>
           </table>
+        
+            <!-- <table class="table-hover  ui-widget-header sorttable" style="width:100%">
+               <thead *ngFor="let total of TotalNetAdSubscription" style="font-weight: bold;background-color: #e3dbf3;">
+                  <tr>
+                    <th style="width:180px" >{{total.LicenseType}}</th>
+                    <th style="width:230px">{{total.AccountType}}</th>
+                    <th style="width:300px">{{total.InstitutionName}}</th>              
+                    <th style="width:200px">{{total.LicenseCreationDate}}</th>
+                    <th style="width:300px">{{total.ActiveSubscription}}</th>
+                    <th style="width:200px">{{total.RenewSubscription}}</th>
+                    <th style="width:250px">{{total.InActiveSubscription}}</th>
+                    <th style="width:130px">{{total.NetAdSubscription}}</th>
+                  </tr>
+               </thead>
+            </table> -->
+
           <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetNetAdSummaryReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
@@ -81,7 +81,7 @@ export class NetAdSubscriptionReport implements OnInit {
     {
       this.scrHeight = window.innerHeight-405;
     }
-	 if(this.scrHeight<=360) this.scrHeight=360;
+	 if(this.scrHeight<=360) this.scrHeight=370;
      $(".ft_container").css("height",this.scrHeight);
     }
@@ -194,6 +194,8 @@ export class NetAdSubscriptionReport implements OnInit {
     }
 	GetNetAdSummaryReportList() {
+    
+   
        this._loadingService.ShowLoading("global-loading");
 	   $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc'); 
@@ -266,6 +268,7 @@ export class NetAdSubscriptionReport implements OnInit {
         this._loadingService.HideLoading("global-loading");
         this.buttonStatus = false;
       }
+     
     }
     ExportEvent() {
@@ -62,7 +62,7 @@ export class ChangeUserID implements OnInit {
       .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = <any>error);    
   }
   UpdateUserId() {
-    debugger;
+
     this.alerts = '';
     //if (this.ChangeUserIdFrm.value.newloginid == '') {
  import { Component, OnInit, Input, Output, EventEmitter, ElementRef, ViewChild } from "@angular/core";
 import {ConfirmService} from "./confirm.service";
 import { ModalComponent } from "ng2-bs3-modal/ng2-bs3-modal";
+import { Router } from '@angular/router';
 const KEY_ESC = 27;
 @Component({
@@ -41,7 +42,7 @@ export class ConfirmComponent implements OnInit {
     private _okAlert: any;
     private _closeAlert: any;
-    constructor(confirmService:ConfirmService) {
+    constructor(confirmService:ConfirmService,private router: Router) {
         confirmService.activate = this.activate.bind(this);
     }
@@ -178,6 +179,9 @@ export class ConfirmComponent implements OnInit {
         if (this.type.toString() == "alertMsg") {
             this.alertMessageModal.close();
+            var url= this.router.url;
+            if(url=='/changeuserpassword' || url== '/changeuserid')
+            this.router.navigate(['/']);
             return;
         }
         if (this.type.toString() == "alertMsg2") {