From 09a8abebfe422fb8ed87c23afcd88006c83f6253 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 15 Nov 2018 18:03:26 +0530 Subject: [PATCH 01/11] UI changes --- .../edit-pd-applicant.component.html | 16 +++------------- .../list-pd/view-pd/view-pd.component.html | 2 +- .../qc-list/qc-view/qc-view.component.html | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 6b83b14eb..3ae92fc5a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -62,19 +62,9 @@ -
- -
- - - - - -
-
- - -
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 234582cf1..3674c3165 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -77,7 +77,7 @@  {{applicant.applicant_name}}     -  {{applicant.mobile_no}}
Main Applicant +  {{applicant.mobile_no}}
Main Applicant
   {{applicant.relation_name}}

diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 6d24d5113..900b3663f 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -69,7 +69,7 @@  {{applicant.applicant_name}}     -  {{applicant.mobile_no}}
Main Applicant +  {{applicant.mobile_no}}
Main Applicant
    {{applicant.relation_name}}

From a7c6c24e6636a406326f894886096071244aa198 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 15 Nov 2018 18:14:58 +0530 Subject: [PATCH 02/11] assets form frequency key name changes --- .../start-pd/forms/assets-info/assets-info.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index bb44aef7f..fd8954030 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -112,7 +112,7 @@
- {{ freqn.name }} + {{ freqn.name }}
From a45e3b640c3e2d637f1da659f38f0bb71f145eb2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 15 Nov 2018 18:15:36 +0530 Subject: [PATCH 03/11] merge : kms --- .../edit-pd-applicant.component.html | 16 +++------------- .../list-pd/view-pd/view-pd.component.html | 2 +- .../qc-list/qc-view/qc-view.component.html | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 6b83b14eb..3ae92fc5a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -62,19 +62,9 @@
-
- -
- - - - - -
-
- - -
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 234582cf1..3674c3165 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -77,7 +77,7 @@  {{applicant.applicant_name}}     -  {{applicant.mobile_no}}
Main Applicant +  {{applicant.mobile_no}}
Main Applicant
   {{applicant.relation_name}}

diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 6d24d5113..900b3663f 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -69,7 +69,7 @@  {{applicant.applicant_name}}     -  {{applicant.mobile_no}}
Main Applicant +  {{applicant.mobile_no}}
Main Applicant
    {{applicant.relation_name}}

From 2e837324b9b78f39fd9e37776b6de0ca356823ce Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 15 Nov 2018 19:03:23 +0530 Subject: [PATCH 04/11] employement form changes --- .../employment-info.component.html | 12 ++++++------ .../employment-info/employment-info.component.ts | 15 +++++++++------ .../list-pd/start-pd/start-pd.component.html | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 182110f24..6ace32f28 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -16,7 +16,7 @@
- + Yes @@ -31,7 +31,7 @@ - + Yes @@ -41,14 +41,14 @@ - + Yes No - + Yes @@ -67,8 +67,8 @@ - + { - console.log('value', value); if (value.status == 200) { this.employmentForm.controls['employer_name'].setValue(value.records.employer_name); this.employmentForm.controls['how_long_year'].setValue(value.records.how_long_year); @@ -76,13 +79,13 @@ export class EmploymentInfoComponent implements OnInit { employer_name: ['', Validators.compose([Validators.required])], how_long_year: ['', Validators.compose([Validators.required])], how_long_month: ['', Validators.compose([Validators.required])], - was_met: ['', Validators.compose([Validators.required])], + was_met: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], name_person_met: [''], designation_person_met: [''], - confirm_salary: ['', Validators.compose([Validators.required])], + confirm_salary: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], confirm_salary_amount: [''], - attendance_seen: ['', Validators.compose([Validators.required])], - sal_reg_seen: ['', Validators.compose([Validators.required])], + attendance_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], + sal_reg_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], gross_monthly_salary: ['', Validators.compose([Validators.required])], net_monthly_salary: ['', Validators.compose([Validators.required])], bonus_incentive: ['', Validators.compose([Validators.required])], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index ab40fa472..830380285 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -422,7 +422,7 @@ - + From 8d0cd26c4e4fa3c6396b2e00226a9895a1ffcb97 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 16 Nov 2018 10:56:42 +0530 Subject: [PATCH 05/11] Family form UI --- .../family-details.component.html | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index d1cfcc450..526514332 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -14,12 +14,12 @@ - +

