diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index 674f848..13a8d00 100755 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -19,6 +19,10 @@ export class DashboardService { private apiUrl = environment.apiEndpoint; constructor(private _http: HttpClient, - private _aws:AwsService) { } + private _aws:AwsService) { } + + getCommonSettingsConfig(){ + return this._http.post(this.apiUrl+'getCommonConfig', ''); + } } \ No newline at end of file diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 003d3ac..1b11e75 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -22,7 +22,8 @@ import { RoleMenuItemsPipe } from './../role-menu-items.pipe'; export class AdminLayoutComponent implements OnInit, OnDestroy { - profileurl: any;; + profileurl: any; + commonDetails: any; userDep: string; fullName: any; roleName:any; @@ -135,6 +136,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { // Ps.update(elemContent); } }); + this.getCommonSettings(); } @HostListener('click', ['$event']) @@ -295,4 +297,13 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { break; } } + + getCommonSettings(){ + this._dashboardService.getCommonSettingsConfig().subscribe(res=>{ + this.commonDetails = res; + if(this.commonDetails.dataStatus == true){ + localStorage.setItem("commonSettings",JSON.stringify(this.commonDetails.records)); + } + }) + } } 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 d433be8..8d30ba4 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 @@ -71,7 +71,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


@@ -156,6 +156,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 9435343..3f70d0d 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 @@ -50,6 +50,7 @@ export class AllPdComponent implements OnInit, OnChanges { todaydate:Date = new Date(); user_role_name: string; limitMsg: boolean = false; + common: any; constructor(private _pd: PdTrigerService,private _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -66,6 +67,9 @@ export class AllPdComponent implements OnInit, OnChanges { pd_applicant_id:[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/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index af7eda6..2fa918a 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 @@ -70,7 +70,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


@@ -127,5 +127,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 7175327..5c5e16f 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 @@ -49,6 +49,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { todaydate:Date = new Date(); user_role_name: string; limitMsg: boolean = false; + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -66,6 +67,9 @@ export class CompletedPdComponent implements OnInit, OnChanges { pd_applicant_id:[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/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index c255ae6..b9d6300 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 @@ -69,7 +69,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


@@ -124,5 +124,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 6c99ed4..39e2529 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 @@ -47,6 +47,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { searchForm:FormGroup; user_role_name: string; limitMsg: boolean = false; + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -63,6 +64,9 @@ export class InprogressPdComponent implements OnInit, OnChanges { pd_applicant_id:[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 18a4c2e..cf1ed30 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 @@ -71,7 +71,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


@@ -126,5 +126,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 b58f825..59c04ae 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 @@ -48,6 +48,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { pageEvent: PageEvent; user_role_name: string; limitMsg: boolean = false; + common: any; constructor(private _pd: PdTrigerService, public _fb: FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -65,6 +66,9 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { pd_applicant_id: [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 1fea95a..75b0d6b 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 @@ -69,7 +69,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/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index db4a095..c5d8475 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 @@ -47,6 +47,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { pageEvent: PageEvent; user_role_name: string; limitMsg: boolean = false; + common: any; constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,private userService:UserService) { this.notifier = notifier; @@ -64,6 +65,9 @@ export class ScheduledPdComponent implements OnInit, OnChanges { pd_applicant_id:[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.component.html b/ng6-seed/src/app/sales-pd/sales-pd.component.html index 5566b0c..abc8f31 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.html +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.html @@ -12,7 +12,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


@@ -85,7 +85,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.component.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.ts index c373a01..31228ec 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.ts @@ -34,8 +34,14 @@ export class SalesPdComponent implements OnInit { todaydate:Date = new Date(); filter_drop_down_data:any; limitMsg: boolean = false; + 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 d0f918b..afe3e62 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -13,6 +13,7 @@ import { CustomValidators } from 'ng2-validation'; import { MatDialog, MatDialogRef, MatDialogConfig } from '@angular/material'; import { CognitoService } from '../../AwsService/cognito.service'; +import { DashboardService } from 'app/dashboard/dashboard.service'; @Component({ selector: 'ms-login-session', @@ -39,15 +40,25 @@ export class LoginComponent implements OnInit{ right: '' } }; + commonDetails: any; constructor( private router: Router, public aws: AwsService, public dialog: MatDialog, - public shared:CognitoService,) { + public shared:CognitoService,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 +69,7 @@ export class LoginComponent implements OnInit{ this.aws.dologin(auth).subscribe(res => { // console.log("do login",res); if (res !== undefined) { + this.getCommonSettings(); // local storage for validate user access localStorage.setItem('user_role',res.idToken.payload["custom:role_id"]); this.router.navigate(['/']); @@ -82,6 +94,7 @@ export class LoginComponent implements OnInit{ if (result !== undefined) { let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result }; this.aws.dologin(auth).subscribe(res => { + this.getCommonSettings(); this.router.navigate(['/']); }, err => { // alert(err.message);