From 3b5407b10159f6b21bbbd665bc5f84a509e2bdf2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 24 Jan 2022 18:23:19 +0530 Subject: [PATCH 01/12] sales pd list changes --- .../manage-pd/list-pd/view-pd/view-pd.component.html | 2 +- .../src/app/sales-pd/sales-pd-list/sales-pd.component.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index ae5969331..f7a87efa9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -222,7 +222,7 @@ - + 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 bc4f9f584..014741cd9 100755 --- 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 @@ -81,18 +81,18 @@ - + {{details.createdon | date: 'dd/MM/yyyy'}} - + - + From 4953bffdad33a1c1fc986584c806aa15afde04e1 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 28 Jan 2022 10:23:33 +0530 Subject: [PATCH 02/12] add questions in employment form --- .../employment-info.component.html | 30 +++++++++++++++++-- .../employment-info.component.ts | 13 +++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index c49296b7b..cd013ead9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -17,7 +17,7 @@
-
+
@@ -404,7 +404,33 @@ Bonus Type Others Required - +
+ + + Select + Yes + No + + Is there any relationship between applicant and employer ? Required + + + + + Total working Experience is Lower + + + + + Total working Experience is Lower + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 454b4ca9a..4ac9d934a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -194,7 +194,12 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm.controls['bonus_frequency'].setValue(value.records.bonus_frequency); this.employmentForm.controls['bonus_type'].setValue(value.records.bonus_type); this.employmentForm.controls['bonus_type_other'].setValue(value.records.bonus_type_other); + this.employmentForm.controls['employer_applicant_relation'].setValue(value.records.employer_applicant_relation); + this.employmentForm.controls['employer_applicant_relation_type'].setValue(value.records.employer_applicant_relation_type); + + this.employmentForm.controls['no_of_employee_in_firm'].setValue(value.records.no_of_employee_in_firm); this.employmentForm.controls['id_card_issued_company'].setValue(value.records.id_card_issued_company); + if(value.records.id_card_issued_company == 'no'){ this.employmentForm.controls['why_company_id_proof_not_available'].setValue(value.records.why_company_id_proof_not_available); } @@ -310,6 +315,9 @@ export class EmploymentInfoComponent implements OnInit { bonus_frequency: [''], bonus_type: [''], bonus_type_other: [''], + employer_applicant_relation:[], + employer_applicant_relation_type:[], + no_of_employee_in_firm:[], id_card_issued_company: [''], why_company_id_proof_not_available: [''], // employment_details: this.fb.array([]), @@ -679,7 +687,10 @@ export class EmploymentInfoComponent implements OnInit { records.bonus_frequency = this.employmentForm.controls['bonus_frequency'].value; records.bonus_type = this.employmentForm.controls['bonus_type'].value; records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value; - + records.employer_applicant_relation = this.employmentForm.controls['employer_applicant_relation'].value; + records.employer_applicant_relation_type = this.employmentForm.controls['employer_applicant_relation_type'].value; + + records.no_of_employee_in_firm = this.employmentForm.controls['no_of_employee_in_firm'].value; records.id_card_issued_company = this.employmentForm.controls['id_card_issued_company'].value; if(this.employmentForm.controls['id_card_issued_company'].value == 'no'){ records.why_company_id_proof_not_available = this.employmentForm.controls['why_company_id_proof_not_available'].value; From c20833e9d7b59d1103e70648d76740fe46d9e97d Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 28 Jan 2022 12:59:44 +0530 Subject: [PATCH 03/12] validation removed based on clix --- .../manage-pd/list-pd/add-pd/add-pd.component.ts | 6 +++--- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 32b53491a..c1eb7379a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -209,7 +209,7 @@ export class AddPdComponent implements OnInit, OnDestroy { // this._PDtriggerForm.controls['loan_amount'].setValue(null) // this._PDtriggerForm.controls['loan_amount'].clearValidators() // this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity() - // alert('clix'); + // } // if(this.lenderShortName == 'CLIX'){ @@ -251,8 +251,8 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['sub_entity_id'].setValue(lender.entity_id) if(lender.short_name == 'CFPL'){ - this._PDtriggerForm.controls['loan_amount'].clearValidators(); - this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) + // this._PDtriggerForm.controls['loan_amount'].clearValidators(); + this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]) this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } // else{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 33fa85018..31dbba6d8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -261,9 +261,15 @@ if(!option){ this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } - else{ - this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + else if(lender.short_name == 'CLIX') + { + this._EditPDtriggerForm.controls['loan_amount'].clearValidators(); this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + + } + else{ + this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } // console.log("len",lender) } From e3e15f558453149523f3dbe6a9d1ff93df4df6a4 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 29 Jan 2022 10:53:22 +0530 Subject: [PATCH 04/12] otp functionalities --- ng6-seed/src/app/app.module.ts | 5 +- .../src/app/dashboard/dashboard.service.ts | 18 +++++ .../pd-allocation.component.scss | 2 +- .../src/app/session/login/login.component.ts | 77 ++++++++++++++++++- .../src/app/session/otp/otp.component.html | 31 +++++++- .../src/app/session/otp/otp.component.scss | 18 +++++ ng6-seed/src/app/session/otp/otp.component.ts | 32 +++++++- ng6-seed/src/app/session/session.module.ts | 7 +- 8 files changed, 174 insertions(+), 16 deletions(-) diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index 655dae9cc..b3c2b757c 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -64,6 +64,7 @@ import { VideoChatComponent } from './video-chat/video-chat.component' import { PushNotifyService } from './shared/push-notify.service'; import { MatVideoModule } from 'mat-video'; import { ReqTokenInterceptor } from './_guard/req-token.interceptor'; +import { OtpComponent } from './session/otp/otp.component'; export function HttpLoaderFactory(http: HttpClient) { @@ -86,7 +87,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { AdminLayoutComponent, AuthLayoutComponent, NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, HttpLoaderComponent, - IncomingCallComponent, VideoChatComponent, + IncomingCallComponent, VideoChatComponent,OtpComponent ], imports: [ MatDialogModule, @@ -150,7 +151,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { }, MessagingService, AsyncPipe,LoaderService ], - entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,] + entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent] // IncomingCallComponent,VideoChatComponent,], ,bootstrap: [AppComponent] }) diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index 9c75cf2de..27eedc01d 100755 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -117,5 +117,23 @@ private handleError(operation = 'operation', result?: T) { return of(result as T); }; } +// generateotp(email):Observable{ +// return this._http.post(this.apiUrl+'generateOTP', ''); +// } + +generateotp(email): Observable { + + return this._http.post(this.apiUrl + 'generateOTP', { "records":{ "email":email}}) + .pipe( + catchError(this.handleError('role', [])) + ) +} +resetpassword(data,otp): Observable { + + return this._http.post(this.apiUrl + 'verifyOTP', { "records":{ "email":data,"OTP":otp}}) + .pipe( + catchError(this.handleError('role', [])) + ) +} } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss index 044bbd96c..4286341fc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss @@ -16,7 +16,7 @@ justify-content: center !important; } .paragraph_change { - color: #fff !important; + color: #fff !important; background-color: #e00201 !important; // padding: 10px !important; } diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index c12e25fe3..94cae5c53 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -15,6 +15,8 @@ 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'; +import { OtpComponent } from '../otp/otp.component'; + @Component({ selector: 'ms-login-session', @@ -42,7 +44,8 @@ export class LoginComponent implements OnInit{ } }; commonDetails: any; - constructor( + dialogRef: MatDialogRef; + constructor( private router: Router, public aws: AwsService, public dialog: MatDialog, public shared:CognitoService,private messagingService:MessagingService,private dashBoardService:DashboardService) { @@ -116,11 +119,45 @@ export class LoginComponent implements OnInit{ forgotpassword() { + this.dashBoardService.generateotp(this.email).subscribe( + data => { + console.log('data'); + console.log(data) + if (data.status == 200) { + this.dialogRef = this.dialog.open(OtpComponent, { + data: this.email, + width: '60%', + disableClose: true + }); + + } + else + { + + } + + }); + // let dialogRef = this.dialog.open(OtpComponent, this.config); + // dialogRef.afterClosed().subscribe(result => { + // if (result !== undefined) { + // 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 => { + // alert(err.message); + // }) + // } + // }); + + - let auth = { 'Username': this.email }; - this.aws.userforgotpass(auth).subscribe(res => { + // let auth = { 'Username': this.email }; + // this.aws.userforgotpass(auth).subscribe(res => { - }) + // }) } loggedInCheck(){ //alert(this.shared.isLoggedIn); @@ -223,4 +260,36 @@ export class ForgotPass { } +@Component({ + selector: 'app-jazz-dialog', + template: ` +
Forgot Password
+ + + + + + + + +
+ + + + + ` +}) +export class OTP { + + newpassword: any = newpassword; + confirmPassword: any = confirmPassword; + jazzMessage = 'Jazzy jazz jazz'; + + constructor(public dialogRef: MatDialogRef) { + + } + +} + + diff --git a/ng6-seed/src/app/session/otp/otp.component.html b/ng6-seed/src/app/session/otp/otp.component.html index 9b399b440..dbe4e390b 100644 --- a/ng6-seed/src/app/session/otp/otp.component.html +++ b/ng6-seed/src/app/session/otp/otp.component.html @@ -1,3 +1,28 @@ -

- otp works! -

+ +

+
+ OTP +
+
+ + +
+

+ + + + + + + + +
+ + +
+ + diff --git a/ng6-seed/src/app/session/otp/otp.component.scss b/ng6-seed/src/app/session/otp/otp.component.scss index e69de29bb..e592fb882 100644 --- a/ng6-seed/src/app/session/otp/otp.component.scss +++ b/ng6-seed/src/app/session/otp/otp.component.scss @@ -0,0 +1,18 @@ +mat-form-field { + margin: 0 2%; + } +.paragraph_change { + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; +} + .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + mat-dialog-actions{ + border-top: 2px solid #e00201; + } + +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} diff --git a/ng6-seed/src/app/session/otp/otp.component.ts b/ng6-seed/src/app/session/otp/otp.component.ts index 393a3115b..6f53e1896 100644 --- a/ng6-seed/src/app/session/otp/otp.component.ts +++ b/ng6-seed/src/app/session/otp/otp.component.ts @@ -1,15 +1,41 @@ -import { Component, OnInit } from '@angular/core'; - +import { Component, OnInit,Inject } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; +import { DashboardService } from 'app/dashboard/dashboard.service'; +import { NotifierService } from 'angular-notifier'; @Component({ selector: 'app-otp', templateUrl: './otp.component.html', styleUrls: ['./otp.component.scss'] }) export class OtpComponent implements OnInit { + //public notifier : NotifierService; - constructor() { } + constructor( private dialogRef: MatDialogRef,private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public data: any,private dashBoardService:DashboardService) + { + + } ngOnInit() { } + updatepassword(otp) + { + console.log('data'); + console.log(this.data); + this.dashBoardService.resetpassword(this.data,otp).subscribe( + data => { + console.log('data'); + console.log(data) + if (data.status == 200) { + alert('Password Reset Successfully'); + this.dialogRef.close(); + } + else + { + alert('OTP is invalid. Plesae enter correct OTP.!'); + + } + + }) +} } diff --git a/ng6-seed/src/app/session/session.module.ts b/ng6-seed/src/app/session/session.module.ts index 0ad2c5dee..121d8d099 100755 --- a/ng6-seed/src/app/session/session.module.ts +++ b/ng6-seed/src/app/session/session.module.ts @@ -17,7 +17,7 @@ import { ForgotPasswordComponent } from './forgot-password/forgot-password.compo import { LockScreenComponent } from './lockscreen/lockscreen.component'; import { SessionRoutes } from './session.routing'; -import { OtpComponent } from './otp/otp.component'; +//import { OtpComponent } from './otp/otp.component'; @NgModule({ imports: [ @@ -39,8 +39,9 @@ import { OtpComponent } from './otp/otp.component'; RegisterComponent, ForgotPasswordComponent, LockScreenComponent, - OtpComponent, - ] + //OtpComponent, + ], + // entryComponents:[OtpComponent] }) export class SessionModule {} From 4bf04b71373f881afd57f6aa0ff7200258538dcd Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 29 Jan 2022 14:00:40 +0530 Subject: [PATCH 05/12] otp changes --- ng6-seed/src/app/app.module.ts | 6 +-- .../src/app/session/login/login.component.ts | 51 +------------------ ng6-seed/src/app/session/session.module.ts | 10 ++-- 3 files changed, 9 insertions(+), 58 deletions(-) diff --git a/ng6-seed/src/app/app.module.ts b/ng6-seed/src/app/app.module.ts index b3c2b757c..ba8f4977d 100755 --- a/ng6-seed/src/app/app.module.ts +++ b/ng6-seed/src/app/app.module.ts @@ -64,7 +64,7 @@ import { VideoChatComponent } from './video-chat/video-chat.component' import { PushNotifyService } from './shared/push-notify.service'; import { MatVideoModule } from 'mat-video'; import { ReqTokenInterceptor } from './_guard/req-token.interceptor'; -import { OtpComponent } from './session/otp/otp.component'; +//import { OtpComponent } from './session/otp/otp.component'; export function HttpLoaderFactory(http: HttpClient) { @@ -87,7 +87,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { AdminLayoutComponent, AuthLayoutComponent, NewPasswordDialog,ForgotPass,ChangePasswordDialog, RoleMenuItemsPipe, HttpLoaderComponent, - IncomingCallComponent, VideoChatComponent,OtpComponent + IncomingCallComponent, VideoChatComponent ], imports: [ MatDialogModule, @@ -151,7 +151,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { }, MessagingService, AsyncPipe,LoaderService ], - entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog,OtpComponent] + entryComponents: [NewPasswordDialog,ForgotPass,ChangePasswordDialog] // IncomingCallComponent,VideoChatComponent,], ,bootstrap: [AppComponent] }) diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index 94cae5c53..452da0c92 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -137,27 +137,7 @@ export class LoginComponent implements OnInit{ } }); - // let dialogRef = this.dialog.open(OtpComponent, this.config); - // dialogRef.afterClosed().subscribe(result => { - // if (result !== undefined) { - // 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 => { - // alert(err.message); - // }) - // } - // }); - - - // let auth = { 'Username': this.email }; - // this.aws.userforgotpass(auth).subscribe(res => { - - // }) } loggedInCheck(){ //alert(this.shared.isLoggedIn); @@ -260,36 +240,7 @@ export class ForgotPass { } -@Component({ - selector: 'app-jazz-dialog', - template: ` -
Forgot Password
- - - - - - - - -
- - - - - ` -}) -export class OTP { - - newpassword: any = newpassword; - confirmPassword: any = confirmPassword; - jazzMessage = 'Jazzy jazz jazz'; - - constructor(public dialogRef: MatDialogRef) { - - } - -} + diff --git a/ng6-seed/src/app/session/session.module.ts b/ng6-seed/src/app/session/session.module.ts index 121d8d099..7d6012178 100755 --- a/ng6-seed/src/app/session/session.module.ts +++ b/ng6-seed/src/app/session/session.module.ts @@ -6,7 +6,7 @@ import { MatInputModule, MatRadioModule, MatButtonModule, - MatProgressBarModule, + MatProgressBarModule,MatDialogModule, MatToolbarModule } from '@angular/material'; import { FormsModule } from '@angular/forms'; import { MatIconModule} from '@angular/material'; @@ -17,7 +17,7 @@ import { ForgotPasswordComponent } from './forgot-password/forgot-password.compo import { LockScreenComponent } from './lockscreen/lockscreen.component'; import { SessionRoutes } from './session.routing'; -//import { OtpComponent } from './otp/otp.component'; +import { OtpComponent } from './otp/otp.component'; @NgModule({ imports: [ @@ -32,16 +32,16 @@ import { SessionRoutes } from './session.routing'; MatButtonModule, MatProgressBarModule, MatToolbarModule, - FlexLayoutModule + FlexLayoutModule,MatDialogModule ], declarations: [ LoginComponent, RegisterComponent, ForgotPasswordComponent, LockScreenComponent, - //OtpComponent, + OtpComponent ], - // entryComponents:[OtpComponent] + entryComponents:[OtpComponent] }) export class SessionModule {} From cb639472931c9f4b92de6760e751da346720d313 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 4 Feb 2022 13:41:32 +0530 Subject: [PATCH 06/12] pdfimages menu added in view pages --- .../list-pd/view-pd/view-pd.component.html | 6 +++-- .../list-pd/view-pd/view-pd.component.ts | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index f7a87efa9..1f87f2b8e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -215,8 +215,10 @@ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
( {{master.agency_short_name}} - {{master.vendor_status}} )
-
- + +
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 5d3aa2435..1c12437d8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewEncapsulation, EventEmitter, Input, Output, OnDe import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { MatDialog } from '@angular/material'; +import { saveAs as importedSaveAs } from "file-saver"; import { DatePipe } from '@angular/common'; import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from '../../../pd-service/pd-triger.service'; @@ -136,6 +137,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { videoplayback: any = {enableBtn:true,url:null}; openvendorallocation: any; vendor_form_status_arr: any =[]; + spinner_access:boolean=false; constructor(notifier: NotifierService, private dialog: MatDialog, private _fb: FormBuilder, private _pd: PdTrigerService, private route: ActivatedRoute, private router: Router, private ListPdComponent: ListPdComponent) { @@ -760,4 +762,27 @@ else { // }) // } +downloadPDImagesPDF(a){ + this.spinner_access=true + let data = { + "pd_id": this.viewID, + "regenerate":a, + "random_string":this.masterRandomString + }; + this.notifier.notify("info","Processing please wait..") + this._pd.photoPDFDownload(data).subscribe(data => { + if (data.dataStatus) { + window.open(data.records); + this.notifier.notify('success', 'Done Successfully..!'); + } else { + this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + } + this.spinner_access=false + }, err => { + this.spinner_access=false + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (err.error_type == 2 ? err.error_status + ' ( ' + err.error_text + ' ) ' : ' ( ' + err.error_text + ' ) ') +'\" Error Occur.!'); + // alert(err.html_format); + }); +} + } \ No newline at end of file From 2a7e2804dbf7a219900ae87e10c9e30902b84e40 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 16 Feb 2022 22:09:14 +0530 Subject: [PATCH 07/12] crop tools view changes --- .../image-crop/image-crop.component.html | 59 +++++++++++++------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html index df7e389f2..c41278e10 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html @@ -19,46 +19,69 @@
-
+
-
+
+ +
+
+ -
-
+ + +
+ + + + + + +
+
+ Preview - Cropped Image + + +
+ +
+
Is shown report ? -
-
+
+
-
- - +
+
-
- Preview - Cropped Image +
+ + + + + +
- -
+
From dd20044f17c69981a753bff5273d0a1c3f723062 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 18 Feb 2022 10:46:10 +0530 Subject: [PATCH 08/12] image cropping tools --- ng6-seed/Sparqsineedge Web 17-02-22 Test.zip | Bin 0 -> 15335607 bytes .../crop-tools/crop-tools.component.html | 4 +++ .../crop-tools/crop-tools.component.scss | 0 .../crop-tools/crop-tools.component.spec.ts | 25 ++++++++++++++++++ .../crop-tools/crop-tools.component.ts | 23 ++++++++++++++++ .../image-crop/image-crop.component.scss | 12 +++++++++ .../image-crop/image-crop.component.ts | 5 +++- .../forms/image-docs/image-docs.component.ts | 5 +++- .../manage-pd/manage-pd.module.ts | 7 ++--- 9 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 ng6-seed/Sparqsineedge Web 17-02-22 Test.zip create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/crop-tools/crop-tools.component.html create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/crop-tools/crop-tools.component.scss create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/crop-tools/crop-tools.component.spec.ts create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/crop-tools/crop-tools.component.ts diff --git a/ng6-seed/Sparqsineedge Web 17-02-22 Test.zip b/ng6-seed/Sparqsineedge Web 17-02-22 Test.zip new file mode 100644 index 0000000000000000000000000000000000000000..a4e60b2e0ab4e244e1db785c9d5670139dcad797 GIT binary patch literal 15335607 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
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index 9feeccf9f..5c87a3cd5 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -367,6 +367,22 @@ export class QcViewComponent implements OnInit, OnDestroy { this.destroyType=3; this.router.navigate([ '../../../pd_report',pdID,this.reportRandomString], { relativeTo: this.route }); } + OptimizeImage(pdID:any) + { + + this._qc.optimizeImages(pdID).subscribe(result=>{ + console.log('result'); + console.log(result); + if(result['dataStatus']) { + this.notifier.notify("success","Image Optimized Successfully") + } + else{ + this.notifier.notify("warning","Something went wrong") + } + },err=>{ + this.notifier.notify("error","Network Error") + }) + } openCusImages() { const dialogRef = this.dialog.open(QcCusImagesComponent, { data: this.pdMasterData[0], diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts index bbe6b5f16..1ba559331 100755 --- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts +++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts @@ -646,7 +646,11 @@ export class QcService { // let headers = this.createAuthorizationHeader() return this._http.post(this.apiUrl+'getPDImgDetails',params); } - + optimizeImages(pdid):Observable { + + // let headers = this.createAuthorizationHeader() + return this._http.get(this.apiUrl+'optimizeImages/'+pdid); + } auditSmartPDImages(params):Observable { return this._http.post(this.apiUrl+'auditSmartPDImages',params); } From dc0697b4fd9086d2bf057fb7a4ea8f77acec5e4c Mon Sep 17 00:00:00 2001 From: venbainfotech Date: Fri, 18 Mar 2022 17:24:35 +0530 Subject: [PATCH 11/12] MW Credit PD MIS Report added two key --- .../app/reports/smc-credit/smc-credit.component.html | 12 ++++++++++++ .../app/reports/smc-credit/smc-credit.component.ts | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ng6-seed/src/app/reports/smc-credit/smc-credit.component.html b/ng6-seed/src/app/reports/smc-credit/smc-credit.component.html index 2c1554e3b..ed3786130 100644 --- a/ng6-seed/src/app/reports/smc-credit/smc-credit.component.html +++ b/ng6-seed/src/app/reports/smc-credit/smc-credit.component.html @@ -112,6 +112,12 @@ {{row.applicant_name}} + + + Lender Applicant ID + + {{row.lender_applicant_id}} + Credit PD Type @@ -138,6 +144,12 @@ {{row.pd_status}} + + Vendor Status + + {{row.vendor_status}} + + Date diff --git a/ng6-seed/src/app/reports/smc-credit/smc-credit.component.ts b/ng6-seed/src/app/reports/smc-credit/smc-credit.component.ts index d1bd06c8d..0b640da43 100644 --- a/ng6-seed/src/app/reports/smc-credit/smc-credit.component.ts +++ b/ng6-seed/src/app/reports/smc-credit/smc-credit.component.ts @@ -38,13 +38,15 @@ export class SmcCreditComponent implements OnInit { pageIndex:number=0 displayedColumns = ['serialno', - // 'credit_pd_id', + // 'credit_pd_id', 'credit_pd_sno', 'applicant_name', + 'lender_applicant_id', 'credit_pd_type', 'product_abbr', 'officer_name', 'status', + 'vendor_status', 'createdon' //'remarks' //'add' @@ -169,10 +171,12 @@ export class SmcCreditComponent implements OnInit { return { 'Reference Number':val.pd_sno, 'Main Loan Applicant':val.applicant_name, + 'Lender Applicant ID':val.lender_applicant_id, 'Credit PD Type':val.type_name, 'Product Type':val.abbr, 'Credit Person':val.officer_name, 'Status':val.pd_status, + 'Vendor Status':val.vendor_status, 'Date':val.updatedon //'Remarks':val.mis_report_remarks } From 56ddb50bfcb7c5a7fa446b59c3074dbafefe012a Mon Sep 17 00:00:00 2001 From: venbainfotech Date: Mon, 21 Mar 2022 10:22:51 +0530 Subject: [PATCH 12/12] Loan obligation section issue fix --- .../start-pd/forms/current-loan/current-loan.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index c34e1315f..28f3f27ad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -604,7 +604,8 @@ this.filterList() if (records.loan_info_available == 'Yes') { records.loan_details = this.currentLoanForm.controls['loan_details'].value; } - else{ + else if(records.loan_info_available == 'No'){ + records.tot_running_loans=this.currentLoanForm.controls['tot_running_loans'].value records.tot_emi_paid=this.currentLoanForm.controls['tot_emi_paid'].value records.tot_outstanding_loans=this.currentLoanForm.controls['tot_outstanding_loans'].value