From b9311726863fc26f9b6d7b8814f648c5ef1f745a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 25 Dec 2021 00:01:29 +0530 Subject: [PATCH] add smcagencyid --- .../pd-report/pd-report.component.scss | 2 +- .../pd-service/pd-triger.service.ts | 167 ++++++++++-------- .../qc-pd-report/qc-pd-report.component.scss | 2 +- .../styles/scss/components/_messages.scss | 6 +- 4 files changed, 97 insertions(+), 80 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss index ce799dd..3b58d3c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/pd-report.component.scss @@ -5,7 +5,7 @@ margin-top: -5px; display: block; } -:host /deep/ { +:host { mat-sidenav { max-width: 400px; max-height: 500px; diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 5bc8bc9..9699f59 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -175,118 +175,135 @@ export class PdTrigerService { // get pd details getPdDetails(lenderId): Observable { - this.userRoleType=localStorage.getItem('user_role'); - this.usertype=localStorage.getItem('usertype'); - if(this.usertype=='true') - { - if(this.userRoleType=='29') - { - this.pdagencyid = localStorage.getItem('smc_agency_id'); - this.entity_id=localStorage.getItem('LocalSetEntity'); - let userid1=this._aws.getlocale() - let userid = localStorage.getItem('userid'); - const Lender:any = this.entity_id ? - { params: new HttpParams().set('lenderid', this.entity_id) } : - {}; - - Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1).set('pdagencyid',this.pdagencyid).set('pdofficerid',userid) : {} - - return this._http.get(this.apiUrl + "listLessPDDetails/get", Lender) - .pipe( - catchError(this.handleError('operation', [])) - ) - } - else - { - this.pdagencyid = localStorage.getItem('smc_agency_id'); + // this.usertype=localStorage.getItem('usertype'); + + + // else if(this.userRoleType=='28') + // { + // // alert('manager'); + // console.log('manager'); + // this.pdagencyid = localStorage.getItem('smc_agency_id'); - this.entity_id=localStorage.getItem('LocalSetEntity'); - let userid1=this._aws.getlocale() + // this.entity_id=localStorage.getItem('LocalSetEntity'); + // let userid1=this._aws.getlocale() - const Lender:any = this.entity_id ? - { params: new HttpParams().set('lenderid', this.entity_id) } : - {}; + // const Lender:any = this.entity_id ? + // { params: new HttpParams().set('lenderid', this.entity_id) } : + // {}; - Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1).set('pdagencyid',this.pdagencyid) : {} + // Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid1).set('pdagencyid',this.pdagencyid) : {} - return this._http.get(this.apiUrl + "listLessPDDetails/get", Lender) - .pipe( - catchError(this.handleError('operation', [])) - ) - } - } + // return this._http.get(this.apiUrl + "listLessPDDetails/get", Lender) + // .pipe( + // catchError(this.handleError('operation', [])) + // ) + // } - else - { + + + let userRoleType1=localStorage.getItem('user_role'); + + let latest =localStorage.getItem('Latest'); + this.entity_id=localStorage.getItem('LocalSetEntity'); + let LenderRoleID : any = localStorage.getItem('LenderRoleID'); + let userid=this._aws.getlocale() const Lender:any = this.entity_id ? { params: new HttpParams().set('lenderid', this.entity_id) } : { }; // if(LenderRoleID == '25') { + if(LenderRoleID=='28' || LenderRoleID=='29') + { + + this.pdagencyid = localStorage.getItem('smc_agency_id'); + Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid).set('pdagencyid',this.pdagencyid) : {} + } + + else + { Lender.params = Lender && Lender.params ? Lender.params.set('createdby',userid) : {} + } // } - return this._http.get(this.apiUrl + "listLessPDDetails/get",Lender) + return this._http.get(this.apiUrl + "listLessPDDetails/get",Lender) .pipe( catchError(this.handleError('operation', [])) ) - } + } // get status based pd list getTabStatusPdDetails(status: string,lenderId): Observable { - this.usertype=localStorage.getItem('usertype'); - if(this.usertype=='true') - { - if(this.userRoleType=='29') - { - this.pdagencyid = localStorage.getItem('smc_agency_id'); - this.entity_id=localStorage.getItem('LocalSetEntity'); - let userid1=this._aws.getlocale() - let userid = localStorage.getItem('userid'); - let paramHttp1:any= this.entity_id && status ? - {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid).set('pdofficerid',userid).set('is_smc_vendor',this.usertype)} : {}; - paramHttp1.params = paramHttp1.params.set('createdby',userid1) - return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1) - .pipe( - catchError(this.handleError('operation', [])) - ) - } + // let LenderID=localStorage.getItem('LenderRoleID'); + + // if(LenderID=='29') + // { + // this.pdagencyid = localStorage.getItem('smc_agency_id'); + // this.entity_id=localStorage.getItem('LocalSetEntity'); + // let userid1=this._aws.getlocale() + // let userid = localStorage.getItem('userid'); + // let paramHttp1:any= this.entity_id && status ? + // {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid).set('pdofficerid',userid).set('is_smc_vendor',this.usertype)} : {}; + // paramHttp1.params = paramHttp1.params.set('createdby',userid1) + // return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1) + // .pipe( + // catchError(this.handleError('operation', [])) + // ) + // } - else - { - this.pdagencyid = localStorage.getItem('smc_agency_id'); - this.entity_id=localStorage.getItem('LocalSetEntity'); - let userid1=this._aws.getlocale() - let paramHttp1:any= this.entity_id && status ? - {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid)} : {}; - paramHttp1.params = paramHttp1.params.set('createdby',userid1) - return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1) - .pipe( - catchError(this.handleError('operation', [])) - ) - } - } - else - { + // else if(LenderID=='28') + // { + // this.pdagencyid = localStorage.getItem('smc_agency_id'); + // this.entity_id=localStorage.getItem('LocalSetEntity'); + // let userid1=this._aws.getlocale() + // let paramHttp1:any= this.entity_id && status ? + // {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid)} : {}; + // paramHttp1.params = paramHttp1.params.set('createdby',userid1) + // return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1) + // .pipe( + // catchError(this.handleError('operation', [])) + // ) + // } + + this.entity_id=localStorage.getItem('LocalSetEntity'); let LenderRoleID : any = localStorage.getItem('LenderRoleID'); let userid=this._aws.getlocale() + if(LenderRoleID=='28'||LenderRoleID=='29') + { + + this.pdagencyid = localStorage.getItem('smc_agency_id'); + let paramHttp1:any= this.entity_id && status ? + + {params : new HttpParams().set('lenderid', this.entity_id).set('status',status).set('pdagencyid',this.pdagencyid)} : {}; + paramHttp1.params = paramHttp1.params.set('createdby',userid) + return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp1) + .pipe( + catchError(this.handleError('operation', [])) + ) + } + else + { + let paramHttp:any= this.entity_id && status ? {params : new HttpParams().set('lenderid', this.entity_id).set('status',status)} : {}; paramHttp.params = paramHttp.params.set('createdby',userid) - return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp) + return this._http.get(this.apiUrl + "listLessPDDetails/get", paramHttp) .pipe( catchError(this.handleError('operation', [])) ) - } + + } + + + } // get edit row pd details diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss index cb94a35..2554799 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.scss @@ -5,7 +5,7 @@ margin-top: -5px; display: block; } -:host /deep/ { +:host { mat-sidenav { max-width: 400px; max-height: 500px; diff --git a/ng6-seed/src/assets/styles/scss/components/_messages.scss b/ng6-seed/src/assets/styles/scss/components/_messages.scss index 2767914..56cad7b 100755 --- a/ng6-seed/src/assets/styles/scss/components/_messages.scss +++ b/ng6-seed/src/assets/styles/scss/components/_messages.scss @@ -2,7 +2,7 @@ @import "../mixins/bi-app/bi-app-ltr"; @import "../app.variables"; @import "../mixins"; -:host /deep/ { +:host { [appAccordionToggle] { cursor: pointer; } @@ -86,7 +86,7 @@ } } -.app-dark :host /deep/ { +.app-dark :host { .messages-list { .mat-list-item { background: mat-color($dark-background, card); @@ -95,7 +95,7 @@ } } -[dir="rtl"] :host /deep/ { +[dir="rtl"] :host { .messages-nav { mat-icon { margin-right: 0;