- {{addresses.addtional_pd_data[0].pd_allocated_to | titlecase}}
+
+ {{addresses.addtional_pd_data[0].vendor_pdofficer_name | titlecase}}
{{addresses.addtional_pd_data[0].executive_name | titlecase}}
@@ -414,4 +415,4 @@
-
\ No newline at end of file
+
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 5f1a5ca..b459b67 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
@@ -18,6 +18,8 @@ import { InitiateAdditionalPdComponent } from './../initiate-additional-pd/initi
/**sweet alert */
import Swal from 'sweetalert2';
import { SchedulePdComponent } from '../schedule-pd/schedule-pd.component';
+import { CommonQuesComponent } from '../pd-questions/common-ques/common-ques.component';
+import { EmployerInfoComponent } from '../pd-questions/employer-info/employer-info.component';
@Component({
selector: 'app-view-pd',
@@ -367,14 +369,42 @@ export class ViewPdComponent implements OnInit, OnDestroy {
dialogRef.afterClosed()
.subscribe(dataresult => {
if (dataresult.update_status == true) {
- this.router.navigate(['../../startpd',pdDetails.assigned_pd], { relativeTo: this.route });
+ // this.router.navigate(['../../startpd',pdDetails.assigned_pd], { relativeTo: this.route });
+ this.openQuesComp(pdDetails)
}
});
}
else {
- this.router.navigate(['../../startpd', pdDetails.assigned_pd], { relativeTo: this.route });
+ this.openQuesComp(pdDetails)
+
+ // this._pd.pdQuestionMasterData = temp;
+ // this.router.navigate(['../../../pd-questions', pdDetails.assigned_pd,this.masterRandomString], {relativeTo: this.route });
+
}
}
+ openQuesComp(pdDetails) {
+ let quesComponent:any = CommonQuesComponent
+ if(this.CustomerSegmentAbbr == 'SAL') {
+ quesComponent = EmployerInfoComponent
+ }
+ let temp:any = pdDetails.addtional_pd_data[0]
+ temp.applicants_details = this.pdApplicantData
+ temp.docs_collected = this.pdCollectedDocument
+ const dialogRef = this.dialog.open(quesComponent, {
+ data: temp,
+ // position: { right: '0'},
+ maxWidth: '100vw',
+ maxHeight: '100vh',
+ height: '100%',
+ width: '100%',
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ // this.notifier.notify('success', 'Successfully allocated.!');
+ // this.loadTemplates(this.startPD,2,this.randomString);
+ });
+ }
getPDIDReport(pdID: any) {
this.destroyType = 3;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index bbb75fb..ebe1480 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -123,6 +123,9 @@ import { GetAnswerableFormsPipe } from './../pd-pipes/get-answerable-forms.pipe'
// import { FuturePlansAndBusinessEnvironmentComponent } from './list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component';
// import { ImageCropComponent } from './list-pd/start-pd/forms/dialogue/image-crop/image-crop.component';
import {AngularSplitModule} from 'angular-split'
+import { CommonQuesComponent } from './list-pd/pd-questions/common-ques/common-ques.component';
+import { EmployerInfoComponent } from './list-pd/pd-questions/employer-info/employer-info.component';
+import { DynamicDocsFormComponent } from './list-pd/pd-questions/dynamic-docs-form/dynamic-docs-form.component';
/**
* Custom angular notifier options
@@ -169,7 +172,9 @@ const pdCustomNotifierOptions: NotifierOptions = {
};
@NgModule({
- declarations: [SchedulePdComponent,PdAllocationComponent,TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
+ declarations: [SchedulePdComponent,PdAllocationComponent,TelePdAllocationComponent, ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, PdReportComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent,
+ CommonQuesComponent,EmployerInfoComponent,DynamicDocsFormComponent
+ ],
imports: [
CommonModule,
ManagePdRoutingModule,
@@ -209,7 +214,8 @@ const pdCustomNotifierOptions: NotifierOptions = {
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective],
- entryComponents: [SchedulePdComponent,PdAllocationComponent,SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent],
+ entryComponents: [SchedulePdComponent,PdAllocationComponent,SmartPdAllocationComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, PdRequirementComponent, ModelEditPdReportComponent, DialogChangeCurrentVenrsion, QcReviewComponent, ViewLocationComponent,PdStatusChangeDialogueComponent,InitiateAdditionalPdComponent,
+ CommonQuesComponent,EmployerInfoComponent],
})
export class ManagePdModule {
}
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
index 0767e1d..1115efc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
@@ -6,6 +6,8 @@ import { MapPdViewComponent } from './list-pd/map-pd-view/map-pd-view.component'
import { AddPdComponent } from '../manage-pd/list-pd/add-pd/add-pd.component';
import { ViewPdComponent } from '../manage-pd/list-pd/view-pd/view-pd.component';
import { PdReportComponent } from './list-pd/pd-report/pd-report.component';
+import { CommonQuesComponent } from './list-pd/pd-questions/common-ques/common-ques.component';
+import { PdQuestionsModule } from './list-pd/pd-questions/pd-questions.module';
/*
* manage pd router
*/
@@ -37,7 +39,13 @@ const routes: Routes = [
{
path: 'pd_report/:pdid/:string',
component: PdReportComponent,
- }
+ },
+ // {
+ // path:'pd-questions/:pdid/:string',
+ // // component:PdQuestionsModule,
+ // loadChildren:'./list-pd/pd-questions/pd-questions.module#PdQuestionsModule'
+ // // loadChildren: () => import('./list-pd/pd-questions/pd-questions.module').then( m => m.PdQuestionsModule)
+ // }
]
}
]
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 3e39091..37a63ec 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
@@ -29,6 +29,7 @@ export interface Master {
export class PdTrigerService {
+ pdQuestionMasterData:any=null
// private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
// private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/";
@@ -180,7 +181,7 @@ export class PdTrigerService {
if(VendorRoleID == '22'){
console.log('check else',VendorRoleID)
vendorParam= userid ?
- { params: new HttpParams().set('pdofficerid', userid).set('pdagencyid', ven_id) } : {};
+ { params: new HttpParams().set('vendor_pdofficer', userid).set('pdagencyid', ven_id) } : {};
}
else {
vendorParam= userid ?
@@ -209,7 +210,7 @@ export class PdTrigerService {
let vendorParam;
if(VendorRoleID == '22'){
vendorParam= userid_local && status ?
- { params: new HttpParams().set('pdofficerid', userid_local).set('pdagencyid', ven_id).set('status',status) } : {};
+ { params: new HttpParams().set('vendor_pdofficer', userid_local).set('pdagencyid', ven_id).set('status',status) } : {};
}
else {
vendorParam= userid_local && status ?
@@ -347,12 +348,12 @@ export class PdTrigerService {
};
}
// common Pd form details get for the Pd Process
- // getPDFormDetailsWithID(params: any): Observable
{
- // return this._http.post(this.apiUrl + "getPDFormDetails", params)
- // .pipe(
- // catchError(this.handleError('operation', []))
- // )
- // }
+ getPDFormDetailsWithID(params: any): Observable {
+ return this._http.post(this.apiUrl + "getPDFormDetails", params)
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
// common Pd form details get for the Pd Process
// getPDFormDetailsWithCompanyID(pdID, formID,companyID): Observable {
@@ -363,16 +364,16 @@ export class PdTrigerService {
// }
// save Pd form details
- // savePDFormDetailsWithID(saveData: any): Observable {
- // saveData.fk_createdby = this._aws.getlocale();
- // // saveData[0].fk_updatedby = this._aws.getlocale();
- // // saveData[0].updatedon = currentdate;
+ savePDFormDetailsWithID(saveData: any): Observable {
+ saveData.fk_createdby = this._aws.getlocale();
+ // saveData[0].fk_updatedby = this._aws.getlocale();
+ // saveData[0].updatedon = currentdate;
- // return this._http.post(this.apiUrl + "savePDFormDetails", { "records": saveData })
- // .pipe(
- // catchError(this.handleError('operation', []))
- // )
- // }
+ return this._http.post(this.apiUrl + "savePDFormDetails", { "records": saveData })
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
// save pd answers
// savePDQuestions(saveData: any): Observable {
@@ -602,12 +603,12 @@ export class PdTrigerService {
// }
- // getCompaniesListsForBusiness(pdid: any): Observable {
- // return this._http.post(this.apiUrl + "getCompaniesListsForBusiness", { "records":{ "pd_id" : pdid}})
- // .pipe(
- // catchError(this.handleError('operation', []))
- // )
- // }
+ getCompaniesListsForBusiness(pdid: any): Observable {
+ return this._http.post(this.apiUrl + "getCompaniesListsForBusiness", { "records":{ "pd_id" : pdid}})
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
/** To get StateWise City List For
* 1) Family Form
@@ -842,5 +843,12 @@ checkExistPDDetails(datas,entity_id){
.pipe(catchError(this.handleError("checkExistPDDetails",[])))
}
+getBusinessDocsToVendorForm(editId) {
+ const options = editId ?
+ { params: new HttpParams().set('pdid', editId) } : {};
+ return this._http.get(this.apiUrl+'getBusinessDocsToVendorForm',options)
+ .pipe(catchError(this.handleError("getBusinessDocsToVendorForm",[])))
+}
+
}