diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
index 4219f6edc..96d635bbc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
@@ -99,7 +99,9 @@ export class StartPdComponent implements OnInit, OnDestroy {
getCreditPDTemplate() {
// let params = { "fk_entity_id":this.pddetails.fk_lender_id,"fk_product_id":this.pddetails.fk_product_id,"pd_form_id":this.pddetails.pd_id }
let params = { "fk_entity_id":"","fk_product_id":"","pd_form_id":"24","fk_pd_id": this.startPD }
+ let tmp;
this._pd.loadCreditPDTemplate(params).subscribe(result=> {
+ //this._pd.loadCreditPDTemplate(params).subscribe(result=> {
let creditTemplate:any = null;
if(result['dataStatus']) {
if(result.hasOwnProperty('records') && result['records']) {
@@ -608,3 +610,4 @@ export class StartPdComponent implements OnInit, OnDestroy {
}
}
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.spec.ts
new file mode 100644
index 000000000..aa9337623
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.spec.ts
@@ -0,0 +1,13 @@
+import { StartPd.ModuleModule } from './start-pd.module.module';
+
+describe('StartPd.ModuleModule', () => {
+ let startPdModuleModule: StartPd.ModuleModule;
+
+ beforeEach(() => {
+ startPdModuleModule = new StartPd.ModuleModule();
+ });
+
+ it('should create an instance', () => {
+ expect(startPdModuleModule).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.ts
new file mode 100644
index 000000000..704637065
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.module.module.ts
@@ -0,0 +1,85 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { StartPdRoutingModule } from './start-pd-routing.module.module';
+import { StartPdComponent } from './start-pd.component';
+import { SharedModule } from 'app/shared/shared.module';
+import { DemoMaterialModule } from 'app/shared/demo.module';
+import { NotifierModule, NotifierOptions } from 'angular-notifier';
+import { FormComponent } from './forms-dynamic/form/form.component';
+import { FormGroupComponent } from './forms-dynamic/form-group/form-group.component';
+import { StartPd2Component } from './start-pd2/start-pd2.component';
+
+import { DynamicFormComponent } from './forms/dynamic-form/dynamic-form/dynamic-form.component';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { DynamicQuestionTemplateComponent } from './forms/dynamic-form/dynamic-question-template/dynamic-question-template.component';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
+import { MatIconModule } from '@angular/material';
+// import { ImageCaptureComponent } from './forms/image-capture/image-capture.component';
+// import { CaptureBtnComponent } from './forms/image-capture/capture-btn/capture-btn.component';
+// import { Ng2ImgMaxModule } from 'ng2-img-max';
+import { NgxViewerModule } from 'ngx-viewer';
+import { AnswerOptionCreateDialogComponent } from './forms-dynamic/answer-option-create-dialog/answer-option-create-dialog.component';
+import {MatTreeModule} from '@angular/material/tree';
+// import { QuestionControlComponent } from './forms-dynamic/question-control/question-control.component';
+const pdCustomNotifierOptions: NotifierOptions = {
+ position: {
+ horizontal: {
+ position: 'right',
+ distance: 12
+ },
+ vertical: {
+ position: 'top',
+ distance: 32,
+ gap: 10
+ }
+ },
+ theme: 'material',
+ behaviour: {
+ autoHide: 2000,
+ onClick: 'hide',
+ onMouseover: 'pauseAutoHide',
+ showDismissButton: true,
+ stacking: 4
+ },
+ animations: {
+ enabled: true,
+ show: {
+ preset: 'slide',
+ speed: 300,
+ easing: 'ease'
+ },
+ hide: {
+ preset: 'fade',
+ speed: 300,
+ easing: 'ease',
+ offset: 50
+ },
+ shift: {
+ speed: 300,
+ easing: 'ease'
+ },
+ overlap: 150
+ }
+};
+
+@NgModule({
+ imports: [
+ CommonModule,
+ StartPdRoutingModule,
+ SharedModule,
+ DemoMaterialModule,
+ ReactiveFormsModule,
+ FormsModule,
+ FlexLayoutModule,
+ NotifierModule.withConfig(pdCustomNotifierOptions),
+ NgxMatSelectSearchModule,
+ MatIconModule,
+ MatTreeModule,
+ NgxViewerModule
+ ],
+ declarations: [StartPdComponent, StartPd2Component,FormComponent,DynamicFormComponent,DynamicQuestionTemplateComponent, AnswerOptionCreateDialogComponent,FormGroupComponent],
+ entryComponents:[FormComponent,FormGroupComponent,AnswerOptionCreateDialogComponent]
+})
+export class StartPdModule { }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.html
new file mode 100644
index 000000000..54624b548
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.html
@@ -0,0 +1,50 @@
+
+
+
+
+
{{mainApplicantName}}
+ {{pdMasterList.customer_segment_name}}
+
+
+
{{pdMasterList.product_name}}/{{pdMasterList.subproduct_name}}
+
+
+ {{pdMasterList.lender_full_name}}/{{pdMasterList.lender_applicant_id}}
+
+
+
+
+
+
+
+
+
+ {{ formButton.form_name }}
+
+
+
+
+
+
+
+
+
+ {{ photoButton.form_name }}
+
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.scss
new file mode 100644
index 000000000..ac597212f
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.scss
@@ -0,0 +1,84 @@
+// .child_mat_card mat-card {
+// margin: 2 0%;
+// }
+::ng-deep .mat-dialog-container{
+ overflow: hidden !important;
+}
+ ::ng-deep .mat-card-header-text{
+ margin:0px !important;
+ }
+ .mat-purple{
+ background-color: gray !important;
+ }
+ .cdk-global-overlay-wrapper{
+ justify-content: center !important;
+}
+mat-card.parent_mat_card > {
+ mat-card-header {
+ display: flex;
+ flex-direction: column;
+ }
+ mat-card-content {
+ min-height:auto;
+ max-height:52vh;
+ overflow:auto;
+ }
+
+
+ .user-thumb {
+ position: absolute;
+ bottom: -35%;
+ // img {
+ // border: 5px solid $white;
+ // border-radius: 100%;
+ // height: 75px;
+ // width: 75px;
+ // }
+}
+ // @media only screen and (max-width:319px) {
+ // mat-card-content {
+ // max-height: 350px;
+ // overflow: auto;
+ // }
+ // }
+ // @media only screen and (min-width:320px) and (max-width:767px) {
+ // mat-card-content {
+ // max-height: 350px;
+ // overflow: auto;
+ // }
+ // }
+ // @media only screen and (min-width:768px) and (max-width:1023px) {
+ // mat-card-content {
+ // max-height: 350px;
+ // overflow: auto;
+ // }
+ // }
+ // @media only screen and (min-width:1024px) and (max-width:1899px) {
+ // mat-card-content {
+ // max-height: 400px;
+ // overflow: auto;
+ // }
+ // }
+ // @media only screen and (min-width:1900px) {
+ // mat-card-content {
+ // max-height: 500px;
+ // overflow: auto;
+ // }
+ // }
+}
+$base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important;
+mat-card .child_mat_card > mat-card {
+ border-radius: 0px 0px 0px 15px;
+ box-shadow: $base-card-box-shadow;
+ transform: scale(0.95);
+ transition: box-shadow 0.5s, transform 0.5s;
+ border: 1px solid lavender;
+ &:hover {
+ cursor: pointer;
+ // background-color: #e00201 !important;
+ transform: scale(1);
+ box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2);
+ }
+
+ }
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.spec.ts
new file mode 100644
index 000000000..682ff86d8
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StartPd2Component } from './start-pd2.component';
+
+describe('StartPd2Component', () => {
+ let component: StartPd2Component;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ StartPd2Component ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(StartPd2Component);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.ts
new file mode 100644
index 000000000..18f9835ff
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd2/start-pd2.component.ts
@@ -0,0 +1,290 @@
+import {Component, ViewChild, OnInit, ViewEncapsulation, OnDestroy} from '@angular/core';
+import {FormBuilder, FormGroup, Validators, FormControl, FormArray, AbstractControl} from '@angular/forms';
+import {ActivatedRoute, Router} from '@angular/router';
+import {MatDialog } from '@angular/material';
+import {NotifierService} from 'angular-notifier';
+import {ListPdComponent} from './../../list-pd.component';
+
+import {PdTrigerService} from '../../../../pd-service/pd-triger.service';
+
+import {GeneralInfoComponent} from './../forms/general-info/general-info.component';
+
+import {PdStatusChangeDialogueComponent } from './../../pd-status-change-dialogue/pd-status-change-dialogue.component';
+
+import { ImagesAllComponent } from './../forms/images-all/images-all.component';
+
+import { FormComponent } from './../forms-dynamic/form/form.component';
+import { FormGroupComponent } from './../forms-dynamic/form-group/form-group.component';
+
+// import { ImageCaptureComponent } from './Form-Dynamic/image-capture/image-capture.component';
+import { LoaderService } from 'app/shared/loaderService/loader.service';
+
+
+
+@Component({
+ selector: 'app-start-pd2',
+ templateUrl: './start-pd2.component.html',
+ styleUrls: ['./start-pd2.component.scss']
+})
+export class StartPd2Component implements OnInit, OnDestroy {
+ public startPD: string;
+ public mainApplicantName: string;
+ public randomString: string;
+//public remarks: string;
+ errorMessage: any;
+ selectedCategory: any = [];
+ categoryList: any = [];
+ pdMasterList: any = [];
+ pdFullDetails:any=[];
+
+// category static form buttons
+ categoryFormButtons: any;
+ formsCategoryEnable: boolean = false;
+ selectedFormsCategory: any;
+// create values for status check
+ pdStatusCheck: any = {
+ "DRAFT": 'DRAFT',
+ "TRIGGERED": 'TRIGGERED',
+ "ALLOCATED": 'ALLOCATED',
+ "SCHEDULED": 'SCHEDULED',
+ "INPROGRESS": 'INPROGRESS',
+ "COMPLETED": 'COMPLETED',
+ "QC_COMPLETED": 'QC_COMPLETED',
+ };
+ currentPDStatus: boolean;
+ actualQuestions: number;
+ answeredQuestions: number;
+ private notifier: NotifierService;
+ vendor_status_arr: any = [];
+ photographButtons: any[];
+
+ constructor(notifier: NotifierService, private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute,
+ private router: Router,
+ private listPDComponent: ListPdComponent, private _pd: PdTrigerService,private loaderService:LoaderService) {
+ this.startPD = this.route.snapshot.params['pdid'];
+ this.randomString = this.route.snapshot.params['rdmstr'];
+ // console.log(this.route.snapshot.params['pdid'],this.route.snapshot.params['rdmstr']);
+ this.notifier = notifier;
+ this.currentPDStatus = false;
+ }
+
+ ngOnInit() {
+
+ this.listPDComponent.showListView(false);
+ const elemSidebar = document.querySelector('.app-inner .mail-sidebar');
+ const elemContent = document.querySelector('.app-inner .main-content');
+
+ if (window.matchMedia(`(min-width: 960px)`).matches && !this.isMac()) {
+ // Ps.initialize(elemSidebar, { wheelSpeed: 2, suppressScrollX: true });
+ // Ps.initialize(elemContent, { wheelSpeed: 2, suppressScrollX: true });
+ }
+ this.loadTemplates(this.startPD,1,this.randomString);
+
+ // this.getCreditPDTemplate();
+
+
+ }
+ // getCreditPDTemplate() {
+ // // let params = { "fk_entity_id":this.pddetails.fk_lender_id,"fk_product_id":this.pddetails.fk_product_id,"pd_form_id":this.pddetails.pd_id }
+ // let params = { "fk_entity_id":"","fk_product_id":"","pd_form_id":"24","fk_pd_id": this.startPD }
+ // this._pd.loadCreditPDTemplate(params).subscribe(result=> {
+ // let creditTemplate:any = null;
+ // if(result['dataStatus']) {
+ // if(result.hasOwnProperty('records') && result['records']) {
+ // creditTemplate = result['records'];
+ // }
+ // }
+ // localStorage.setItem("dynamicQuesTemplate",JSON.stringify(creditTemplate));
+ // })
+ // }
+
+ isMac(): boolean {
+ let bool = false;
+ if (navigator.platform.toUpperCase().indexOf('MAC') >= 0 || navigator.platform.toUpperCase().indexOf('IPAD') >= 0) {
+ bool = true;
+ }
+ return bool;
+ }
+
+ isOver(): boolean {
+ return window.matchMedia(`(max-width: 960px)`).matches;
+ }
+
+
+ // load templates details
+ loadTemplates(startID:string,type:number,randomString:string){
+ // console.log('start pd component inside - loadTemplates params are,',startID,type,randomString);
+ this._pd.loadPDTemplates(startID,randomString).subscribe(
+ data => {
+ console.log("after reponse = ", data);
+ console.log("after reponse = ", data.records.pdmaster_details);
+
+
+ if (data.status == 200) {
+ this.pdMasterList=data.records.pdmaster_details;
+ // this.categoryList=data.records.question_answers;
+ let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
+ this.mainApplicantName = filterApplicantName.length > 0 ? filterApplicantName[0].applicant_name : '';
+ this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? true : data.records.pdmaster_details.pd_status=='SCHEDULED' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? true : false;
+ //let categoryFormButtons1 = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true);
+ //this.categoryFormButtons =categoryFormButtons1.filter(item=>item.form_id!=26);
+ this.categoryFormButtons = data.records.template_forms
+
+ // this.photographButtons=categoryFormButtons1.filter(item=>item.form_id==26);
+ // console.log(this.photographButtons);
+ // this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true);
+ this.actualQuestions = this.categoryFormButtons.length;
+ let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true);
+ this.answeredQuestions = getAnsweredFormsCount.length;
+ console.log("ans",this.answeredQuestions,this.actualQuestions)
+ this.pdFullDetails = data.records;
+ // VENDOR FORM ANSWER FETCH STATUS START(SMART PD ONLY)
+ // if(this.pdMasterList.fk_pd_type == '2') {
+ // if(data.records.vendor_form_status && data.records.vendor_form_status.length > 0) {
+ // this.vendor_form_status_arr = JSON.stringify(data.records.vendor_form_status)
+ // localStorage.setItem("vendorFormStatus_arr",this.vendor_form_status_arr)
+ // }
+ // }
+ console.log(this.pdMasterList)
+ console.log(this.pdMasterList.fk_pd_type)
+ if(this.pdMasterList.fk_pd_type == '2') {
+ // let temp_vendor_status = localStorage.getItem("vendorFormStatus_arr")
+ if(data.records.hasOwnProperty('vendor_form_status') && data.records.vendor_form_status && data.records.vendor_form_status.length > 0) {
+ // temp_vendor_status = JSON.parse(temp_vendor_status)
+ // if(temp_vendor_status && temp_vendor_status.length > 0 ) {
+ this.vendor_status_arr = data.records.vendor_form_status
+
+ // }
+ }
+ }
+ // END OF VENDOR FORM ANSWER FETCH
+ if(type==1 && (data.records.pdmaster_details.pd_status=='SCHEDULED' || data.records.pdmaster_details.pd_status=='ALLOCATED')) {
+ this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS,1)
+ }
+ }
+ else{
+ this.pdMasterList = "";
+ this.mainApplicantName = "";
+ this.categoryList = [];
+ this.currentPDStatus = false;
+ }
+ // this.getAnswers(serachQuestions);
+
+ });
+ }
+
+ // load pd status change dialogue
+ pdStatusDialogue(status: string, checkType: number): void {
+
+ const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, {
+ data: { pdid: this.startPD, pd_status: status ,random_string:this.randomString,pd_type:this.pdMasterList.fk_pd_type },
+ disableClose: true,
+ minWidth:'30%',
+ maxWidth:'40%',
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ if(dataresult.update_status==true){
+ setTimeout(()=>{
+ checkType==2 ? this.router.navigate(['../../viewpd', this.pdMasterList.parent_pd_id], {relativeTo: this.route}) : this.loadTemplates(this.startPD,2,this.randomString);
+ let data = {
+ "pd_id": this.startPD,
+ "regenerate":0,
+ "random_string":this.randomString
+ };
+ },2000)
+ // this._pd.archivePDImages(data).subscribe(data => {
+
+ // })
+ let data1 = {
+ "pd_id": this.startPD,
+ "regenerate":0,
+ "random_string":this.randomString
+ };
+ this._pd.photoPDFDownload(data1).subscribe(data => {
+
+ })
+
+ }
+ else {
+ checkType==1 ? this.router.navigate(['../../viewpd', this.pdMasterList.parent_pd_id], {relativeTo: this.route}) : this.loadTemplates(this.startPD,2,this.randomString);
+ }
+ if(checkType == 2){
+ // this.loadTemplates(this.startPD,2,this.randomString);
+ }
+ });
+}
+
+ // start
+ // direct form based questions
+ OnSelectDirectForms(details: any,id:any) {
+
+ console.log(details.form_name)
+ console.log( this.vendor_status_arr )
+ // this.formsCategoryEnable = true;
+ this.selectedFormsCategory = details;
+
+ let curr_vendor_ans_fetch_status = null
+ if(this.pdMasterList.fk_pd_type == '2') {
+ if(this.vendor_status_arr && this.vendor_status_arr.length > 0 && this.selectedFormsCategory.form_id != 13) {
+ console.log(this.vendor_status_arr,this.selectedFormsCategory)
+ curr_vendor_ans_fetch_status =this.vendor_status_arr.filter(val=>val.fk_form_id == String(this.selectedFormsCategory.form_id))
+ if(curr_vendor_ans_fetch_status.length > 0) {
+ curr_vendor_ans_fetch_status = curr_vendor_ans_fetch_status[0].form_status
+ }
+ else {
+ curr_vendor_ans_fetch_status = null
+ }
+ }
+ }
+ this.pdFullDetails.pdmaster_details.curr_vendor_ans_fetch_status = curr_vendor_ans_fetch_status
+ // this.pdFullDetails.form_id= this.selectedFormsCategory.fk_form_id
+ // this.pdFullDetails.is_answered = this.selectedFormsCategory.is_answered
+ this.pdFullDetails.pdmaster_details = this.pdMasterList
+
+ console.log(this.pdFullDetails);
+ console.log(this.pdMasterList);
+ console.log(details);
+ console.log(this.startPD,2,this.randomString)
+ let componen_name:any = FormComponent
+ if(details.is_group_form == 1) {
+ componen_name = FormGroupComponent
+ }else if(details.form_name == 'Photograph'){
+ componen_name = ImagesAllComponent
+ }else if(details.form_name == 'General Information'){
+ componen_name = GeneralInfoComponent
+ }
+ const dialogRef = this.dialog.open(componen_name, {
+
+ data: {pd_FullDetails:this.pdFullDetails,pdMasterList:this.pdMasterList,FormData:details,Formname:details.form_name,pdmaster_details:this.pdMasterList},
+
+ position: { right: '0'},
+ maxWidth: '100vw',
+ maxHeight: '100vh',
+ height: '100%',
+ width: '100%',
+ disableClose: true,
+ closeOnNavigation:true,
+ panelClass:'no-padding'
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ // this.notifier.notify('success', 'Successfully allocated.!');
+ // if(dataresult == 'refresh') {
+ this.loadTemplates(this.startPD,2,this.randomString);
+ // }
+ });
+
+
+ }
+
+ ngOnDestroy(): void {
+ this.listPDComponent.showListView(true);
+ }
+ // load pd view component
+ loadPdViewCompoent() {
+ this.router.navigate(['../../../viewpd', this.pdMasterList.parent_pd_id,this.randomString], {relativeTo: this.route});
+ }
+
+ }
+
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 4a297b734..46691f1d7 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
@@ -50,6 +50,7 @@ import {SchedulePdComponent} from './list-pd/schedule-pd/schedule-pd.component';
import {EditPdApplicantComponent} from './list-pd/edit-pd-applicant/edit-pd-applicant.component';
import {EditPdMasterComponent} from './list-pd/edit-pd-master/edit-pd-master.component';
import {StartPdComponent} from './list-pd/start-pd/start-pd.component';
+import {StartPd2Component} from './list-pd/start-pd/start-pd2/start-pd2.component';
import {InprogressPdComponent} from './list-pd/inprogress-pd/inprogress-pd.component';
import {AllPdComponent} from './list-pd/all-pd/all-pd.component';
import {ScheduledPdComponent} from './list-pd/scheduled-pd/scheduled-pd.component';
@@ -133,14 +134,34 @@ import { ImageDocsComponent } from './list-pd/start-pd/forms/image-docs/image-do
import { environment } from 'environments/environment'
import { CustomTitleCaseDirective } from '../pd-directive/custom-title-case.directive';
import { SpeedDialFabComponent } from './list-pd/view-pd/speed-dial-fab/speed-dial-fab.component';
-import { DynamicFormComponent } from './list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component';
-import { DynamicQuestionTemplateComponent } from './list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component';
-import { QuesFormService } from './list-pd/start-pd/forms/dynamic-form/ques-form/ques-form.service';
+import { DynamicFormComponent } from './list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-form/dynamic-form.component';
+import { DynamicQuestionTemplateComponent } from './list-pd/start-pd/forms-dynamic/dynamic-form/dynamic-question-template/dynamic-question-template.component';
+import { QuesFormService } from './list-pd/start-pd/forms-dynamic/dynamic-form/ques-form/ques-form.service';
import { VideoPlayerComponent } from 'app/video-chat/video-player/video-player.component';
import { MatVideoModule } from 'mat-video';
import { ImagesAllComponent } from './list-pd/start-pd/forms/images-all/images-all.component';
+import { AnswerOptionCreateDialogComponent } from './list-pd/start-pd/forms-dynamic/answer-option-create-dialog/answer-option-create-dialog.component';
+import { FormComponent } from './list-pd/start-pd/forms-dynamic/form/form.component';
+import { FormGroupComponent } from './list-pd/start-pd/forms-dynamic/form-group/form-group.component';
+// import { QuestionControlComponent } from './list-pd/start-pd/forms/question-control/question-control.component';
+// import { ImageCaptureComponent } from './list-pd/start-pd/Form-Dynamic/image-capture/image-capture.component';
-
+import {
+
+ MatBottomSheetModule,
+
+ MatDividerModule,
+
+ MatNativeDateModule,
+
+ MatRippleModule,
+
+ MatSliderModule,
+
+ MatSnackBarModule,
+
+ MatTreeModule,
+ } from '@angular/material';
/**
* Custom angular notifier options
*/
@@ -186,8 +207,8 @@ const pdCustomNotifierOptions: NotifierOptions = {
};
@NgModule({
- declarations: [TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent,VendorPdAllocationComponent, DuplicatePdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent,PdCollectedDocsComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent ,ManageDailyPurchaseComponent, DailyPurchaseDetailsComponent, ManageRentalVerificationComponent, FuturePlansAndBusinessEnvironmentComponent, ImageCropComponent,PurchaseCalculationComponent,QueriesDocsComponent, ImageDocsComponent,CustomTitleCaseDirective, SpeedDialFabComponent,VideoPlayerComponent,
- DynamicFormComponent,DynamicQuestionTemplateComponent, ImagesAllComponent],
+ declarations: [TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent,VendorPdAllocationComponent, DuplicatePdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent,StartPd2Component, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent,PdCollectedDocsComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent ,ManageDailyPurchaseComponent, DailyPurchaseDetailsComponent, ManageRentalVerificationComponent, FuturePlansAndBusinessEnvironmentComponent, ImageCropComponent,PurchaseCalculationComponent,QueriesDocsComponent, ImageDocsComponent,CustomTitleCaseDirective, SpeedDialFabComponent,VideoPlayerComponent,
+ DynamicFormComponent,DynamicQuestionTemplateComponent, ImagesAllComponent,AnswerOptionCreateDialogComponent,FormComponent,FormGroupComponent],
imports: [
CommonModule,
ManagePdRoutingModule,
@@ -211,8 +232,22 @@ const pdCustomNotifierOptions: NotifierOptions = {
NgxSpinnerModule,
MatChipsModule,MatProgressSpinnerModule,
FormsModule,MatSlideToggleModule,
+
MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule,
ReactiveFormsModule,
+ MatBottomSheetModule,
+
+ MatDividerModule,
+
+ MatNativeDateModule,
+
+ MatRippleModule,
+
+ MatSliderModule,
+
+ MatSnackBarModule,
+
+ MatTreeModule,
FileUploadModule,
TreeModule,
MatDatepickerModule,
@@ -224,14 +259,14 @@ const pdCustomNotifierOptions: NotifierOptions = {
MatVideoModule
],
- exports: [DuplicatePdComponent,VendorPdAllocationComponent,PdLocatedMapViewDirective, PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent,PdCollectedDocsComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent, DailyPurchaseDetailsComponent, ManageDailyPurchaseComponent,ManageRentalVerificationComponent,ImageCropComponent,PurchaseCalculationComponent],
+ exports: [DuplicatePdComponent,VendorPdAllocationComponent,PdLocatedMapViewDirective, PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent,StartPd2Component, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent,PdCollectedDocsComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent, DailyPurchaseDetailsComponent, ManageDailyPurchaseComponent,ManageRentalVerificationComponent,ImageCropComponent,PurchaseCalculationComponent],
providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective,QuesFormService],
entryComponents: [DuplicatePdComponent,VendorPdAllocationComponent,PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,BusinessAssetsInfoComponent,
ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent,PdCollectedDocsComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent,PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent, ManageDailyPurchaseComponent,ManageRentalVerificationComponent,FuturePlansAndBusinessEnvironmentComponent,ImageCropComponent,QueriesDocsComponent,
- DynamicFormComponent,DynamicQuestionTemplateComponent,VideoPlayerComponent,ImageDocsComponent,ImagesAllComponent],
+ DynamicFormComponent,DynamicQuestionTemplateComponent,VideoPlayerComponent,ImageDocsComponent,ImagesAllComponent,FormComponent,FormGroupComponent],
})
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 ed878004b..87dd51206 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,7 @@ 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 { StartPdComponent } from './list-pd/start-pd/start-pd.component';
+import { StartPd2Component } from './list-pd/start-pd/start-pd2/start-pd2.component';
import { PdReportComponent } from './list-pd/pd-report/pd-report.component';
/*
* manage pd router
@@ -39,6 +40,10 @@ const routes: Routes = [
path: 'startpd/:pdid/:rdmstr',
component: StartPdComponent,
},
+ {
+ path: 'startpd2/:pdid/:rdmstr',
+ component: StartPd2Component,
+ },
{
path: 'pd_report/:pdid/:rdmstr',
component: PdReportComponent,
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 c81f1b523..d6beb2474 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
@@ -387,11 +387,14 @@ export class PdTrigerService {
httpParams = httpParams.append('random_string',randomString);
// console.log('loadFullTemplate api load httpParams are',httpParams);
const options = pdId ? { params: httpParams } : {};
- return this._http.get(this.apiUrl + "loadFullTemplate", options)
+ console.log(options)
+ //return this._http.get(this.apiUrl + "loadFullTemplate", options)
+ return this._http.get(this.apiUrl + "loadFullTemplateV2", options)
.pipe(
catchError(this.handleError('operation', []))
)
}
+
// load PD question answers
@@ -1006,7 +1009,7 @@ export class PdTrigerService {
loadCreditPDTemplate(params) {
return this._http.post(this.apiUrl+'loadCreditPDTemplate', params)
- // dummy data
+ // // dummy data
// return this._http.get('../../../assets/sample_covid19_ques.json').map(result=>{
// console.log(result)
// let apivalue ={dataStatus:true,records:{template:JSON.stringify(result)}}
@@ -1014,6 +1017,7 @@ export class PdTrigerService {
// return apivalue
// })
}
+
updateVendorFormStatus(params) {
console.log("update",params);
return this._http.post(this.apiUrl+'updateVendorFormStatus',params)
@@ -1039,6 +1043,97 @@ export class PdTrigerService {
console.log(params);
return this._http.post(this.apiUrl+'updateMISReportRemarks',params);
}
+///////////////////////////////////////////////////
+ savePDFormDetails(params) {
+ // {"fk_pd_id":"1","fk_form_id":"1"}
+ return this._http.post(this.apiUrl+'getSMCCreditPDSectionData',{records:params})
+ }
+ loadDataFromExcel(params) {
+ return this._http.post(this.apiUrl+'loadDataFromExcel',{records:params})
+ }
+ loadTemplate(form_id,mapid,Formname) {
+ console.log( Formname)
+ // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/'+form_id+'.json').map(rr=>{
+ // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/16.json').map(rr=>{
+ if( Formname == 'Business Information'){
+ return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/'+form_id+'.json').map(rr=>{
+ let returnValue ={dataStatus:true,status:200,records:{template:JSON.stringify(rr)}}
+ // this.raw_credit_pd_template= returnValue.records.template
+ return returnValue
+ })
+
+ }else{
+ return this._http.get(this.apiUrl + "formWiseJSONTemplateV2?form_id="+form_id+"&map_id="+mapid+"").map(result=>{
+ console.log(result)
+ let apivalue ={dataStatus:true,status:200,records:{template:JSON.stringify(result)}}
+ console.log(apivalue)
+ return apivalue
+ })
+ // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/DONE/'+form_id+'.json').map(rr=>{
+ // // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/9.json').map(rr=>{
+ // let returnValue ={dataStatus:true,status:200,records:{template:JSON.stringify(rr)}}
+ // // this.raw_credit_pd_template= returnValue.records.template
+ // console.log("12345")
+ // return returnValue
+ // })
+ }
+
+ }
+ saveSMCCreditPDsection(params1):Observable {
+ params1.createdby = this._aws.getlocale()
+ // "fk_pd_id":"1","fk_form_id":"1","json":"SOMEDATA","fk_createdby":"12"
+ // let params = {"records":{"smc_credit_pd":this.curr_credit_pd_data.smc_credit_pd,"lender_id":this.curr_credit_pd_data.lender_id,"product_id":this.curr_credit_pd_data.product_id,"fk_createdby":this._awsService.getlocale(),"geo_location":"","section_id":params1.section_id,"questions":params1.questions,"is_complete":"0"}}
+ return this._http.post(this.apiUrl+'saveSMCCreditPDsection',{records:params1})
+ }
+ // saveNewSMCTempAddresses(params) {
+ // params = {records:params}
+ // return this._http.post(this.apiUrl+'saveNewSMCTempAddresses',params)
+ // }
+ saveNewSMCTempAddresses(params) {
+ params = {records:params}
+ return this._http.post(this.apiUrl+'saveNewSMCTempAddresses',params)
+ }
+ getPDSectionData(pd_id,pd_form_id,form_group) {
+ if(form_group == 1){
+ return this._http.post(this.apiUrl+'getPDFormDetails',{ "pd_id":pd_id,"pd_form_id":pd_form_id,"company_id":1})
+ }else{
+ return this._http.post(this.apiUrl+'getPDFormDetails',{ "pd_id":pd_id,"pd_form_id":pd_form_id,parent_pdid:"2904"})
+ }
+
+
+ }
+ getSMCTempAddresses(params) {
+
+ return this._http.get(this.apiUrl+'getPDFormDetails',params)
+ }
+
+ loadCreditPDTemplate2(form_id,mapid,Formname):Observable {
+
+ //return this._http.get(this.apiUrl + "formWiseJSONTemplateV2?form_id=5&map_id=7").map(result)
+
+ // return this._http.get(this.apiUrl + "formWiseJSONTemplateV2?form_id=5&map_id=7").map(result=>{
+ // console.log(result)
+ // let apivalue ={dataStatus:true,records:{template:JSON.stringify(result)}}
+ // console.log(apivalue)
+ // return apivalue
+ // })
+ // if( Formname == 'Business Information'){
+ // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/'+form_id+'.json').map(rr=>{
+ // let returnValue ={dataStatus:true,status:200,records:{template:JSON.stringify(rr)}}
+ // // this.raw_credit_pd_template= returnValue.records.template
+ // return returnValue
+ // })
+
+ // }else{
+ return this._http.get(this.apiUrl + "formWiseJSONTemplateV2?form_id="+form_id+"&map_id="+mapid+"").map(result=>{
+ console.log(result)
+ let apivalue ={dataStatus:true,status:200,records:{template:JSON.stringify(result)}}
+ console.log(apivalue)
+ return apivalue
+ })
+ // }
+
+ }
generatesalereport(params :any): Observable {
// let httpParams = new HttpParams().set('pdid', countpdid);
// httpParams = httpParams.append('random_string',randomString);
diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts
index adb00948c..3ac843ab5 100755
--- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts
+++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts
@@ -57,6 +57,8 @@ export class EntityListComponent implements OnInit {
// this.filterFormGroupCtrl = this._formBuilder.group({
// category: [null, '']
// });
+ let id = this.route.snapshot.params
+ console.log(id)
}
ngOnInit() {
diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
index 6699f2e37..ad8d26cad 100755
--- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
+++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
@@ -51,6 +51,7 @@ const HORIZONTALMENUITEMS = [
{state:'setting/pdteamlist',name:'PD Team'},
// {state:'template/questions', name: 'Questions'},
{state:'template/templates', name: 'Templates'},
+ {state:'template2', name: 'Templates 2.0'},
]
},
diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts
index a62c56fd5..dc5d85e16 100755
--- a/ng6-seed/src/app/shared/menu-items/menu-items.ts
+++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts
@@ -83,6 +83,7 @@ const MENUITEMS : Menu[] = [
{state:'setting/pdteamlist',name:'PD Team'},
// {state:'template/questions', name: 'Questions'},
{state:'template/templates', name: 'Templates'},
+ {state:'template2/template2', name: 'Templates 2.0'},
]
},
{
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
index 5066c460c..40a8d0096 100755
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
@@ -83,6 +83,7 @@ export class EditLenderComponent implements OnInit {
if (data.records) {
this.noTemplateLendersFound = false;
this.templateLenderRecord = data.records;
+ console.log( this.templateLenderRecord)
this.setFormDatas(this.templateLenderRecord);
// this.templateListData = data.records;
// this.dataLength = data.records.length;
diff --git a/ng6-seed/src/app/template2/edit-template/edit-template.component.html b/ng6-seed/src/app/template2/edit-template/edit-template.component.html
new file mode 100644
index 000000000..263d48f5f
--- /dev/null
+++ b/ng6-seed/src/app/template2/edit-template/edit-template.component.html
@@ -0,0 +1,67 @@
+
+
+
+
+ Deselective Questions will be Disable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{node.item}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{node.item}}
+
+
+
+
+
+
+
+
+
+
+ {{main_applicant}} {{lender_applicant_id ? '('+lender_applicant_id+')' : ''}}, {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
+
+
+
+
+
+
+
+
+
+
+ {{companyList.company_name}}
+
+
+
+
+
+
+
+ {{ formButton.form_name }}
+
+
+
+
+
+
+
+
+
+
Business Related Information is Not Available.Please Check General Information
+
+
+
+
+
diff --git a/ng6-seed/src/app/template2/form-group/form-group.component.scss b/ng6-seed/src/app/template2/form-group/form-group.component.scss
new file mode 100644
index 000000000..4df6c6f0a
--- /dev/null
+++ b/ng6-seed/src/app/template2/form-group/form-group.component.scss
@@ -0,0 +1,34 @@
+.paragraph_change {
+ color: #fff !important;
+ background-color: #e00201 !important;
+ }
+
+ .p-text {
+ color:#e00201 !important;
+ font-weight: bold;
+ }
+ ::ng-deep .mat-card-header-text{
+ margin:0px !important;
+}
+.mat-purple{
+ background-color: gray !important;
+}
+ .cdk-global-overlay-wrapper{
+ justify-content: center !important;
+}
+
+ $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important;
+mat-card .child_mat_card > mat-card {
+ border-radius: 0px 0px 0px 15px;
+ box-shadow: $base-card-box-shadow;
+ transform: scale(0.95);
+ transition: box-shadow 0.5s, transform 0.5s;
+ border: 1px solid lavender;
+ &:hover {
+ cursor: pointer;
+ // background-color: #e00201 !important;
+ transform: scale(1);
+ box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2);
+ }
+
+ }
\ No newline at end of file
diff --git a/ng6-seed/src/app/template2/form-group/form-group.component.spec.ts b/ng6-seed/src/app/template2/form-group/form-group.component.spec.ts
new file mode 100644
index 000000000..6853c7f42
--- /dev/null
+++ b/ng6-seed/src/app/template2/form-group/form-group.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormGroupComponent } from './form-group.component';
+
+describe('FormGroupComponent', () => {
+ let component: FormGroupComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ FormGroupComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(FormGroupComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/template2/form-group/form-group.component.ts b/ng6-seed/src/app/template2/form-group/form-group.component.ts
new file mode 100644
index 000000000..3fe88216b
--- /dev/null
+++ b/ng6-seed/src/app/template2/form-group/form-group.component.ts
@@ -0,0 +1,131 @@
+import { Component,OnInit,Inject,Input} from '@angular/core';
+import { NotifierService } from 'angular-notifier';
+import {MatDialog,MatDialogRef,MAT_DIALOG_DATA, MatTableDataSource} from '@angular/material';
+/** Service */
+// import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
+import { MasterService } from '../master.service';
+import {ActivatedRoute, Router} from "@angular/router";
+
+import { EditTemplateComponent } from '../edit-template/edit-template.component';
+@Component({
+ selector: 'app-form-group',
+ templateUrl: './form-group.component.html',
+ styleUrls: ['./form-group.component.scss']
+})
+export class FormGroupComponent implements OnInit {
+
+ customer_segment_abbr: any;
+ subproduct_abbr: any;
+ lender_applicant_id: any;
+ main_applicant: any;
+ pageTitle: string = "Business Related Information";
+ existCompanyList: any = [];
+ pdid: number;
+ form_id: number;
+ waitLoading:boolean;
+ lender_short_name :any;
+ product_abbr :any;
+ prod_catagory: any;
+ selectedFormsCategory: any;
+ pd_all_details: any;
+ CompanyList: any;
+ errorMessage: any;
+ // vendor_status_arr: any=[];
+
+ constructor( private notifier: NotifierService,
+ private route: ActivatedRoute,
+ private router: Router,
+ private masterService: MasterService,
+ ) {
+ console.log(this.pd_all_details)
+ this.pdid = 1;
+ console.log(this.pdid)
+ this.form_id = 13;
+ // this.waitLoading=false;
+ // this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant;
+ // this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
+ // this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
+ // this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
+ // this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name;
+ // console.log(this.lender_short_name);
+ // this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr;
+ // console.log(this.product_abbr);
+ // this.prod_catagory = this.pd_all_details.pdmaster_details.prod_catagory;
+
+ }
+
+ ngOnInit() {
+ this.getCompanyListForBusiness();
+
+ }
+ getCompanyListForBusiness(): void{
+ console.log("data")
+ let map_id = localStorage.getItem('map_id');
+ this.masterService.getCompaniesListsForBusiness(map_id).subscribe(data=>{
+ console.log(data)
+ if(data.dataStatus){
+ console.log(data)
+ //this.existCompanyList = data.records.filter(val =>val.is_active == 1);
+ this.existCompanyList = data.records;
+ this.CompanyList = data.records[0].forms;
+ console.log( this.existCompanyList)
+ // VENDOR FORM ANSWER FETCH STATUS START(SMART PD ONLY)
+ // if(this.existCompanyList.length > 0 && this.pd_all_details.pdmaster_details.fk_pd_type == '2') {
+ // if(this.existCompanyList[0].hasOwnProperty('vendor_form_status') && this.existCompanyList[0].vendor_form_status && this.existCompanyList[0].vendor_form_status.length > 0) {
+ // // temp_vendor_status = JSON.parse(temp_vendor_status)
+ // // if(temp_vendor_status && temp_vendor_status.length > 0 ) {
+ // this.vendor_status_arr = this.existCompanyList[0].vendor_form_status
+ // // }
+ // }
+ // }
+ // END OF VENDOR FORM ANSWER FETCH
+ this.waitLoading = true;
+ }
+ else {
+ this.waitLoading = false;
+ }
+ })
+ }
+ OnSelectform(details,index,disable_key){
+ console.log(details)
+ console.log(index)
+ console.log(disable_key)
+ let form_id = details.form_id;
+ let map_id = localStorage.getItem('map_id');
+
+ let disabled = disable_key
+
+ this.masterService.disableform(form_id,map_id,disabled).subscribe(
+ dataresult => {
+ if (dataresult.status == 200) {
+ console.log(dataresult);
+ this.notifier.notify('success', 'Your Changes Updated.!');
+ // this.loadTemplates();
+ this.getCompanyListForBusiness();
+ }
+ else {
+ this.notifier.notify('warning', 'Something Went Wrong Try Again.!');
+ this.errorMessage = "Something Went Wrong Try Again.!";
+ }
+ }, 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.!');
+ this.errorMessage = "Some Thing Wents Wrong Try Again.!";
+ });
+
+
+
+
+
+}
+ // direct form based questions
+ OnSelectBusinessGroupForms(details: any, company: any,id:any) {
+ console.log(details)
+ console.log(company)
+
+ this.masterService.list_3.next(details);
+ console.log(id)
+ //this.router.navigate(['Group-form'], { relativeTo: this.route });
+ this.router.navigate(['Edit-template'], { relativeTo: this.route });
+}
+
+}
diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.html b/ng6-seed/src/app/template2/lender-list/lender-list.component.html
new file mode 100644
index 000000000..a3f8217d5
--- /dev/null
+++ b/ng6-seed/src/app/template2/lender-list/lender-list.component.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.entity_name }}
+ LENDER
+
+
+
+
+ {{ product.full_name }} ({{product.short_name}})
+ {{ product.branch_name }}
+ {{product.city_name}}, {{product.state_name}}
+
+
+
+
+ {{ product.phone_number }}
+ {{ product.official_email }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No Record Found ...
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.scss b/ng6-seed/src/app/template2/lender-list/lender-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.spec.ts b/ng6-seed/src/app/template2/lender-list/lender-list.component.spec.ts
new file mode 100644
index 000000000..1cacd3e96
--- /dev/null
+++ b/ng6-seed/src/app/template2/lender-list/lender-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LenderListComponent } from './lender-list.component';
+
+describe('LenderListComponent', () => {
+ let component: LenderListComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ LenderListComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(LenderListComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.ts b/ng6-seed/src/app/template2/lender-list/lender-list.component.ts
new file mode 100644
index 000000000..af8a183e8
--- /dev/null
+++ b/ng6-seed/src/app/template2/lender-list/lender-list.component.ts
@@ -0,0 +1,222 @@
+import { Component, ViewChild, OnInit } from '@angular/core';
+import { MatPaginator, MatSort, MatTableDataSource, MatDialog, PageEvent } from '@angular/material';
+import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { ActivatedRoute, Router, Params } from '@angular/router';
+import { DataSource } from '@angular/cdk/table';
+import { Observable } from 'rxjs/Observable';
+// import { MastersService } from './../../service/masters/masters.service';
+import { MastersService } from './../../settings/service/masters/masters.service';
+/** Dialog Component */
+// import { EntityAddComponent } from './../entity-add/entity.add.component';
+import { EntityAddComponent } from './../../settings/entity/entity-add/entity.add.component';
+// import { EditComponent } from './../entity-edit/entity.edit.component';
+// import { EntityService } from './../../service/entity/entity.service';
+import { EntityService } from './../../settings/service/entity/entity.service';
+import { MasterService } from '../master.service';
+// import { EntityEditComponent } from "./../entity-edit/entity.edit.component";
+/*
+* Questions master List component
+* : kdk
+*/
+
+@Component({
+ selector: 'app-lender-list',
+ templateUrl: './lender-list.component.html',
+ styleUrls: ['./lender-list.component.scss']
+})
+export class LenderListComponent implements OnInit {
+
+ public listView: any = true;
+
+ public enityList: any[] = [];
+ public paginationList: any[] = [];
+ public categories: any = [];
+ public search_cid: any = null;
+ public noQuesMasterRecrdFound: boolean = false;
+
+ public filterFormGroupCtrl: FormGroup;
+
+ // @ViewChild(EntityEditComponent) child;
+
+ // pagination variable details
+ length = 50;
+ pageIndex = 0;
+ pageSize = 10;
+ pageEvent: PageEvent;
+
+ // data source variable details
+ questionListData = null;
+ public dataLength: number;
+ public dataSource = new MatTableDataSource();
+ displayedColumns = ['entity_name', 'name','contact', 'actions'];
+
+ @ViewChild(MatPaginator) paginator: MatPaginator;
+ @ViewChild(MatSort) sort: MatSort;
+
+ constructor(private dialog: MatDialog,
+ private masterService: MasterService,
+ private _formBuilder: FormBuilder,
+ private route: ActivatedRoute,
+ private router: Router,
+ private entityService: EntityService) {
+ // this.filterFormGroupCtrl = this._formBuilder.group({
+ // category: [null, '']
+ // });
+ //<<<---using ()=> syntax
+
+
+
+
+
+ }
+
+ ngOnInit() {
+
+ }
+
+ // get question master list details
+ getEntityListMasters() {
+ this.noQuesMasterRecrdFound = false;
+ // this.search_cid = this.filterFormGroupCtrl.controls.category.value;
+ console.log(this.search_cid + ", " + this.filterFormGroupCtrl);
+ this.masterService.getEntityListMasterDetails().subscribe(
+ data => {
+ console.log(data.records)
+
+
+
+ if (data) {
+ if (data.records) {
+ this.enityList = data.records;
+ // this.questionListData = data.records;
+ this.dataLength = data.records.length;
+ this.dataSource.data = this.enityList;
+ this.dataSource.paginator = this.paginator;
+
+ } else {
+ this.enityList = [];
+ this.dataLength = null;
+ this.noQuesMasterRecrdFound = true;
+ }
+ } else {
+ this.enityList = [];
+ this.dataLength = null;
+ this.noQuesMasterRecrdFound = true;
+ }
+ }
+ )
+ }
+
+ // get category master details
+ getCategorMaster() {
+ this.masterService.getAllMasterData('QUESTIONCATEGORY').subscribe(
+ data => {
+ this.categories = data.records.filter(category => category.isactive == 1);
+ },
+ error => {
+ // this.errorMessage = "No Category Record Found.";
+ }
+ )
+ }
+
+ ngAfterViewInit() {
+ this.getCategorMaster();
+ this.getEntityListMasters();
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ }
+
+ applyFilter(filterValue: string) {
+ filterValue = filterValue.trim(); // Remove whitespace
+ filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
+ this.dataSource.filter = filterValue;
+ }
+
+ // add questions popup model call
+ addNewQuestion() {
+ this.router.navigate(['/setting/entity/add']);
+
+ // const dialogRef = this.dialog.open(EntityAddComponent, {
+ // data: {},
+ // disableClose: true
+ // });
+ // dialogRef.afterClosed()
+ // .subscribe(dataresult => {
+ // this.getQuestionsMasters();
+ // // this.getBranch();
+ // // this.isPopupOpened = false;
+ // });
+ }
+
+ public parentMessage: any = [];
+ editEntity(detail){
+ // this.parentMessage = detail;
+ this.router.navigate([ '../lenderlist/lps', detail.entity_id ], { relativeTo: this.route });
+ this.listView = false;
+ localStorage.setItem('listView', this.listView);
+ localStorage.setItem('entity_id', detail.entity_id);
+
+ console.log(detail)
+ }
+
+ // goToEdit(template_id : number){
+ // this.router.navigate([ '../list/edit', template_id ], { relativeTo: this.route });
+ // this.listView = false;
+ // }
+
+ showListView(status: boolean){
+ // alert(2);
+ this.listView = status;
+ }
+
+ changeListView(){
+
+ this.getEntityListMasters();
+ this.listView = true;
+ }
+
+ // edit questions master details popup model
+// editQuestion(rowDetails: any) {
+// const dialogRef = this.dialog.open(EditComponent, {
+// data: rowDetails,
+// disableClose: true
+// });
+// dialogRef.afterClosed()
+// .subscribe(dataresult => {
+// this.getQuestionsMasters();
+// // this.getBranch();
+// // this.isPopupOpened = false;
+// });
+// }
+
+ // padination page event call
+ pageChange(e) {
+ console.log(e);
+ }
+
+ addNewEntity(): void {
+ const dialogRef = this.dialog.open(EntityAddComponent, {
+ disableClose: true,
+ data: { }
+ });
+
+ dialogRef.afterClosed().subscribe(result => {
+ if(result != null) {
+ this.getEntityListMasters();
+ this.editEntity({'entity_id':result.record});
+ } else {
+
+ }
+ console.log('The dialog was closed');
+ // alert(result);
+ });
+ }
+
+
+}
+
+// {"dataStatus":true,"status":200,"records":
+// [
+// {"entity_id":"4","full_name":"chech","short_name":"check","fk_region":"2","region_name":"South India","fk_state":"2","state_name":"Tamil Nadu","fk_city":"2","city_name":"Chennai","fk_branch":"10","branch_name":"Ahmedabad","addressline1":"c","pincode":"c","official_email":"c@gmail.com","alt_email":"c@gmail.com","phone_number":"3423423444","mobile_no":"234234234","remarks":"234234","createdon":"2018-10-05 05:18:08","fk_createdby":"1","createdby":"sriram v","updatedon":null,"fk_updatedby":null,"updatedby":null,"isactive":"1","pan":"234234","gst_no":"2342","gst_state_code":"dfw","tat":"12","fk_entity_type_id":"2","entity_name":"LENDOR","0":[{"entity_child_id":"1","contact_person":"cc","contact_email":"cc@gmai.com","contact_mobile_no":"23412341234","isactive":"1","createdon":"2018-10-05 05:18:08","fk_createdby":"1","createdby":"sriram v","updatedon":null,"fk_updatedby":null,"updatedby":null}]},
+// {"entity_id":"1","full_name":"ICICI","short_name":"ICICI","fk_region":"1","region_name":"North India","fk_state":"1","state_name":"Jammu and Kashmir","fk_city":"1","city_name":"Srinagar (summer), Jammu (winter)","fk_branch":"1","branch_name":"Main Branch","addressline1":"add1","pincode":"add2","official_email":null,"alt_email":null,"phone_number":null,"mobile_no":null,"remarks":null,"createdon":"2018-09-28 08:55:56","fk_createdby":"1","createdby":"sriram v","updatedon":"2018-10-03 10:11:28","fk_updatedby":null,"updatedby":null,"isactive":"1","pan":null,"gst_no":null,"gst_state_code":null,"tat":null,"fk_entity_type_id":"2","entity_name":"LENDOR","0":[{"entity_child_id":"2","contact_person":"ccee","contact_email":"ccee@gmai.com","contact_mobile_no":"234123412111","isactive":"1","createdon":"2018-10-05 05:18:08","fk_createdby":"1","createdby":"sriram v","updatedon":"2018-10-05 05:18:08","fk_updatedby":"1","updatedby":"sriram v"}]},
+// {"entity_id":"8","full_name":"ICICIedited","short_name":"checkee","fk_region":"2","region_name":"South India","fk_state":"2","state_name":"Tamil Nadu","fk_city":"2","city_name":"Chennai","fk_branch":"10","branch_name":"Ahmedabad","addressline1":"cee","pincode":"cee","official_email":"cee@gmail.com","alt_email":"cee@gmail.com","phone_number":"3423423111","mobile_no":"234234111","remarks":"edietd","createdon":"2018-10-05 05:18:08","fk_createdby":"1","createdby":"sriram v","updatedon":"2018-10-05 05:18:08","fk_updatedby":"1","updatedby":"sriram v","isactive":"1","pan":"234111","gst_no":"2111","gst_state_code":"dfwee","tat":"12111","fk_entity_type_id":"2","entity_name":"LENDOR","0":[]}]}
diff --git a/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html
new file mode 100644
index 000000000..7a80ddcc0
--- /dev/null
+++ b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html
@@ -0,0 +1,64 @@
+
+
+
+
+ Lender product and Customer Segment (Add / Edit)
+
+
+
+
+ Section List Edit Items (Enable / Disable)
+
+
+
+
+
+
+ {{ formButton.form_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ photoButton.form_name }}
+
+
+
+
+
+
+