From c54ada3aec9e36349bf5c6bc7e9d07af09f3c00e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 6 Jan 2022 10:34:08 +0530 Subject: [PATCH] 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}] })