phone format and other issue fixed

Birendra Kumar
1 parent b07beb87
Showing 10 changed files with 214 additions and 113 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/Admin/src/app/app.component.ts
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/shared/global.ts
400-SOURCECODE/Admin/src/assets/data/Menu.json
@@ -64,8 +64,8 @@
     </assemblyBinding>
   </runtime>
   <connectionStrings>
-    <add name="AIADatabaseV5Entities1" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-BIRU-PC\SQLEXPRESS;initial catalog=AIADatabaseV5;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=LAPTOP-BIRU-PC\SQLEXPRESS;initial catalog=AIADatabaseV5;persist security info=True;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="AIADatabaseV5Entities1" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="AIADatabaseV5Entities" connectionString="metadata=res://*/Entity.AIADBEntity.csdl|res://*/Entity.AIADBEntity.ssdl|res://*/Entity.AIADBEntity.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.90.53;initial catalog=AIADatabaseV5;persist security info=True;user id=aia_dev;password=india123;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
@@ -178,7 +178,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>63874</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
@@ -63,9 +63,8 @@
     <add key="Aod_site_Url" value="https://uat.adamondemand.com/"/>
     <add key="aiapasskey" value="as@2$eDu8Jk"/>
-    <!--<add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/>-->
-	<add key ="AIADatabaseV5Context" value="Data Source=LAPTOP-BIRU-PC\SQLEXPRESS;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/>
- 
+    <add key ="AIADatabaseV5Context" value="Data Source=192.168.90.53;Initial Catalog=AIADatabaseV5;User ID=AIA_Dev;Password=india123;"/>
+	
   </appSettings>
