diff --git a/ng6-seed/src/app/providers/constants/constants.ts b/ng6-seed/src/app/providers/constants/constants.ts index d1d74fb..5e0431b 100755 --- a/ng6-seed/src/app/providers/constants/constants.ts +++ b/ng6-seed/src/app/providers/constants/constants.ts @@ -1,5 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { environment } from 'environments/environment'; // app-scripts v:3.2.4 /* @@ -64,7 +65,9 @@ export class ConstantsProvider { lenUserPoolId: "ap-south-1_4kkhgsYo0", // Username lenClientId: "57t9fv113b5eab5pra127bbgn0", // ClientId for mobile } - return testing; + return (environment.production === true ? production : testing); + + } diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html index 4dfc25f..e2020df 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html @@ -438,8 +438,34 @@ - - + +
+
+ +
+
--> + +
+
+ +
+
+ +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts index 19c9c16..e6e67ba 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts @@ -80,6 +80,8 @@ export class QuesTemplateComponent { image_question_name:any =[] tmp_control: QuestionServiceService; tmp:any =[]; + roleID: string; + pdstatus: string; constructor( private cameraService: CameraService,public dialogRef: MatDialogRef,private route: ActivatedRoute,private router: Router,private dialog:MatDialog,private _fb:FormBuilder,private questionService:QuestionServiceService,private SalesPdService:SalesPdService,notifier: NotifierService,private loaderService:LoaderService) { console.log('Hello QuesTemplateComponent Component'); this.text = 'Hello World'; @@ -87,8 +89,10 @@ export class QuesTemplateComponent { //this.cameraProvider.checkGPSPermission(); //alert('abi1'); //this.ngOnChanges() + } ngOnChanges(){ + //alert('abi'); this.loaderService.showMatSpinnerDialog('Fetching Data...') //this.loadingProvider.pdloader("Fetching Data...") @@ -160,8 +164,16 @@ export class QuesTemplateComponent { } } this.sales_pd_type = localStorage.getItem('sales_pd_type') + } getSalesPDSectionFromApi(sales_pd_id){ + this.roleID = localStorage.getItem('user_role') +console.log(this.roleID) +let completed = localStorage.getItem('completedPD') +let status = JSON.parse(completed) +console.log(status) +this.pdstatus = status.status +console.log(this.pdstatus) // alert('pass'); console.log(sales_pd_id) // this.loaderService.showMatSpinnerDialog('Fetching Data...') @@ -795,7 +807,7 @@ this.proceedonChangeProperty(modified) }; } addData(group_index, parent_index, data, event, options?: any, single_ques?) { - console.clear(); + // console.clear(); data=data.filter(group_indi=>!group_indi.hasOwnProperty('additional_field') && group_indi.additional_field != 1 ) if (options == 'camera') { @@ -1536,7 +1548,7 @@ this.proceedonChangeProperty(modified) } // CHECKING THE SAVE IMAGE REQUEST IS STILL PENDING if(this.submit_btn == true && this.emittedFormGroup != null){ - console.clear(); + // console.clear(); console.log(this.quesAnsForm.dirty); let form_structure=this.quesAnsForm.getRawValue().questions // form_structure.forEach(parent_ques=>{ @@ -1645,9 +1657,11 @@ this.proceedonChangeProperty(modified) // } } sendSectiontoApi(params){ - // setTimeout(()=>{ - // this.loaderService.showMatSpinnerDialog('Please wait...') - // },1200) + if(params.section_id != 9){ + setTimeout(()=>{ + this.loaderService.showMatSpinnerDialog('Please wait...') + },1000) +} // alert('lastsave'); console.log('lastsave'); console.log(params); @@ -1672,6 +1686,7 @@ this.proceedonChangeProperty(modified) } } },err=>this.loaderService.closeMatSpinnerDialog()) + // this.loaderService.closeMatSpinnerDialog() } sendDatatoApi(section_data?){ // alert('a'); diff --git a/ng6-seed/src/app/sales-pd/material_modules/material.module.ts b/ng6-seed/src/app/sales-pd/material_modules/material.module.ts index 0de4c29..8ca5491 100755 --- a/ng6-seed/src/app/sales-pd/material_modules/material.module.ts +++ b/ng6-seed/src/app/sales-pd/material_modules/material.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MatIconModule, MatInputModule, MatTableModule, MatListModule, MatToolbarModule, MatFormFieldModule, MatTabsModule, MatCardModule, MatPaginatorModule, MatButtonModule, MatExpansionModule, MatProgressBarModule, MatProgressSpinnerModule, MatDatepickerModule, MatSelectModule, MatRadioModule, MatCheckboxModule, MatTooltipModule } from '@angular/material'; +import { MatIconModule, MatInputModule, MatTableModule, MatListModule, MatToolbarModule, MatFormFieldModule, MatTabsModule, MatCardModule, MatPaginatorModule, MatButtonModule, MatExpansionModule, MatProgressBarModule, MatProgressSpinnerModule, MatDatepickerModule, MatSelectModule, MatRadioModule, MatCheckboxModule, MatTooltipModule, MatMenuModule } from '@angular/material'; import { FlexLayoutModule } from '@angular/flex-layout'; //import { MatTableExporterModule } from '@angular/mat-table-exporter'; import { ReactiveFormsModule, FormsModule } from '@angular/forms'; @@ -55,6 +55,7 @@ const pdCustomNotifierOptions: NotifierOptions = { MatSelectModule, MatIconModule, MatTableModule, + MatMenuModule, MatListModule, MatTooltipModule, MatToolbarModule, diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.html b/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.html new file mode 100644 index 0000000..b1863bd --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/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/sales-pd-list/re-generate-report/re-generate-report.component.scss b/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.spec.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.spec.ts new file mode 100644 index 0000000..7c887b4 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/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/sales-pd-list/re-generate-report/re-generate-report.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.ts new file mode 100644 index 0000000..868fd08 --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.ts @@ -0,0 +1,118 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { NotifierService } from 'angular-notifier'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { FormControl, Validators } from '@angular/forms'; +import { SalesPdService } from 'app/sales-pd/services/sales-pd.service'; +import { LoaderService } from 'app/shared/loaderService/loader.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(private loaderService:LoaderService,notifier: NotifierService,private SalesPDService:SalesPdService,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) + { + this.loaderService.showMatSpinnerDialog('Please wait...') + if(option=='report') + { + this.SalesPDService.generatesalereport(pdid) + .subscribe( + data => { + if (data.status == 200) { + this.loaderService.closeMatSpinnerDialog() + 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.SalesPDService.generatemail(pdid) + .subscribe( + data => { + if (data.status == 200) { + this.loaderService.closeMatSpinnerDialog() + 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.SalesPDService.generatesateliteimage(geolocation) + .subscribe( + data => { + if (data.status == 200) { + this.loaderService.closeMatSpinnerDialog() + 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 6cf7281..43bbda1 100644 --- 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 @@ -99,30 +99,64 @@
{{details.createdon | date: 'dd/MM/yyyy'}}
-
- +
+
+
+ +
+
+
+ + +
+
+ +
+
+
+ +
+
+ + + + + + + +
+
+ - - - + - + + --> + + +
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 5e45dd0..97dcfbe 100644 --- 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 @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { SalesPdService } from '../services/sales-pd.service'; import { ConstantsProvider } from 'app/providers/constants/constants'; import { LoaderService } from 'app/shared/loaderService/loader.service'; +import { ReGenerateReportComponent } from './re-generate-report/re-generate-report.component'; @Component({ selector: 'app-sales-pd', templateUrl: './sales-pd.component.html', @@ -63,7 +64,7 @@ export class SalesPdComponent implements OnInit { this.is_sales_login = false this.getListofPD() } - },5000) + },4000) setTimeout(()=>{ this.common = JSON.parse(localStorage.getItem('commonSettings')) @@ -227,6 +228,8 @@ editForm(value_obj){ // alert('abc'); console.log('value'); console.log(value_obj); + let campletedCase = JSON.stringify(value_obj) + localStorage.setItem('completedPD',campletedCase) // let product= localStorage.getItem('product_id_salesPD') // storing the sales_pd_id and product id in local storagey let primary_key= 'sales_pd_id' @@ -349,6 +352,21 @@ editForm(value_obj){ console.log(this.finallink) window.open(this.finallink); } + regeneratereport(data,option) + { + + const dialogRef = this.dialog.open(ReGenerateReportComponent,{ + data: {pdid: data,option: option}, + disableClose: true, + minWidth: '30%', + maxWidth: '40%', + + }) + dialogRef.afterClosed() + .subscribe(dataresult => { + // this.viewPdDetails(this.viewID,this.masterRandomString) + }) + } } @@ -431,5 +449,7 @@ export class DialogOverviewExampleDialog { // // } // }); // } + + } 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 17ab39d..d2db924 100755 --- a/ng6-seed/src/app/sales-pd/sales-pd.module.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd.module.ts @@ -20,18 +20,22 @@ import { CaptureBtnComponent } from './components/ques-template/capture-btn/capt import { SingleCaptureBtnComponent } from './components/ques-template/single-capture-btn/single-capture-btn.component'; import { HomePageModule } from './home/home.module'; import { CommonModule } from '@angular/common'; +import { ReGenerateReportComponent } from './sales-pd-list/re-generate-report/re-generate-report.component'; @NgModule({ imports: [ SalesPdRoutingModule, MaterialModule, + MatMenuModule, SharedModule, StartPdModule, HomePageModule, - CommonModule + CommonModule, + MatDialogModule ], - declarations: [AlertDialogComponent,SalesPdComponent,AdvanceFilterComponent], - entryComponents:[AlertDialogComponent,SalesPdComponent], + declarations: [AlertDialogComponent,SalesPdComponent,AdvanceFilterComponent, ReGenerateReportComponent], + entryComponents:[AlertDialogComponent,SalesPdComponent,ReGenerateReportComponent], providers:[ConstantsProvider,{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, - {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},{ provide: MatDialogRef, useValue: {} },{ provide: MAT_DIALOG_DATA, useValue: [] }] + {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},{ provide: MatDialogRef, useValue: {} },{ provide: MAT_DIALOG_DATA, useValue: [] }], + bootstrap: [SalesPdComponent], }) export class SalesPdModule { } diff --git a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts index 154d2d3..ce5f023 100644 --- a/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts +++ b/ng6-seed/src/app/sales-pd/section-list/section-list.component.ts @@ -26,9 +26,11 @@ export class SectionListComponent implements OnInit { customer_link_with_text: string; customer_link:string='' is_sync_btn: boolean = false; + salesPdData:any[] = []; sales_pd_id: any; all_sections: any; config_expression: any; + is_sales_login:boolean = false link: any; constructor(public dialogRef: MatDialogRef,private constantProvider:ConstantsProvider,notifier: NotifierService,private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute,private SalesPDService:SalesPdService, private router: Router,private loaderService:LoaderService ) { @@ -279,6 +281,7 @@ export class SectionListComponent implements OnInit { merge_saved_status(res){ let saved_sections=res['records'].map(val=>{return {'section_id':val.section_id , 'status':val.status,'is_synced':val.is_synced}}); + console.log("saved",saved_sections); const mergeById = (a1, a2) => a1.map(itm => ({ @@ -290,6 +293,28 @@ export class SectionListComponent implements OnInit { if(this.section_template.length > 0) { this.is_sync_btn = this.section_template.filter(val=>val.is_synced == false && val.section_id != 'all').length > 0 } + console.log('entry',saved_sections[0].section_id,saved_sections[0].status) + if(saved_sections.length == 1){ + + if(saved_sections[0].section_id == '1' && saved_sections[0].status == '1'){ + console.log('entry') + let userDetails = localStorage.getItem('user_details'); + console.log('userdetails'); + console.log(userDetails); + + let role= this.constantProvider.takeDecisionRouting(JSON.parse(userDetails)) + console.log(role) + if(role == 'sales'){ + this.is_sales_login = true + this.getListofPD() + } + else { + this.is_sales_login = false + this.getListofPD() + } + } + + } } // getTemplate() { // console.log(this.product_id,this.sales_pd_type) @@ -475,4 +500,43 @@ copyToClipBoard(message,user_msg?) { this.router.navigate(['../../../list-pd'], {relativeTo: this.route}); } +getListofPD() { + // this.SalesPDService.getSalesPDList() + // .subscribe( + // data => { + // if (data.status == 200) { + + this.SalesPDService.getSalesPDList(this.is_sales_login).subscribe(res=>{ + if(res['dataStatus']){ + + let user1 = localStorage.getItem('user_details'); + let user=(JSON.parse(user1)) + // this.roleID = localStorage.getItem('user_role') + + this.salesPdData = res['records']; + console.log(this.salesPdData) + console.log(this.salesPdData[0].status) + let campletedCase = JSON.stringify(this.salesPdData[0]) + localStorage.setItem('completedPD',campletedCase) + // this.dataLengthTab4 = res['records'].length; + // this.dataSourceTab4.data = this.salesPdData; + // this.recordStatus=false + // this.limitMsg = true + + } + else{ + this.salesPdData=[]; + // this.dataLengthTab4= null; + // this.recordStatus=true; + // this.limitMsg = false + } + } + // , 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); + }); +} + } \ No newline at end of file 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 673eef4..1e8ffa9 100644 --- a/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts +++ b/ng6-seed/src/app/sales-pd/services/sales-pd.service.ts @@ -621,4 +621,24 @@ getCityPincode(value){ return null; //return this.storage.remove(key) } + + generatesalereport(params :any): Observable { + // let httpParams = new HttpParams().set('pdid', countpdid); + // httpParams = httpParams.append('random_string',randomString); + return this._http.get(api_url + '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(api_url + 'resendSaleReportMail?sales_pd_id=' +params) + // .pipe( + // catchError(this.handleError('role', [])) + // ) +} +generatesateliteimage(param:any): Observable{ + return this._http.post(api_url + 'regenerateSatelliteImg',param ) + } } diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts index 0e49e73..0a3f049 100755 --- a/ng6-seed/src/app/session/login/login.component.ts +++ b/ng6-seed/src/app/session/login/login.component.ts @@ -69,7 +69,8 @@ export class LoginComponent implements OnInit{ */ login() { const mailid = this.email.split(/\s/).join(''); - let auth = { 'Username': mailid, 'Password': this.password }; + const password = this.password.split(/\s/).join(''); + let auth = { 'Username': mailid, 'Password': password }; this.loaderService.showMatSpinnerDialog(''); this.aws.dologin(auth).subscribe(res => { // console.log("do login",res) @@ -97,10 +98,12 @@ export class LoginComponent implements OnInit{ * @param email password,newpassword */ newpassopen() { + const mailid = this.email.split(/\s/).join(''); + const password = this.password.split(/\s/).join(''); let dialogRef = this.dialog.open(NewPasswordDialog, this.config); dialogRef.afterClosed().subscribe(result => { if (result !== undefined) { - let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result }; + let auth = { 'Username': mailid, 'Password': password, 'newpassword': result }; this.aws.dologin(auth).subscribe(res => { this.getCommonSettings(); this.router.navigate(['/']); @@ -129,11 +132,9 @@ export class LoginComponent implements OnInit{ disableClose: true }); - } - // else - // { - - // } + }else if(data.status == 204){ + alert(data.msg) + } }); diff --git a/ng6-seed/src/app/session/otp/otp.component.html b/ng6-seed/src/app/session/otp/otp.component.html index dbe4e39..b341195 100644 --- a/ng6-seed/src/app/session/otp/otp.component.html +++ b/ng6-seed/src/app/session/otp/otp.component.html @@ -22,7 +22,7 @@
- +