From 40a0f5ab1dfebb549e94912b82399f2cc0ff8ad7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 15 Dec 2021 13:47:19 +0530 Subject: [PATCH 1/9] shorten url changes --- .../src/app/session/otp/otp.component.html | 3 +++ .../src/app/session/otp/otp.component.scss | 0 .../src/app/session/otp/otp.component.spec.ts | 25 +++++++++++++++++++ ng6-seed/src/app/session/otp/otp.component.ts | 15 +++++++++++ ng6-seed/src/app/session/session.module.ts | 2 ++ .../video-player/video-player.component.html | 6 ++--- 6 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 ng6-seed/src/app/session/otp/otp.component.html create mode 100644 ng6-seed/src/app/session/otp/otp.component.scss create mode 100644 ng6-seed/src/app/session/otp/otp.component.spec.ts create mode 100644 ng6-seed/src/app/session/otp/otp.component.ts diff --git a/ng6-seed/src/app/session/otp/otp.component.html b/ng6-seed/src/app/session/otp/otp.component.html new file mode 100644 index 000000000..9b399b440 --- /dev/null +++ b/ng6-seed/src/app/session/otp/otp.component.html @@ -0,0 +1,3 @@ +

+ otp works! +

diff --git a/ng6-seed/src/app/session/otp/otp.component.scss b/ng6-seed/src/app/session/otp/otp.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/session/otp/otp.component.spec.ts b/ng6-seed/src/app/session/otp/otp.component.spec.ts new file mode 100644 index 000000000..9f338d7c2 --- /dev/null +++ b/ng6-seed/src/app/session/otp/otp.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OtpComponent } from './otp.component'; + +describe('OtpComponent', () => { + let component: OtpComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OtpComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OtpComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/session/otp/otp.component.ts b/ng6-seed/src/app/session/otp/otp.component.ts new file mode 100644 index 000000000..393a3115b --- /dev/null +++ b/ng6-seed/src/app/session/otp/otp.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-otp', + templateUrl: './otp.component.html', + styleUrls: ['./otp.component.scss'] +}) +export class OtpComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/ng6-seed/src/app/session/session.module.ts b/ng6-seed/src/app/session/session.module.ts index e5709cde3..0ad2c5dee 100755 --- a/ng6-seed/src/app/session/session.module.ts +++ b/ng6-seed/src/app/session/session.module.ts @@ -17,6 +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'; @NgModule({ imports: [ @@ -38,6 +39,7 @@ import { SessionRoutes } from './session.routing'; RegisterComponent, ForgotPasswordComponent, LockScreenComponent, + OtpComponent, ] }) diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.html b/ng6-seed/src/app/video-chat/video-player/video-player.component.html index 87bfedd19..8257a882f 100755 --- a/ng6-seed/src/app/video-chat/video-player/video-player.component.html +++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.html @@ -19,7 +19,7 @@ - + @@ -45,8 +45,8 @@

{{item.status}}

- From 17d422f1c1b2dbe5fab9b7eebae72da2420d9dce Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 17 Dec 2021 21:52:44 +0530 Subject: [PATCH 2/9] banking detail lable changes --- .../forms/banking-details/banking-details.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index edb7debbf..05519e907 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -204,9 +204,9 @@ Select - Personal + Business - Both +
@@ -249,12 +249,12 @@
- Business Details + Business Banking Details
- + Select Yes No From af814f1b0d424dd75f5002d3c3b4f866dedbda2f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sun, 19 Dec 2021 02:23:40 +0530 Subject: [PATCH 3/9] ACused for issues --- .../forms/banking-details/banking-details.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 05519e907..45bd8dc0b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -203,7 +203,7 @@ - Select + Select Business From 32e47445c6d7dc3e258b2c9ee3e758d381e4a84c Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sun, 19 Dec 2021 08:14:39 +0530 Subject: [PATCH 4/9] filterctrl --- .../banking-details.component.html | 4 ++-- .../banking-details/banking-details.component.ts | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 45bd8dc0b..6276f4881 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -132,7 +132,7 @@ - @@ -291,7 +291,7 @@ - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index a5150837c..f1c0c0c25 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -56,7 +56,7 @@ export class BankingDetailsComponent implements OnInit { image_doc_params: { pdid: number; form_id: any; company_id: string; }; form_id: string; - public bankFilterCtrl:FormControl = new FormControl(); + public filterCtrl:FormControl = new FormControl(); public filtered_m_btLenderList:ReplaySubject = new ReplaySubject(1); constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -178,6 +178,7 @@ export class BankingDetailsComponent implements OnInit { // control.push(this.createBankarray()); } else { result.forEach((datas, index) => { + datas.filterCtrl='' // this.selectedBorrower(datas.applicant_name,index); this.selectedAccTypeChanges(+datas.account_type, index) // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); @@ -193,9 +194,10 @@ export class BankingDetailsComponent implements OnInit { if (result1.length == 0) { // control.push(this.createBankarray()); } else { - result1.forEach((datas, index) => { + result1.forEach((datas1, index) => { + datas1.filterCtrl='' // this.selectedBorrower(datas.applicant_name,index); - this.selectedAccTypeChanges1(+datas.account_type_business, index) + this.selectedAccTypeChanges1(+datas1.account_type_business, index) // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); //control.push(this.createBankarray()); control1.push(this.createBusinessarray()); @@ -215,8 +217,8 @@ export class BankingDetailsComponent implements OnInit { this.filterList(); } filterList() { - this.bankFilterCtrl.valueChanges.pipe().subscribe(()=>{ - this.applyFilter(this.bankFilterCtrl.value,this.filtered_m_btLenderList,this.m_btLenderList,'lender_name') + this.filterCtrl.valueChanges.pipe().subscribe(()=>{ + this.applyFilter(this.filterCtrl.value,this.filtered_m_btLenderList,this.m_btLenderList,'lender_name') }) } @@ -263,6 +265,7 @@ export class BankingDetailsComponent implements OnInit { this.bankingForm = this.fb.group({ banking_form_remark: [''], bank_info_available:[''], + bank_info_available_business:[''], itemRows: this.fb.array([]), itemRows1: this.fb.array([]), @@ -283,7 +286,7 @@ export class BankingDetailsComponent implements OnInit { bank_name: [''], other_bank: [''], account_type: [''], - + filterCtrl:[''], //salary: [''], salary: this.pd_cus_segment.substring(0, 2) == 'SE' ? [''] : [''], limit: [''], @@ -304,6 +307,7 @@ export class BankingDetailsComponent implements OnInit { bank_name_business: [''], other_bank_business: [''], account_type_business: [''], + filterCtrl:[''], //salary: [''], salary_business: this.pd_cus_segment.substring(0, 2) == 'SE' ? [''] : [''], limit_business: [''], From ac989915e2c6efefe92eb2a9eb9182539f9fc413 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 25 Dec 2021 02:07:47 +0530 Subject: [PATCH 5/9] vendor validation removed and vendor menu view based on role --- .../list-pd/pd-report/pd-report.component.scss | 2 +- .../qc-list/qc-pd-report/qc-pd-report.component.scss | 2 +- .../settings/users/register/register.component.html | 5 +++-- .../app/settings/users/register/register.component.ts | 10 +++++++++- .../src/assets/styles/scss/components/_messages.scss | 6 +++--- 5 files changed, 17 insertions(+), 8 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 ce799dd58..3b58d3c81 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/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 c3a4529d4..fa93a7e63 100755 --- 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/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 802277039..c6e5c4532 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -164,7 +164,7 @@ Designation is Required - + @@ -174,7 +174,8 @@ - + + Select diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 1f65cd0ec..5c01337d7 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -74,6 +74,7 @@ export class RegisterComponent implements OnInit { configdata: any; shortname: any; vendorlist: any; + vendor: boolean; constructor( private router: Router, public fb: FormBuilder,public cb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef ,private elementRef: ElementRef,public users:UserService,notifier:NotifierService,private dialog: MatDialog) { @@ -331,6 +332,13 @@ console.log("cog",userData,this.usersData) this.visible = false; // alert(this.visible); } + if(e.role_id=='28' ||e.role_id=='29') + { + this.vendor=true; + } + else{ + this.vendor=false; + } // if(e.value){ @@ -396,7 +404,7 @@ getBranch(flag?){ if(this.types[0].entity_type_id == '2' && this.regForm.value.lenVenName.short_name == 'MWISE') { //this.regForm.addControl('user_config',this.addUserConfigControls()) this.regForm.addControl('designation',new FormControl('',Validators.required)) - this.regForm.addControl('smc_agency_id',new FormControl('',Validators.required)) + this.regForm.addControl('smc_agency_id',new FormControl('')) this.getvendor() this.users.getEntityPreferences(this.regForm.value.lenVenName.entity_id).subscribe(res=>{ if(res['dataStatus']) { diff --git a/ng6-seed/src/assets/styles/scss/components/_messages.scss b/ng6-seed/src/assets/styles/scss/components/_messages.scss index 2767914d0..56cad7b4a 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; From a7c6897a5ce4b7b616e0cc4c00cce4978667af0e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 3 Jan 2022 16:17:55 +0530 Subject: [PATCH 6/9] for live issues add company_id @param getpdformdetails --- .../business-assets-info/business-assets-info.component.html | 2 +- .../business-assets-info/business-assets-info.component.ts | 3 ++- .../list-pd/start-pd/forms/images-all/images-all.component.ts | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index f8460ef09..698680e78 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -33,7 +33,7 @@
Select Yes diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 514470f4e..207d62a45 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -206,6 +206,7 @@ export class BusinessAssetsInfoComponent implements OnInit { reqparams.parent_pdid = this.parent_pdid; reqparams.pd_id = this.pdid; reqparams.pd_form_id = '22'; + reqparams.company_id=this.company_id; this.pdTrigerService.retriveForm(reqparams).subscribe( data => { if (data) { @@ -309,7 +310,7 @@ export class BusinessAssetsInfoComponent implements OnInit { let selectedCity = this.cityArr.filter(element => element.city_id == dataValue.city)[0]; // console.log(selectedCity,dataValue.city,selectedState); let selectedPincode = this.pinArr.filter(element => element.pincode_id == dataValue.pincode)[0]; -console.log(selectedAddressType) + console.log(selectedAddressType) let addressType = dataValue.address_type != 1 && selectedAddressType ? selectedAddressType.address_type : dataValue.address_type_others; console.log(addressType) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts index 4622482aa..079f1d0dd 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.ts @@ -40,8 +40,7 @@ export class ImagesAllComponent implements OnInit { imageData: any; // if(this.records.is_cus_link_disabled != '1') { this.imageData =this.records.img_data; this.imageData.forEach(val=>{ - console.log('tamil'); - console.log(val); + val.is_loader = false val.is_saved = true }) From baae0d0aba37b2bc0b71646ec99739f8ac3ed1ca Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 4 Jan 2022 18:14:52 +0530 Subject: [PATCH 7/9] add pd (remove validation loan amount,loan applicant id) --- .../list-pd/add-pd/add-pd.component.html | 12 +++++++-- .../list-pd/add-pd/add-pd.component.ts | 25 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index aeb37dd45..a7620fc28 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -158,13 +158,21 @@ - + + + {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount + + {{"₹"}} {{pdMain.loan_amount.value | numberToWords}} Only + Required. + Enter valid amount. + @@ -277,7 +285,7 @@ Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   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 bb3f20db4..32b53491a 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 @@ -102,14 +102,18 @@ export class AddPdComponent implements OnInit, OnDestroy { this.filterList() } getProCusPDType(entity_id){ + console.log(entity_id); this._pd.getEntityPreferences(entity_id).subscribe(res=>{ if(res['dataStatus']){ + console.log(res); + console.log('res'); this.productAllList=res['records'].products this.pdTypeList=res['records'].pd_types this.customerSegmentAllList=res['records'].customer_segments this.finInstitutionList=res['records'].financial_institutions let lender_other_config = res['records'].lender_other_config + lender_other_config = JSON.parse(lender_other_config) if(lender_other_config != null){ this.removedControl = lender_other_config.non_mandatory_fields @@ -117,6 +121,8 @@ export class AddPdComponent implements OnInit, OnDestroy { console.log('lendercofig',lender_config) this._PDtriggerForm.controls[lender_config].clearValidators(); this._PDtriggerForm.controls[lender_config].updateValueAndValidity() + this._PDtriggerForm.controls['loan_amount'].clearValidators(); + this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity() }) } else{ @@ -176,7 +182,7 @@ export class AddPdComponent implements OnInit, OnDestroy { applicant_landline: [null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], company_name: [null], remarks: [null], - // allocation_type: [null], + // allocation_type: [null], // sub_allocation_type: [null], coapplicants: this._fb.array([]), addresses: this._fb.array([this.createAddresses()]), @@ -197,7 +203,14 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls.pd_branch_id.setValue(null); this.productList = this.productAllList; - + // if(this.lenderShortName == 'CLIX') + // { + + // 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'){ // let getProductAbbr = this.productAllList.map(dval => dval.product_abbr); @@ -242,10 +255,10 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } - else{ - this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); - this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); - } + // else{ + // this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + // this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + // } // if(this.lenderShortName == "IIB"){ //FOR INDUSLAND BANK // // console.log("entered"); From c54ada3aec9e36349bf5c6bc7e9d07af09f3c00e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 6 Jan 2022 10:34:08 +0530 Subject: [PATCH 8/9] regenerate process --- .../pd-service/pd-triger.service.ts | 31 +++++ .../re-generate-report.component.html | 34 ++++++ .../re-generate-report.component.scss | 0 .../re-generate-report.component.spec.ts | 25 ++++ .../re-generate-report.component.ts | 114 ++++++++++++++++++ .../sales-pd-list/sales-pd.component.html | 26 +++- .../sales-pd-list/sales-pd.component.ts | 25 +++- ng6-seed/src/app/sales-pd/sales-pd.module.ts | 29 ++++- 8 files changed, 277 insertions(+), 7 deletions(-) create mode 100644 ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html create mode 100644 ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.scss create mode 100644 ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.spec.ts create mode 100644 ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.ts 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 5b72c0b9b..c81f1b523 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 @@ -1039,4 +1039,35 @@ export class PdTrigerService { console.log(params); return this._http.post(this.apiUrl+'updateMISReportRemarks',params); } + generatesalereport(params :any): Observable { + // let httpParams = new HttpParams().set('pdid', countpdid); + // httpParams = httpParams.append('random_string',randomString); + return this._http.get(this.apiUrl + 'regenerateSaleReport?sales_pd_id=' +params) + .pipe( + catchError(this.handleError('role', [])) + ) + } + generatemail(params :any): Observable { + // let httpParams = new HttpParams().set('pdid', countpdid); + // httpParams = httpParams.append('random_string',randomString); + return this._http.get(this.apiUrl + 'resendSaleReportMail?sales_pd_id=' +params) + .pipe( + catchError(this.handleError('role', [])) + ) + } + //generatesateliteimage(params :any): Observable { + // console.log('params'); + // console.log(params); + // // let httpParams = new HttpParams().set('pdid', countpdid); + // // httpParams = httpParams.append('random_string',randomString); + // return this._http.post(this.apiUrl + 'regenerateSatelliteImg',{ "records": params }) + // .pipe( + // catchError(this.handleError('role', [])) + // ) + // } + generatesateliteimage(param:any): Observable{ + return this._http.post(this.apiUrl + 'regenerateSatelliteImg',param ) + } + + } diff --git a/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html new file mode 100644 index 000000000..b1863bd77 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.html @@ -0,0 +1,34 @@ + +

{{title}}

+ +
+

+ {{question}} +

+ + +
+ + Location + + + + +
+ +
+ + + + + + + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.scss b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.spec.ts b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.spec.ts new file mode 100644 index 000000000..7c887b446 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ReGenerateReportComponent } from './re-generate-report.component'; + +describe('ReGenerateReportComponent', () => { + let component: ReGenerateReportComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ReGenerateReportComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ReGenerateReportComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.ts b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.ts new file mode 100644 index 000000000..e6db3b5b1 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/re-generate-report/re-generate-report.component.ts @@ -0,0 +1,114 @@ +import { Component, OnInit, ViewChild , Input, Inject} from '@angular/core'; +import { NotifierService } from "angular-notifier"; +import {MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material'; +import { FormControl, Validators } from '@angular/forms'; +import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; + +@Component({ + selector: 'app-re-generate-report', + templateUrl: './re-generate-report.component.html', + styleUrls: ['./re-generate-report.component.scss'] +}) +export class ReGenerateReportComponent implements OnInit { + private notifier: NotifierService; + errorMessage:any[]=[]; + option: any; + title:any; + question:any; + geolocation:FormControl = new FormControl('',Validators.compose([Validators.required])) + constructor(notifier: NotifierService,private _pdSales: PdTrigerService,private dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; } + + ngOnInit() { + this.option=this.data.option; + if(this.option=='report') + { + this.title='Re-Generate the Report'; + this.question='Do you want to Re-Generate the Report'; + } + else if(this.option=='mail') + { + this.title='Re-Sent the Email' + this.question='Do you want to Re-Sent the Email'; + } + else + { + this.title='Geolocation' + this.question='Enter the Geolocation'; + } + } + submit(pdid,option) + { + if(option=='report') + { + this._pdSales.generatesalereport(pdid) + .subscribe( + data => { + if (data.status == 200) { + + this.dialogRef.close(); + + alert('generate report succussfully'); + } + + + } + + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + alert(error.html_format); + }); + } + else if(option=='mail') + { + this._pdSales.generatemail(pdid) + .subscribe( + data => { + if (data.status == 200) { + this.dialogRef.close(); + alert('mail sent succussfully'); + this.notifier.notify('error','error'); + + } + + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + alert(error.html_format); + }); + + } + else + { + let geolocation:any = { + "sales_pd_id":pdid, + "geo_location":this.geolocation.value + }; + + + this._pdSales.generatesateliteimage(geolocation) + .subscribe( + data => { + if (data.status == 200) { + this.dialogRef.close(); + alert('Saved succussfully'); + + } + + } + // , error => this.errorMessage = error); + ,error => { + this.errorMessage.push(error); + // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + alert(error.html_format); + }); + + + } + + } + +} 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 f92d26c93..bc4f9f584 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 @@ -17,7 +17,7 @@
- @@ -91,6 +91,30 @@ matTooltipPosition="above" color="primary" (click)="salesPDpdf(details.sales_pd_id)">file_download + + + + + + + + + + + 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 9bafdf9de..e402898cf 100755 --- 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 @@ -1,7 +1,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatTableDataSource, MatPaginator, MatSort, PageEvent } from '@angular/material'; +import { MatTableDataSource, MatPaginator, MatSort, PageEvent, MatDialog } from '@angular/material'; import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; import { UserService } from 'app/settings/service/user.service'; +import {ReGenerateReportComponent} from './../re-generate-report/re-generate-report.component' + @Component({ selector: 'app-sales-pd', @@ -13,7 +15,7 @@ export class SalesPdComponent implements OnInit { public dataSourceTab4 = new MatTableDataSource(); filter_input:string=''; - displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Officer Name','status','Create On','Action']; + displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Officer Name','status','Create On','Action','Re-Generate']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -32,11 +34,11 @@ export class SalesPdComponent implements OnInit { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; - todaydate:Date = new Date(); + 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,private dialog: MatDialog) { this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count; this.common = this.common.count+' '+this.common.factor } @@ -104,6 +106,21 @@ export class SalesPdComponent implements OnInit { alert(error.html_format); }); } + regeneratereport(data,option) + { + + const dialogRefqw = this.dialog.open(ReGenerateReportComponent, { + data: { pdid: data, option: option}, + disableClose: true, + minWidth: '30%', + maxWidth: '40%', + + }); + dialogRefqw.afterClosed() + .subscribe(dataresult => { + // this.viewPdDetails(this.viewID,this.masterRandomString) + }); + } filteredDataSource(data){ console.log("From Parent",data); diff --git a/ng6-seed/src/app/sales-pd/sales-pd.module.ts b/ng6-seed/src/app/sales-pd/sales-pd.module.ts index 28ff27df4..1230ac0c8 100755 --- a/ng6-seed/src/app/sales-pd/sales-pd.module.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd.module.ts @@ -8,14 +8,39 @@ import { MisReportsComponent } from './mis-reports/mis-reports.component'; import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material'; import { AdvanceFilterComponent } from './sales-pd-list/advance-filter/advance-filter.component'; import { MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from '@angular/material-moment-adapter'; +//import { MatMenuModule} from '@angular/material/menu'; +import { + MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatButtonModule, MatTableModule, MatPaginatorModule, + MatProgressBarModule, MatDialogModule, MatSortModule, + MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, + MatTabsModule, MatCheckboxModule, + MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, + MatMenuModule, MatButtonToggleModule,MatChipsModule,MatProgressSpinnerModule, + MatAutocompleteModule, MatDatepickerModule } from '@angular/material'; +import { ReGenerateReportComponent } from './re-generate-report/re-generate-report.component'; @NgModule({ imports: [ CommonModule, SalesPdRoutingModule, - MaterialModule + MaterialModule,MatMenuModule,MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatButtonModule, MatTableModule, MatPaginatorModule, + MatProgressBarModule, MatDialogModule, MatSortModule, + MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, + MatTabsModule, MatCheckboxModule, + MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, + MatButtonToggleModule,MatChipsModule,MatProgressSpinnerModule, + MatAutocompleteModule, MatDatepickerModule ], - declarations: [SalesPdComponent, MisReportsComponent, AdvanceFilterComponent], + declarations: [SalesPdComponent, MisReportsComponent, AdvanceFilterComponent, ReGenerateReportComponent], + entryComponents:[ReGenerateReportComponent], providers:[{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}] }) From 9885e7d3c3f65aaadbc41838ea73a9cda1d673f3 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 18 Jan 2022 08:58:49 +0530 Subject: [PATCH 9/9] add emp_id in mw sales report --- .../app/sales-pd/mis-reports/mis-reports.component.html | 7 ++++++- .../src/app/sales-pd/mis-reports/mis-reports.component.ts | 3 ++- ng6-seed/src/app/sales-pd/services/sales-pd.service.ts | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html index 8e93706a3..c9af3b3ac 100755 --- a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html +++ b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html @@ -2,7 +2,7 @@
- MW Sales PD MIS Report + MW Sales PD MIS Report @@ -133,6 +133,11 @@ {{row.createdon | date: 'dd-MM-yyyy hh:mm a'}} + + Emp ID + + {{row.smc_emp_code}} + Mail Status diff --git a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts index 3818afe31..5e3ca3c0f 100755 --- a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts +++ b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts @@ -43,6 +43,7 @@ export class MisReportsComponent implements OnInit { 'officer_name', 'status', 'createdon', + 'emp_id', 'mail_status' ]; expandStatus: boolean=true; @@ -136,7 +137,7 @@ export class MisReportsComponent implements OnInit { pageChange(e) { console.log(e); } - searchPanel(){ + searchPanel(){ this.Loading=true; this.reportform.value.from_date=this.pipe.transform(this.reportform.value.from_date,'yyyy-MM-dd') this.reportform.value.to_date=this.pipe.transform(this.reportform.value.to_date,'yyyy-MM-dd') diff --git a/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts b/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts index d2d687a82..6329f9b49 100755 --- a/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts +++ b/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts @@ -15,10 +15,12 @@ export class SalesPdService { constructor(private _http:HttpClient) { } salesPDMisReport(params): Observable{ + return this._http.post(api_url+'salesPDMisReport',params) } advancedFilter(params): Observable{ + return this._http.post(api_url+'filterSalesPDList',{"records":params}) }