diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index e3ed62b..e63111c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -11164,7 +11164,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$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("DAController", ["$scope", "$rootScope", "$compile", "$http", "$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'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index f12e700..db2e0c6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -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'); diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html index 12e29d6..a4c4c8c 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.html @@ -242,7 +242,7 @@ {{item.StateName}} -
State is required
+
State is required
@@ -270,6 +270,7 @@
Zip is required
+
Zip is invalid
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts index 4fe0258..5e55b31 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts @@ -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); } diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html index 0d7d4dd..27ea01f 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.html @@ -110,6 +110,7 @@
Zip is required
+
Zip is invalid
@@ -122,7 +123,7 @@ {{item.StateName}} -
State is required
+
State is required
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts index 50ae43b..a99b2c9 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts @@ -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); } diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html index 1959c0b..b2dadf8 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html @@ -310,7 +310,7 @@
-
@@ -335,9 +336,8 @@
- - - (xxx-xxx-xxxx) + + (xxx-xxx-xxxx)
Phone is required
Phone is invalid
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts index c716043..9eb4881 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts @@ -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;ind3) - { - 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) { 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 = 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") { diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html index 873553b..29bf7ab 100644 --- a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html +++ b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html @@ -123,7 +123,7 @@ {{item.NetAdSubscription}} - + {{total.LicenseType}} {{total.AccountType}} @@ -136,6 +136,22 @@ + + +
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts index b05918e..59392a6 100644 --- a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts @@ -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() { diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts index 4a55449..7dab56a 100644 --- a/400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts +++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/changeuserid.component.ts @@ -62,7 +62,7 @@ export class ChangeUserID implements OnInit { .subscribe(x => { console.log(x); this.bindUsers(x) }, error => this.error = error); } UpdateUserId() { - debugger; + this.alerts = ''; //if (this.ChangeUserIdFrm.value.newloginid == '') { diff --git a/400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.ts b/400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.ts index 7ee6a0f..ced31a2 100644 --- a/400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.ts +++ b/400-SOURCECODE/Admin/src/app/shared/Confirm/confirm.component.ts @@ -1,6 +1,7 @@ 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") {