diff --git a/ng6-seed/src/app/app.component.ts b/ng6-seed/src/app/app.component.ts index 0c930c6d7..86dca238a 100755 --- a/ng6-seed/src/app/app.component.ts +++ b/ng6-seed/src/app/app.component.ts @@ -13,6 +13,7 @@ import { PushNotifyService } from './shared/push-notify.service'; }) export class AppComponent { message; + commonDetails: any; // alertTAT; // public timer constructor(translate: TranslateService, @@ -32,8 +33,17 @@ export class AppComponent { this.message = this.messagingService.currentMessage // this.alertForTAT() this.pushNotify.requestPermission(); + this.getCommonSettings(); } + getCommonSettings(){ + this.dashBoardService.getCommonSettingsConfig().subscribe(res=>{ + this.commonDetails = res; + if(this.commonDetails.dataStatus == true){ + localStorage.setItem("commonSettings",JSON.stringify(this.commonDetails.records)); + } + }) + } // alertForTAT(){ // this.alertTAT=Observable.interval(100000).subscribe(timer=>{ // this.timer=timer diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index 0588da9c9..9c75cf2de 100755 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -81,6 +81,10 @@ getLenderDetail(): Observable { } + getCommonSettingsConfig(){ + return this._http.post(this.apiUrl+'getCommonConfig', ''); + } + getAlertDetail(): Observable { return this._http.get(this.apiUrl+'getDashBoardAlertDetails') .pipe( diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 29574a02d..b780f51c7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -78,7 +78,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -163,6 +163,6 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index f35bf5f59..9430abcd4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -47,6 +47,7 @@ export class AllPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; todaydate:Date = new Date(); + common: any; constructor(private _pd: PdTrigerService,private _fb:FormBuilder,notifier: NotifierService,) { this.notifier = notifier; this.searchForm = this._fb.group( @@ -63,7 +64,12 @@ export class AllPdComponent implements OnInit, OnChanges { pd_officer:[null], is_include_archived: [false] }); - this.getcommonDropDown(); + this.getcommonDropDown(); + + + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor + } ngOnInit() { @@ -80,6 +86,8 @@ export class AllPdComponent implements OnInit, OnChanges { } + + // load inprogress pd list loadPDDetails() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 97afe9999..f400f6217 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -73,7 +73,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -134,5 +134,5 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 957c04a06..93dcd8951 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -47,6 +47,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; todaydate:Date = new Date(); + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,) { this.notifier = notifier; @@ -65,6 +66,9 @@ export class CompletedPdComponent implements OnInit, OnChanges { pd_officer:[''] }); this.getcommonDropDown(); + + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor } ngOnInit() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 29e5441e8..751883b1a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -72,7 +72,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -128,5 +128,5 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index 62f732489..a15992328 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -44,6 +44,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { pageSize = 10; pageEvent: PageEvent; searchForm:FormGroup; + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService) { this.notifier = notifier; @@ -61,6 +62,9 @@ export class InprogressPdComponent implements OnInit, OnChanges { pd_officer:[null] }); this.getcommonDropDown(); + + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor } ngOnInit() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 0b06ecfc0..ed0a33710 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -74,7 +74,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -131,5 +131,5 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index 3dd230374..b1bfc455e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -45,6 +45,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + common: any; constructor(private _pd: PdTrigerService, public _fb: FormBuilder,notifier: NotifierService,) { this.notifier = notifier; @@ -63,6 +64,9 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { pd_officer:[null] }); this.getcommonDropDown(); + + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor } ngOnInit() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 5b941df0c..58ab5845f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -72,7 +72,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -132,5 +132,5 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index b52e413ba..14343fd89 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -44,6 +44,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,) { this.notifier = notifier; @@ -62,6 +63,9 @@ export class ScheduledPdComponent implements OnInit, OnChanges { pd_officer:[null] }); this.getcommonDropDown(); + + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor } ngOnInit() { diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html index cdfeb5e81..05f1fcfd3 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html @@ -20,7 +20,7 @@ -

Showing data for last 10 days. To see older records, please use advanced filter

+

Showing data for last {{common}}. To see older records, please use advanced filter

@@ -90,7 +90,7 @@
Showing data for last 10 days. To see older records, please use advanced filter
+ color: brown;">Showing data for last {{common}}. To see older records, please use advanced filter
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts index 1779bbb96..9bafdf9de 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts @@ -34,8 +34,12 @@ export class SalesPdComponent implements OnInit { pageEvent: PageEvent; todaydate:Date = new Date(); filter_drop_down_data: any; + common: any; - constructor(private _pdSales: PdTrigerService,private userService:UserService) { } + constructor(private _pdSales: PdTrigerService,private userService:UserService) { + this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; + this.common = this.common.count+' '+this.common.factor + } ngOnInit() { this.loadSalesPDDetails(); diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index b5efe4102..08ec5673f 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -14,6 +14,7 @@ import { CustomValidators } from 'ng2-validation'; import { MatDialog, MatDialogRef, MatDialogConfig } from '@angular/material'; import { CognitoService } from '../../AwsService/cognito.service'; import { MessagingService } from 'app/shared/messaging.service'; +import { DashboardService } from 'app/dashboard/dashboard.service'; @Component({ selector: 'ms-login-session', @@ -40,15 +41,26 @@ export class LoginComponent implements OnInit{ right: '' } }; + commonDetails: any; constructor( private router: Router, public aws: AwsService, public dialog: MatDialog, - public shared:CognitoService,private messagingService:MessagingService) { + public shared:CognitoService,private messagingService:MessagingService,private dashBoardService:DashboardService) { } ngOnInit(){ this.loggedInCheck(); } + + getCommonSettings(){ + this.dashBoardService.getCommonSettingsConfig().subscribe(res=>{ + this.commonDetails = res; + if(this.commonDetails.dataStatus == true){ + localStorage.setItem("commonSettings",JSON.stringify(this.commonDetails.records)); + } + }) + } + /** * @param email * @param password @@ -58,6 +70,7 @@ export class LoginComponent implements OnInit{ let auth = { 'Username': this.email, 'Password': this.password }; this.aws.dologin(auth).subscribe(res => { if (res !== undefined) { + this.getCommonSettings(); // local storage for validate user access localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); this.initializeNotification() @@ -65,6 +78,7 @@ export class LoginComponent implements OnInit{ } }, err => { if (err.message == "New password is required.") { + this.newpassopen(); } else { @@ -84,6 +98,7 @@ export class LoginComponent implements OnInit{ let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result }; this.aws.dologin(auth).subscribe(res => { localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); + this.getCommonSettings(); this.initializeNotification() this.router.navigate(['/home']); }, err => {