Earning Members -

+

- @@ -65,7 +65,7 @@

Non Earning Members -

+

- @@ -106,7 +106,7 @@ -

Residence

+

Residence

From e2f537a40dde6825ee54b85f692872540814bc30 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 16 Nov 2018 12:18:16 +0530 Subject: [PATCH 06/11] Address label UI --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 2 +- .../list-pd/edit-pd-master/edit-pd-master.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index b993c2532..f1d058fb4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -93,7 +93,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 5a84f3f3b..294808f73 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -86,7 +86,7 @@ - + From f54bd33b3acc3b106e90e87db034b01602313630 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 16 Nov 2018 12:45:06 +0530 Subject: [PATCH 07/11] forms changes in qc --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../personal-info/personal-info.component.ts | 2 + .../manage-pd/manage-pd.module.ts | 2 +- .../qc-list/qc-start/qc-start.component.html | 74 +++++- .../qc-list/qc-start/qc-start.component.scss | 248 ++++++++++-------- .../qc-list/qc-start/qc-start.component.ts | 17 +- .../qc-list/qc-view/qc-view.component.ts | 15 +- 7 files changed, 238 insertions(+), 122 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index b993c2532..4b05fa227 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -280,7 +280,7 @@ (click)="onReset()">settings_backup_restore - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index ec43db4e9..4faf03284 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -135,6 +135,7 @@ loadFormWithIDData(data) { }); //console.log(this._personalForm); this.loadDataStatus = true; + } loadFormData(){ @@ -190,6 +191,7 @@ loadFormWithIDData(data) { }); //console.log(this._personalForm); this.loadDataStatus = true; + } //get pd main applicant array values 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 4ccb8e100..24c4e74dd 100644 --- 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 @@ -165,7 +165,7 @@ const pdCustomNotifierOptions: NotifierOptions = { OwlNativeDateTimeModule, ], // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent], - exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], + exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent], providers: [PdTrigerService, GetGeometricLocationService], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent] }) diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index db51c2644..a931c74f1 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -24,6 +24,13 @@ + + + {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }} + + + + @@ -37,7 +44,7 @@
-

{{mainApplicantName}}

@@ -52,10 +59,12 @@
- +
+

No Records Found..

 +