@@ -33,6 +33,8 @@ export class AppComponent implements OnInit {
   public submenustaus: string;
   public UpdateProfileVisible: boolean;
   public UserManageRightsList: Array<UserManageRightsModel>;
+
+  public LicenseTypeId:any;
   constructor(private idle: Idle, private keepalive: Keepalive,private titleService: Title,private _confirmService: ConfirmService,private userservice: UserService,private _loadingService: LoadingService, public global: GlobalService, private router: Router,) {     
     const projectTitle= this.titleService.getTitle();
@@ -95,7 +97,26 @@ export class AppComponent implements OnInit {
   ngOnInit(): void {
     this.menustaus = "True";
     this.global.getJSON().subscribe(data => {
-      this.obj = data["AdminSections"]      
+      this.obj = data["AdminSections"] ;
+      this.LicenseTypeId=this.global.LicenseTypeId;   
+      if(this.LicenseTypeId !=undefined && this.LicenseTypeId!=0 && this.global.UserTypeName=="Client Admin") 
+      {
+        if(this.obj[2].UserType=="Client Admin")
+        {
+          var mainsection=this.obj[2];
+          var clientadminSection=mainsection.HeaderMenu[4];
+          var siteUageReportSection=clientadminSection.SubMenu[6];
+          var concurrentLicenseId=siteUageReportSection.LicenseTypeId;
+
+          //do not show this report for concurrent license of client admin        
+          if(concurrentLicenseId ==this.LicenseTypeId)
+          {
+            siteUageReportSection.SubMenuStatus="False";
+          }
+        }
+      } 
+
+
       for (let i = 0; i < 7; i++) {
         if (this.obj[i].Id == this.global.UserType) {
           if (this.global.UserTypeName == "General Admin") {
@@ -242,6 +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>
                         </div>
                       </div>
@@ -277,7 +278,7 @@
                           <label for="Phone" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0" title="">Phone <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="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)" (keydown.space)="$event.preventDefault();">
-                            <span class="help-block">(xxx-xxx-xxxx)</span>
+                            <span *ngIf="IsUniteState" class="help-block">(xxx-xxx-xxxx)</span>
                             <div *ngIf="insertUpdateLicenseFrm.controls.phone.hasError('required') && insertUpdateLicenseFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>
                             <div *ngIf="insertUpdateLicenseFrm.controls.phone.hasError('pattern') && (insertUpdateLicenseFrm.controls.phone.dirty || license.LicenseId > 0)" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is invalid</div>
                           </div>
@@ -50,6 +50,7 @@ export class AddLicense implements OnInit {
   dateStartInvalid: boolean = false;
   dateEndInvalid: boolean = false;
   dateRenewInvalid: boolean = false;
+  IsUniteState:Boolean=false;
   NumberOfRows:number=0;
   constructor(private _loadingService: LoadingService,private licenseService: LicenseService, private globalService: GlobalService,
      private router: Router, private activeRoute: ActivatedRoute, 
@@ -76,11 +77,12 @@ export class AddLicense implements OnInit {
       address1: ['', [Validators.required,this.noWhitespaceValidator]],
       address2: [''],
       city: ['', [Validators.required,this.noWhitespaceValidator]],
-      stateId: [0, Validators.min(1)],
+      stateId: [0, [Validators.min(1)]],
       countryId: [0, Validators.min(1)],
       zip: ['', [Validators.required]],
       emailId: ['', [Validators.required]],
-      phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
+      //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
+      phone: ['', [Validators.required]],
       editionLoginArr: this.fb.array([]),
       editionLogins: [''],
       totalLogins: [0],
@@ -198,47 +200,86 @@ export class AddLicense implements OnInit {
  onKeyUp(event: any) {
   var mobno = event.target.value;
-  var newnum=mobno;
-    if(mobno!="" && event.key!="Backspace")
+  var countryName =$("#Country option:selected").text().trim();
+   
+  if(mobno!="" && event.key!="Backspace")
+  {
+    if(countryName=="United States")
+    {  
+        this.USFormatPhoneNumber(mobno);
+    }
+    else
     {
-      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];
-            }
-
+      this.OtherFormatPhoneNumber(mobno);
+    }
   }
-  this.insertUpdateLicenseFrm.controls['phone'].setValue(newnum);
 };
+
+OtherFormatPhoneNumber(mobno:any)
+{
+  //var regex = /\d+/g;
+  //var matches = mobno.match(regex); //extract digit only
+  //var currentNum= matches==null?"" :matches.join('');
+  this.insertUpdateLicenseFrm.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)
+      {
+        newformat=newformat+"-";
+      }
+      else if(newformat.length==7)
+      {
+        newformat=newformat+"-";
+      }   
+      newformat=newformat+currentNum[ind];
+    }
+
+   }
+   this.insertUpdateLicenseFrm.controls['phone'].setValue(newformat);
+}
+
+//get Property
+get PhoneNumber() {
+  return this.insertUpdateLicenseFrm.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);
+    }
+  
+}
+
   openModal(template: TemplateRef<any>) {
     this.modalRef = this.modalService.show(template);
   }
@@ -469,15 +510,9 @@ export class AddLicense implements OnInit {
             this.insertUpdateLicenseFrm.controls['isActive'].setValue('false');
           }
-          // this.insertUpdateLicenseFrm.controls['phone'].clearValidators();
-          // if (this.lstCountry.find(C => C.Id == this.license.CountryId).CountryName != "United States") {
-          //   this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]);
-          // }
-          // else {
-          //   this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]);
-          // }
-          // this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity();
           this.insertUpdateLicenseFrm.controls['phone'].setValue(this.license.Phone);
+           // validate first phone number
+           this.UpdatePhoneValidation();
           if (this.license.EditionLogins == null) return;
           var TempArr = this.license.EditionLogins.split('|');
@@ -774,16 +809,12 @@ export class AddLicense implements OnInit {
       if (this.lstCountry.find(C => C.Id == this.license.CountryId).CountryName != "United States") {
         this.license.StateId = this.lstState.find(C => C.StateName == "Other").Id;
         this.insertUpdateLicenseFrm.controls['stateId'].setValue(this.license.StateId);
-       // this.insertUpdateLicenseFrm.controls['phone'].clearValidators();
-       // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]);               
       }
       else {
         this.license.StateId = 0;
         this.insertUpdateLicenseFrm.controls['stateId'].setValue(this.license.StateId);
-       // this.insertUpdateLicenseFrm.controls['phone'].clearValidators();
-       // this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]);
       }
-      //this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity();
+      this.UpdatePhoneValidation();
   }
   OnStateChange(element: any) {
@@ -791,16 +822,11 @@ export class AddLicense implements OnInit {
       if (this.lstState.find(C => C.Id == this.license.StateId).StateName != "Other") {
         this.license.CountryId = this.lstCountry.find(C => C.CountryName == "United States").Id;
         this.insertUpdateLicenseFrm.controls['countryId'].setValue(this.license.CountryId);
-       // this.insertUpdateLicenseFrm.controls['phone'].clearValidators();
-      //  this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]);
       }
       else {
         this.license.CountryId = 0;
         this.insertUpdateLicenseFrm.controls['countryId'].setValue(this.license.CountryId);
-      //  this.insertUpdateLicenseFrm.controls['phone'].clearValidators();
-      //  this.insertUpdateLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]);
-      }
-     // this.insertUpdateLicenseFrm.controls['phone'].updateValueAndValidity();
+      }  
   }
   SubscriptionPriceBlur() {
@@ -122,15 +122,16 @@
                             {{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>
                     </div>
                     <div class="form-group">
                       <label for="inputEmail3" class="col-sm-4 control-label">Country <span class="red">*</span> :</label>
                       <div class="col-sm-7">
-                        <select class="form-control input-sm" id="Country" formControlName="countryId">
+                        <select class="form-control input-sm" id="Country" formControlName="countryId" (change)="onCountryChange($event)">
                           <option value="0">Select</option>
-                          <option *ngFor="let item of lstCountry" value="{{item.Id}}">
+                          <option *ngFor="let item of lstCountry" [value]="item.Id">
                             {{item.CountryName}}
                           </option>
                         </select>
@@ -138,12 +139,12 @@
                     </div>
                     <div class="form-group">
-                      <label for="inputEmail3" class="col-sm-4 control-label">Phone <span class="red">*</span> :</label>
+                      <label for="Phone" class="col-sm-4 control-label">Phone <span class="red">*</span> :</label>
                       <div class="col-sm-7">
                         <input type="text" class="form-control input-sm" id="Phone" formControlName="phone" maxlength="30" (keyup)="onKeyUp($event)" (keydown.space)="$event.preventDefault();">
-                        <span class="help-block">(xxx-xxx-xxxx)</span>
+                        <span *ngIf="IsUniteState" class="help-block">(xxx-xxx-xxxx)</span>
                         <div *ngIf="updateLicenseBasicSettingsFrm.controls.phone.hasError('required') && updateLicenseBasicSettingsFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is required</div>
-                        <div *ngIf="updateLicenseBasicSettingsFrm.controls.phone.hasError('pattern') && updateLicenseBasicSettingsFrm.controls.phone.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is invalid</div>
+                        <div *ngIf="updateLicenseBasicSettingsFrm.controls.phone.hasError('pattern') && (updateLicenseBasicSettingsFrm.controls.phone.dirty||license.LicenseId)" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Phone is invalid</div>
                       </div>
                     </div>
@@ -32,6 +32,7 @@ export class EditLicenseBasicSettings implements OnInit {
   MinusCharater: number;
   LicenseId:number=0;
   AccountNumber:string='';
+  IsUniteState:Boolean=false;
   constructor(private _loadingService: LoadingService,private licenseService: LicenseService,
     public globalService: GlobalService, private router: Router,
@@ -53,11 +54,12 @@ export class EditLicenseBasicSettings implements OnInit {
       address1: ['', [Validators.required,this.noWhitespaceValidator]],
       address2: [''],
       city: ['', [Validators.required,this.noWhitespaceValidator]],
-      stateId: [0],
+      stateId: [0, [Validators.min(1)]],
       countryId: [0],
       zip: ['', [Validators.required]],
       emailId: ['', [Validators.required]],
-      phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
+      //phone: ['', [Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$')]],
+      phone: ['', [Validators.required]]
     });
     this.GetCountry();
     this.GetState();
@@ -114,57 +116,100 @@ export class EditLicenseBasicSettings implements OnInit {
      return isValid ? null: { 'whitespace': true };
  }
+
  onKeyUp(event: any) {
   var mobno = event.target.value;
-  var newnum=mobno;
-    if(mobno!="" && event.key!="Backspace")
+  var countryName =$("#Country option:selected").text().trim();
+  if(mobno!="" && event.key!="Backspace")
+  {
+    if(countryName=="United States")
+    {  
+        this.USFormatPhoneNumber(mobno);
+    }
+    else
     {
-      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];
-            }
+      this.OtherFormatPhoneNumber(mobno);
+    }
+}
+    
+};
-  }
-  this.updateLicenseBasicSettingsFrm.controls['phone'].setValue(newnum);
- 
+OtherFormatPhoneNumber(mobno:any)
+{
+  //var regex = /\d+/g;
+  //var matches = mobno.match(regex); //extract digit only
+  //var currentNum= matches==null?"" :matches.join('');
+  this.updateLicenseBasicSettingsFrm.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)
+      {
+        newformat=newformat+"-";
+      }
+      else if(newformat.length==7)
+      {
+        newformat=newformat+"-";
+      }   
+      newformat=newformat+currentNum[ind];
+    }
+
+   }
+   this.updateLicenseBasicSettingsFrm.controls['phone'].setValue(newformat);
+}
+
+//get Property
+get PhoneNumber() {
+  return this.updateLicenseBasicSettingsFrm.get('phone');
+} 
+onCountryChange(event: any) {
+  //let contryName = event.target.options[event.target.options.selectedIndex].text;
+  this.UpdatePhoneValidation()
 };
+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);
+    }
+  
+}
+
   openModal(template: TemplateRef<any>) {
     this.modalRef = this.modalService.show(template);
   }
   GetCountry() {
     this.licenseService.GetCountry()
-      .subscribe(y => { this.lstCountry = y; }, error => this.error = <any>error);
+      .subscribe(y => {
+         this.lstCountry = y;
+         }, error => this.error = <any>error);
   }
   GetState() {
@@ -207,6 +252,8 @@ export class EditLicenseBasicSettings implements OnInit {
           this.updateLicenseBasicSettingsFrm.controls['emailId'].setValue(this.license.EmailId);
           this.updateLicenseBasicSettingsFrm.controls['phone'].setValue(this.license.Phone);
           this._loadingService.HideLoading("global-loading");
+
+          this.UpdatePhoneValidation();
         },
         error => this.error = <any>error);
     }
@@ -30,6 +30,7 @@ export class GlobalService {
   SessionId:number=0;
   isSiteUser:boolean=false;
   isAdmin:boolean=false;
+  LicenseTypeId:number=0;
   RemoveColumns: Array<string> = ["Serial_No", "LicenseId","RowNum"]
   error;
   public href: string = "";
@@ -58,7 +59,11 @@ export class GlobalService {
           this.aiaPingInterval=this.loggedInUser.aiaPingInterval;
           this.SessionId=this.loggedInUser.SessionId;
           this.isSiteUser=this.loggedInUser.isSiteUser;
-          this.isAdmin=this.loggedInUser.LicenseId==0?true:false;;
+          this.isAdmin=this.loggedInUser.LicenseId==0?true:false;
+
+          if (this.loggedInUser.LicenseInfo != null) {
+            this.LicenseTypeId=this.loggedInUser.LicenseInfo.LicenseTypeId;
+          }
         }
@@ -578,6 +578,7 @@
               "SubMenuId": "218",
               "SubMenuName": "Site License Usage Report",
               "SubMenuUrl": "sitelicenseusagereport",
+              "LicenseTypeId": 1,
               "SubMenuStatus": "True"
             },
             {