diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts index 8bc7c87b7..795d78bc0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject, Pipe, PipeTransform } from '@angular/core'; +import { Component, OnInit, Inject, Pipe, PipeTransform, OnDestroy } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; import { NotifierService } from 'angular-notifier'; @@ -15,7 +15,8 @@ export interface Timeslot { templateUrl: './schedule-pd.component.html', styleUrls: ['./schedule-pd.component.scss'] }) -export class SchedulePdComponent implements OnInit { +export class SchedulePdComponent implements OnInit, OnDestroy { + public pageTitle: string = "PD Schedule"; pipe = new DatePipe('en-US'); public selectedMoment = new Date(); @@ -55,6 +56,7 @@ export class SchedulePdComponent implements OnInit { // ]; public min = new Date(); + validateTime:any; constructor(notifier: NotifierService, private dialogRef: MatDialogRef, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any) { @@ -62,9 +64,18 @@ export class SchedulePdComponent implements OnInit { } ngOnInit() { - + this.validateTime = setInterval(() => { + let currentTime:any = new Date(); + currentTime = currentTime.getFullYear()+'-'+currentTime.getMonth()+'-'+currentTime.getDay()+currentTime.getHours()+'-'+currentTime.getMinutes(); + let existTime:any = this.selectedMoment.getFullYear()+'-'+this.selectedMoment.getMonth()+'-'+this.selectedMoment.getDay() +'-'+this.selectedMoment.getHours()+'-'+this.selectedMoment.getMinutes(); + if(existTime < currentTime) { + this.selectedMoment = new Date(); + this.min = new Date(); + + } + },1000); } - + // close pd schedule pop up closeScheduleComponent(): void { this.dialogRef.close(); @@ -72,6 +83,7 @@ export class SchedulePdComponent implements OnInit { // update pd schedule upatePDSchedule(date:any){ + let myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd HH:mm'); let updateData = { @@ -94,4 +106,7 @@ export class SchedulePdComponent implements OnInit { this.dialogRef.close(); }); } + ngOnDestroy(): void { + clearInterval(this.validateTime); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index b0f6ff117..23299ad72 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -62,13 +62,15 @@ + - + - + +
@@ -251,14 +253,16 @@
- + States Where Max Sales Done for {{manufacturing.value.main_products}} + {{MSL.state_name}} - + Cities Where Max Sales Done for {{manufacturing.value.main_products}} + {{MCL.city_name}} @@ -273,9 +277,9 @@
- {{country}} + Countries Where The Export Is Being Done for {{manufacturing.value.main_products}} - + {{CL.country_name}} @@ -303,7 +307,7 @@ -

Import

+

Within India

@@ -346,14 +350,16 @@
- + States Where Max Sales Done for {{manufacturing.value.main_products}} + {{MSL.state_name}} - + Cities Where Max Sales Done for {{manufacturing.value.main_products}} + {{MCL.city_name}} @@ -364,15 +370,15 @@

Export

- - - + + Countries Where The Export Is Being Done for {{manufacturing.value.main_products}} + {{CL.country_name}} - + @@ -391,18 +397,14 @@
-
- - - -
+ - Description of Manufacturing Product - + Description of {{manufacturing.value.main_products}} + @@ -475,14 +477,18 @@
- + States Where Max Sales Done for {{retail.value.main_products}} + + {{MSL.state_name}} - + Cities Where Max Sales Done for {{retail.value.main_products}} + + {{MCL.city_name}} @@ -496,7 +502,9 @@
- + + Countries Where Export Is Being Done for {{retail.value.main_products}} + @@ -504,7 +512,7 @@ - + @@ -525,7 +533,7 @@ -

Import

+

Within India

@@ -569,14 +577,17 @@
- + States Where Max Sales Done for {{retail.value.main_products}} + {{MSL.state_name}} - + Cities Where Max Sales Done for {{retail.value.main_products}} + + {{MCL.city_name}} @@ -587,14 +598,16 @@

Export

- + + Countries Where The Export Is Being Done for {{retail.value.main_products}} + {{CL.country_name}} - + @@ -613,11 +626,7 @@
-
- - - -
+ @@ -625,8 +634,8 @@ - Description of Retail Trading Product - + Description of {{retail.value.main_products}} + @@ -699,14 +708,18 @@
- + States Where Max Sales Done for {{wholesale.value.main_products}} + + {{MSL.state_name}} - + Cities Where Max Sales Done for {{wholesale.value.main_products}} + + {{MCL.city_name}} @@ -720,15 +733,15 @@
- - - + + Countries Where The Export Is Being Done for {{wholesale.value.main_products}} + {{CL.country_name}} - + @@ -744,7 +757,7 @@
-

Import

+

Within India

@@ -788,14 +801,18 @@
- + States Where Max Sales Done for {{wholesale.value.main_products}} + + {{MSL.state_name}} - + Cities Where Max Sales Done for {{wholesale.value.main_products}} + + {{MCL.city_name}} @@ -806,15 +823,17 @@

Export

- - - + + Cities Where Max Sales Done for {{wholesale.value.main_products}} + + Countries Where The Export Is Being Done for {{wholesale.value.main_products}} + {{CL.country_name}} - + @@ -833,19 +852,15 @@
-
- - - -
+ - Description of Wholesale Trade Product - + Description of {{wholesale.value.main_products}} + @@ -916,14 +931,18 @@
- + States Where Max Revenue From Services for {{serviceprovider.value.main_products}} + + {{MSL.state_name}} - + Cities Where Max Revenue From Services for {{serviceprovider.value.main_products}} + + {{MCL.city_name}} @@ -937,15 +956,15 @@
- - - + + Countries Where The Export Is Being Done for {{serviceprovider.value.main_products}} + {{CL.country_name}} - + @@ -966,7 +985,7 @@ -

Import

+

Within India

@@ -1009,14 +1028,18 @@
- + States Where Max Revenue From Services for {{serviceprovider.value.main_products}} + + {{MSL.state_name}} - + Cities Where Max Revenue From Services for {{serviceprovider.value.main_products}} + + {{MCL.city_name}} @@ -1027,15 +1050,15 @@

Export

- - - + + Countries Where The Export Is Being Done for {{serviceprovider.value.main_products}} + {{CL.country_name}} - + @@ -1054,19 +1077,15 @@
-
- - - -
+ - Description of Service Provider - + Description of {{serviceprovider.value.main_products}} + @@ -1081,7 +1100,7 @@ - Other Details> + Other Details @@ -1102,6 +1121,17 @@ + + Export Sale As a % Total Sales + + + + + + + + + Seasonality
@@ -1402,7 +1432,7 @@
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index 03a4227d7..fd8d7f821 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -71,7 +71,7 @@ export class BusinessInfoComponent implements OnInit { private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, - @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialog: MatDialog) { + @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialog: MatDialog, private dialogRef: MatDialogRef) { //this.adapter.setLocale('fr'); this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.company_id = this.pd_all_details.company_id; @@ -82,7 +82,7 @@ export class BusinessInfoComponent implements OnInit { this.notifier = notifier; this.generalExistEntityType = this.pd_all_details.business_entity_type; this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other; - + this.generalExistBusinessYear = this.pd_all_details.business_years; } public viewerOptions: any = { @@ -287,7 +287,6 @@ export class BusinessInfoComponent implements OnInit { } else if(element.area_of_sale=='Both'){ manufacturingControl.controls[index].addControl('india_where_sale_done', this.fb.array([])); - manufacturingControl.controls[index].addControl('export_sale_of_total_sales',new FormControl('')); manufacturingControl.controls[index].addControl('pan_india_options',new FormControl('', Validators.required)); manufacturingControl.controls[index].addControl('max_sale_state_name',this.fb.array([])); @@ -350,7 +349,6 @@ export class BusinessInfoComponent implements OnInit { } else if(element.area_of_sale=='Both'){ retailControl.controls[index].addControl('india_where_sale_done', this.fb.array([])); - retailControl.controls[index].addControl('export_sale_of_total_sales',new FormControl('')); retailControl.controls[index].addControl('pan_india_options',new FormControl('', Validators.required)); retailControl.controls[index].addControl('max_sale_state_name',this.fb.array([])); element.india_where_sale_done.forEach((innerElement,innerIndex) => { @@ -410,7 +408,6 @@ export class BusinessInfoComponent implements OnInit { } else if(element.area_of_sale=='Both'){ wholesaleControl.controls[index].addControl('india_where_sale_done', this.fb.array([])); - wholesaleControl.controls[index].addControl('export_sale_of_total_sales',new FormControl('')); wholesaleControl.controls[index].addControl('pan_india_options',new FormControl('', Validators.required)); wholesaleControl.controls[index].addControl('max_sale_state_name',this.fb.array([])); element.india_where_sale_done.forEach((innerElement,innerIndex) => { @@ -473,7 +470,6 @@ export class BusinessInfoComponent implements OnInit { } else if(element.area_of_sale=='Both'){ serviceProviderControl.controls[index].addControl('india_where_sale_done', this.fb.array([])); - serviceProviderControl.controls[index].addControl('export_sale_of_total_sales',new FormControl('')); serviceProviderControl.controls[index].addControl('pan_india_options',new FormControl('', Validators.required)); serviceProviderControl.controls[index].addControl('max_sale_state_name',this.fb.array([])); element.india_where_sale_done.forEach((innerElement,innerIndex) => { @@ -571,6 +567,7 @@ export class BusinessInfoComponent implements OnInit { fk_createdby: this.pdid, //industry: [''], seasonality: ['', Validators.compose([Validators.required])], + export_sale_of_total_sales:[], //month_of_business_run : [''], // peak_period_of_business : [''], //designation: this.fb.array([]), @@ -672,7 +669,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); control.controls[getIndex].removeControl('max_sale_state_name'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); @@ -682,7 +678,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('countries_where_export_done'); control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].removeControl('max_sale_state_name'); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); @@ -696,7 +691,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); - control.controls[getIndex].addControl('export_sale_of_total_sales',new FormControl('')); } } @@ -710,7 +704,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); control.controls[getIndex].removeControl('max_sale_state_name'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); @@ -720,7 +713,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('countries_where_export_done'); control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].removeControl('max_sale_state_name'); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); @@ -734,7 +726,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); - control.controls[getIndex].addControl('export_sale_of_total_sales',new FormControl('')); } } @@ -747,7 +738,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); control.controls[getIndex].removeControl('max_sale_state_name'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); @@ -757,7 +747,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('countries_where_export_done'); control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].removeControl('max_sale_state_name'); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); @@ -771,7 +760,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); - control.controls[getIndex].addControl('export_sale_of_total_sales',new FormControl('')); } } // change service provider @@ -783,7 +771,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); control.controls[getIndex].removeControl('max_sale_state_name'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([])); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); @@ -793,7 +780,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].removeControl('countries_where_export_done'); control.controls[getIndex].removeControl('india_where_sale_done'); control.controls[getIndex].removeControl('pan_india_options'); - control.controls[getIndex].removeControl('export_sale_of_total_sales'); control.controls[getIndex].removeControl('max_sale_state_name'); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); @@ -807,7 +793,6 @@ export class BusinessInfoComponent implements OnInit { control.controls[getIndex].addControl('pan_india_options',new FormControl('', Validators.required)); control.controls[getIndex].addControl('max_sale_state_name',this.fb.array([this.createMaxSaleState()])); control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()])); - control.controls[getIndex].addControl('export_sale_of_total_sales',new FormControl('')); } } // change pan india options @@ -870,7 +855,7 @@ export class BusinessInfoComponent implements OnInit { shareholding: [''], started_business: [''], current_business_experiance_year: ['', Validators.compose([Validators.required])], - current_business_experiance_month: ['', Validators.compose([Validators.required])], + current_business_experiance_month: [''], total_business_experiance: ['', Validators.compose([Validators.required])], }); } @@ -1205,9 +1190,10 @@ export class BusinessInfoComponent implements OnInit { control.controls[key].addControl('total_business_previous_experience', new FormControl('', Validators.required)) } else if(total_experience < current_experience) { - control.controls[key].controls['total_business_experiance'].setValue(current_experience); + //control.controls[key].controls['total_business_experiance'].setValue(current_experience); control.controls[key].removeControl('total_business_previous_experience') } + else { control.controls[key].removeControl('total_business_previous_experience') } @@ -1250,7 +1236,7 @@ export class BusinessInfoComponent implements OnInit { // console.log(this.businessForm.value); if (!this.businessForm.valid) { - //console.log(' Requried validation error'); + this.notifier.notify('warning',"Please Check All Manatory Fields.."); return; } // let design: any; @@ -1352,6 +1338,9 @@ export class BusinessInfoComponent implements OnInit { records.select_business_activity_type = records.select_business_activity_type.filter(value=>value.exist_status==1); this._pd.saveForm(records).subscribe(data => { this.notifier.notify('success', 'Saved Successfully.'); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); });