@@ -362,7 +371,66 @@ - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss index fc7ac8814..9db46e8db 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss @@ -1,118 +1,136 @@ @import "./../../../../assets/styles/scss/components/messages"; :host { - margin-left: -5px; - margin-right: -5px; - margin-top: -5px; - display: block; -} -:host /deep/ { - mat-sidenav { - width: 250px; - } - .mat-sidenav-content { - padding: 0; - - } - @media (min-width: 959px) { - .mat-sidenav-side { - background-color: transparent; - box-shadow: none!important; - } - - } -} - -.mat-expansion-panel-header-description { - color: rgba(0, 0, 0, 87); -} -.mat-card-content { - background-color: white; -} -.mat-card-actions { - background-color: white; -} - -.text-ellipsis { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.custm-list-item { - cursor: pointer; -} - - -$base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; -$product-bg-color-hover: rgba(103, 58, 183, 0.7); -.p-list-main { - background: white; - margin: auto; - position: relative; - overflow: hidden !important; - border-radius: 10px 10px 10px 10px; - box-shadow: $base-card-box-shadow; - transform: scale(0.95); - transition: box-shadow 0.5s, transform 0.5s; - &:hover { - transform: scale(1); - box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2); - } - .p-list { - position: relative; - .top { - height: 100%; - width: 100%; - // background: url(https://s-media-cache-ak0.pinimg.com/736x/49/80/6f/49806f3f1c7483093855ebca1b8ae2c4.jpg) no-repeat center center; - -webkit-background-size: 100%; - -moz-background-size: 100%; - -o-background-size: 100%; - background-size: 100%; - } - .bottom { - width: 200%; - height: 15%; - transition: transform 0.5s; - h1 { - margin: 0; - padding: 0; - } - p { - margin: 0; - padding: 0; - } - .left { - height: 100%; - width: 50%; - background: #f4f4f4; - position: relative; - float: left; - .details { - padding: 5px; - float: left; - // width: calc(70% - 40px); - } + margin-left: -5px; + margin-right: -5px; + margin-top: -5px; + display: block; + } + :host /deep/ { + mat-sidenav { + width: 250px; + } + .mat-sidenav-content { + padding: 0; + + } + @media (min-width: 959px) { + .mat-sidenav-side { + background-color: transparent; + box-shadow: none!important; + } + + } + } + + .mat-expansion-panel-header-description { + color: rgba(0, 0, 0, 87); + } + .mat-card-content { + background-color: white; + } + .mat-card-actions { + background-color: white; + } + + .text-ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .custm-list-item { + cursor: pointer; + } + + + $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; + $product-bg-color-hover: rgba(103, 58, 183, 0.7); + .p-list-main { + background: white; + margin: auto; + position: relative; + overflow: hidden !important; + border-radius: 10px 10px 10px 10px; + box-shadow: $base-card-box-shadow; + transform: scale(0.95); + transition: box-shadow 0.5s, transform 0.5s; + &:hover { + transform: scale(1); + box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2); + } + .p-list { + position: relative; + .top { + height: 100%; + width: 100%; + // background: url(https://s-media-cache-ak0.pinimg.com/736x/49/80/6f/49806f3f1c7483093855ebca1b8ae2c4.jpg) no-repeat center center; + -webkit-background-size: 100%; + -moz-background-size: 100%; + -o-background-size: 100%; + background-size: 100%; + } + .bottom { + width: 200%; + height: 15%; + transition: transform 0.5s; + h1 { + margin: 0; + padding: 0; + } + p { + margin: 0; + padding: 0; + } + .left { + height: 100%; + width: 50%; + background: #f4f4f4; + position: relative; + float: left; + .details { + padding: 5px; + float: left; + // width: calc(70% - 40px); + } + + } + .right { + width: 50%; + background: #A6CDDE; + color: white; + float: right; + height: 200%; + overflow: hidden; + .details { + padding: 20px; + float: right; + width: calc(70% - 40px); + } + - } - .right { - width: 50%; - background: #A6CDDE; - color: white; - float: right; - height: 200%; - overflow: hidden; - .details { - padding: 20px; - float: right; - width: calc(70% - 40px); - } - - - } - } - } - -} -mat-icon{ - color: #ff3636; -} + } + } + } + + } + mat-icon{ + color: #ff3636; + } + .address { + display: flex; + padding: 0 2%; + flex-direction: column; + } + + .address > * { + width: 100%; + } + .matcard mat-form-field { + margin: 0 2%; + } + .address .button { + float: right; + width: 10px; + background: #62B013; + color: white; + } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts index 3111050c5..296a97fe3 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts @@ -30,6 +30,12 @@ selectedQuestionIndex:number; getQuestionsLength:number; answerList:any=[]; ansPDList:any=[]; + +// forms details +pdFullDetails:any=[]; +categoryFormButtons: any; +formsCategoryEnable: boolean = false; +selectedFormsCategory: any; // create values for status check pdStatusCheck :any={ "DRAFT" :'DRAFT', @@ -83,9 +89,10 @@ loadTemplates(startID:string){ let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantName = filterApplicantName[0].applicant_name; this.currentPDStatus = data.records.pdmaster_details.pd_status; - this.actualQuestions = data.records.counts.overall_question_count; this.answeredQuestions = data.records.counts.overall_answered_count; + this.categoryFormButtons = data.records.template_forms; + this.pdFullDetails = data.records } else{ this.pdMasterList=""; @@ -106,6 +113,7 @@ loadTemplates(startID:string){ } OnSelectDirectQuestions(selectedQuestions: any, categoryIndex:number,questionsIndex:number){ + this.formsCategoryEnable = false; this.selectedCategory=selectedQuestions; this.selectedCategoryIndex=categoryIndex; this.selectedQuestionIndex=questionsIndex; @@ -427,6 +435,13 @@ optionsMapItems(items) { }); } + // direct form based questions + OnSelectDirectForms(details: any) { + this.formsCategoryEnable = true; + this.selectedFormsCategory = details; + +} + // load pd view component loadPdViewCompoent(){ this.router.navigate([ '../../viewpd',this.startPD], { relativeTo: this.route }); diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index ef3bad0c4..67819b0e6 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -7,6 +7,7 @@ import { QcService } from './../../qc-service/qc.service'; import { QcListComponent } from './../qc-list.component'; import { PdAllocationComponent } from './../../../personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component'; import { SmartPdAllocationComponent } from './../../../personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component'; +import { TelePdAllocationComponent } from './../../../personal-discussion/manage-pd/list-pd/tele-pd-allocation/tele-pd-allocation.component'; import { SchedulePdComponent } from './../../../personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component'; import { EditPdApplicantComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component'; import { EditPdMasterComponent } from './../../../personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component'; @@ -108,7 +109,7 @@ export class QcViewComponent implements OnInit, OnDestroy { } // pd allocation to pdAllocationTo(pdData:any) { - if(pdData.fk_pd_type != 2){ + if(pdData.fk_pd_type == 1){ const dialogRef = this.dialog.open(PdAllocationComponent, { data: pdData, disableClose: true @@ -131,6 +132,18 @@ export class QcViewComponent implements OnInit, OnDestroy { this.viewPdDetails(this.viewID) }); } + else if(pdData.fk_pd_type == 3){ + const dialogRef = this.dialog.open(TelePdAllocationComponent, { + data: pdData, + disableClose: true, + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + // this.notifier.notify('success', 'Successfully allocated.!'); + + this.viewPdDetails(this.viewID) + }); + } } From 13f13fc9ff3ff01be1cc56c4a23532e88bdf37a2 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 16 Nov 2018 12:46:47 +0530 Subject: [PATCH 08/11] merge : kms --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../edit-pd-master.component.html | 2 +- .../family-details.component.html | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 4b05fa227..6e2e4dda6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -93,7 +93,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 5a84f3f3b..294808f73 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -86,7 +86,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index d1cfcc450..526514332 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -14,12 +14,12 @@ - +

Earning Members -

+

- @@ -65,7 +65,7 @@

Non Earning Members -

+

- @@ -106,7 +106,7 @@ -

Residence

+

Residence

From 2218072ed77331780efcd746c5388af715197ee0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 16 Nov 2018 15:07:25 +0530 Subject: [PATCH 09/11] pd service cretaed on / updated on date changes --- .../manage-pd/list-pd/add-pd/add-pd.component.ts | 2 +- .../personal-discussion/pd-service/pd-triger.service.ts | 8 ++++---- ng6-seed/src/app/quality-check/qc-service/qc.service.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 5c90edc5b..4badcdf6d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -309,7 +309,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "pd_status": status, //"fk_pd_allocation_type":this.allocationTypeModel , "fk_createdby" : this._aws.getlocale(), - "createdon": new Date().toJSON().slice(0,19).replace('T',' ') + // "createdon": new Date().toJSON().slice(0,19).replace('T',' ') }; let pd_applicant_details : any=[{ "applicant_name":formValue.applicant_name, 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 212ab19e0..547f93f6e 100644 --- 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 @@ -150,7 +150,7 @@ export class PdTrigerService { editPdMasterDetails(editData: any, status: string): Observable { editData.pd_status = status; editData.fk_updatedby = this._aws.getlocale(); - editData.updatedon = currentdate; + // editData.updatedon = currentdate; return this._http.post(this.apiUrl + "updatePDMaster", {records: editData}) .pipe( @@ -180,7 +180,7 @@ export class PdTrigerService { // update pd officer updatePdOfficer(updateData: any): Observable { updateData.fk_updatedby = this._aws.getlocale(); - updateData.updatedon = currentdate; + // updateData.updatedon = currentdate; return this._http.post(this.apiUrl + "allocatePD", {"records": updateData}) .pipe( catchError(this.handleError('operation', [])) @@ -190,7 +190,7 @@ export class PdTrigerService { // update pd schedule updateSchedule(updateData: any): Observable { updateData.fk_scheduled_by = this._aws.getlocale(); - updateData.createdon = currentdate; + // updateData.createdon = currentdate; return this._http.post(this.apiUrl + "schdulePD", {"records": updateData}) .pipe( catchError(this.handleError('operation', [])) @@ -262,7 +262,7 @@ getPDFormDetailsWithID(pdID, formID ):Observable { // save pd answers savePDQuestions(saveData: any): Observable { saveData.createdby = this._aws.getlocale(); - saveData.fk_createdon = currentdate; + //saveData.fk_createdon = currentdate; // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts index 101e6da51..8103d42fe 100644 --- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts +++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts @@ -52,7 +52,7 @@ export class QcService { editPdMasterDetails(editData:any,status:string):Observable{ editData.pd_status = status; editData.fk_updatedby = this._aws.getlocale(); - editData.updatedon = currentdate; + // editData.updatedon = currentdate; return this._http.post(this.apiUrl+"updatePDMaster",{records:editData}) .pipe( @@ -86,7 +86,7 @@ export class QcService { // save pd answers savePDQuestions(saveData: any): Observable { saveData.createdby = this._aws.getlocale(); - saveData.fk_createdon = currentdate; + // saveData.fk_createdon = currentdate; // saveData[0].fk_updatedby = this._aws.getlocale(); // saveData[0].updatedon = currentdate; From 807ca7f69181399478bac7206d293585f62ca499 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 16 Nov 2018 15:17:05 +0530 Subject: [PATCH 10/11] Mmaster card UI --- .../entity-list/entity.list.component.html | 15 +- .../questions/list/list.component.html | 227 +++++++++--------- .../templates.list.component.html | 65 +++-- 3 files changed, 158 insertions(+), 149 deletions(-) diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index d1e73369d..30604576f 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -1,10 +1,15 @@
+ + +
+
+ Entity Master +
+
-
- Entity Master -
-
+ +
@@ -52,6 +57,8 @@ + +
diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html index ac0ed4c45..afaf902e9 100644 --- a/ng6-seed/src/app/template/questions/list/list.component.html +++ b/ng6-seed/src/app/template/questions/list/list.component.html @@ -1,123 +1,126 @@ - - - -
-
- Questions Master -
-
-
- -
-
- - - - - {{cat.category_name}} - - -
+ + +
+
+ Questions Master
-
- -
-
- - - - - - - - {{ product.category_name }} - - - - - {{ product.question }} - - - - - - - - - - - - - - - - - + + {{cat.category_name}} + + +
-
-
{{ product.question }} +
+ +
+
+ + + + + + {{ product.category_name }} + + + + + {{ product.question }} + + + + + + + + + + + + + + + + + + + +
No Record Found ...
+ + + + + - - -
No Record Found ...
- - - + --> + + + + + - - - -
+ + +
+
+ Template Master + +
+
+ + - -
-
- Template Master - -
-
- - -
-
- - + +
+
+ + +
+
+ @@ -58,15 +61,11 @@ -
- - - -
- -
+ + + +
+
- - - \ No newline at end of file + \ No newline at end of file From b8ccef18ecc9e037336c8f8e0d1c7e9a26d36d96 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 16 Nov 2018 15:29:50 +0530 Subject: [PATCH 11/11] forms UI --- .../start-pd/forms/assets-info/assets-info.component.html | 4 ++-- .../start-pd/forms/business-info/business-info.component.html | 2 +- .../start-pd/forms/business-info/business-info.component.scss | 2 +- .../start-pd/forms/current-loan/current-loan.component.html | 4 ++-- .../start-pd/forms/other-income/other-income.component.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index fd8954030..a912fafb3 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -221,12 +221,12 @@
- +
- +
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 1563deb3d..bec5fb1b7 100644 --- 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 @@ -282,7 +282,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss index 96152853a..c1a248bc2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss @@ -8,7 +8,7 @@ width: 100%; } .matcard > * { - width: 45%; + width: 98%; } .card mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 4e2407234..38d3c5061 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -30,10 +30,10 @@ - + - +