From 11053e62e1472a81c0a9488a6b9eaeca66349713 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 11 Dec 2018 11:58:36 +0530 Subject: [PATCH 1/7] neighbour hood changes --- .../neighbour-hood/neighbour-hood.component.html | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 45b79a01f..62e2d0d80 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -21,31 +21,28 @@ -
- + Yes No -
-
- + + - + Yes No - -
@@ -112,7 +109,7 @@
- +
From 0e01bc657a6349d2bba1b34e6ff7a0c76e431fb5 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 11 Dec 2018 14:56:01 +0530 Subject: [PATCH 2/7] UI changes --- ng6-seed/src/app/dashboard/dashboard.component.html | 8 ++++---- ng6-seed/src/app/dashboard/dashboard.component.scss | 7 +++++-- ng6-seed/src/app/dashboard/dashboard.component.ts | 1 + .../edit-pd-applicant.component.html | 2 +- .../edit-pd-applicant.component.scss | 4 +++- .../edit-pd-master/edit-pd-master.component.html | 2 +- .../edit-pd-master/edit-pd-master.component.scss | 12 ++++++++++-- .../list-pd/map-pd-view/map-pd-view.component.html | 2 +- .../list-pd/map-pd-view/map-pd-view.component.scss | 3 +++ .../pd-allocation/pd-allocation.component.scss | 4 ++++ .../list-pd/pd-allocation/pd-allocation.component.ts | 8 +++++--- .../model-edit-pd-report.component.html | 0 .../model-edit-pd-report.component.scss | 0 .../model-edit-pd-report.component.spec.ts | 0 .../model-edit-pd-report.component.ts | 0 .../pd-requirement/pd-requirement.component.html | 0 .../pd-requirement/pd-requirement.component.scss | 0 .../pd-requirement/pd-requirement.component.spec.ts | 0 .../pd-requirement/pd-requirement.component.ts | 0 .../forms/general-info/general-info.component.html | 0 .../forms/general-info/general-info.component.scss | 0 .../general-info/general-info.component.spec.ts | 0 .../forms/general-info/general-info.component.ts | 0 .../other-applicant-details.component.html | 0 .../other-applicant-details.component.scss | 0 .../other-applicant-details.component.spec.ts | 0 .../other-applicant-details.component.ts | 0 .../report-template/report-template.component.html | 0 .../report-template/report-template.component.scss | 0 .../report-template.component.spec.ts | 0 .../report-template/report-template.component.ts | 0 31 files changed, 38 insertions(+), 15 deletions(-) mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 4ea5cdf2d..c77268923 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,6 +1,6 @@
- +
{{dashboardTitle}} @@ -45,7 +45,7 @@
-
+
Full - {{total1}}
-
+
Smart - {{total2}}
-
+

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss index 4fe099dd8..3bd6bebcf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss @@ -2,5 +2,7 @@ mat-form-field { margin: 0 2%; } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; } \ No newline at end of file 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 0fe16aa64..af3fa43c1 100755 --- 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 @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss index 4fe099dd8..d03494e25 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss @@ -2,5 +2,13 @@ mat-form-field { margin: 0 2%; } .paragraph_change { - color: #e00201 !important; -} \ No newline at end of file + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; +} + .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + mat-dialog-actions{ + border-top: 2px solid #e00201; + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html index 8411c320e..8a6caf518 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html @@ -81,7 +81,7 @@
-
+
II Full   II Smart
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss index f4a19b950..80a496fbf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss @@ -39,4 +39,7 @@ $mat-toolbar-height-mobile-landscape: 48px !default; /* optional: show position indicator in red */ ::-webkit-scrollbar-thumb { background: #FF0000; +} +::ng-deep .body-container{ + padding:0px !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss index 460dfa640..4a8d6adb2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss @@ -12,3 +12,7 @@ .text_change { color: #e00201 !important; } + .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts index 5717e4de8..6cfc777fa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit, Inject, ViewEncapsulation } from '@angular/core'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; import { NotifierService } from 'angular-notifier'; @@ -8,7 +8,9 @@ import { AllocationViewMoreComponent } from './../allocation-view-more/allocatio @Component({ selector: 'app-pd-allocation', templateUrl: './pd-allocation.component.html', - styleUrls: ['./pd-allocation.component.scss'] + styleUrls: ['./pd-allocation.component.scss'], + encapsulation: ViewEncapsulation.None + }) export class PdAllocationComponent implements OnInit { public pageTitle: string = "Allocation To PD Officer"; @@ -89,7 +91,7 @@ export class PdAllocationComponent implements OnInit { data: details, disableClose: true, position: { right: '0'}, - width:'80%', + width:'100%', // hasBackdrop:false }); // dialogSchedule.afterClosed() diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.html old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.scss old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/report-template/report-template.component.ts old mode 100644 new mode 100755 From 9457aef3171510c9bb440dcd96abb75d689603bd Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 11:27:46 +0530 Subject: [PATCH 3/7] edit coapplicant landline no Changes : ps --- .../list-pd/add-pd/add-pd.component.html | 8 +++--- .../list-pd/add-pd/add-pd.component.ts | 8 +++--- .../edit-pd-applicant.component.html | 18 +++++++++---- .../edit-pd-applicant.component.ts | 25 ++++++++++++------- .../list-pd/view-pd/view-pd.component.ts | 1 + 5 files changed, 38 insertions(+), 22 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 76ea36cb7..fdccd4b38 100755 --- 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 @@ -176,12 +176,12 @@ - - Enter Valid LandLine Number. + + Enter Valid STD Code Number.   -   - - Enter Valid statuscode Number. + + Enter Valid LandLine Number. 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 e5fe36a5b..26eef3002 100755 --- 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 @@ -75,8 +75,8 @@ export class AddPdComponent implements OnInit, OnDestroy { mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], // landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], // email: [null], - statecode:[null, Validators.compose([Validators.required,Validators.minLength(2),Validators.maxLength(4),Validators.required,Validators.pattern('^[0-9]*$')])], - landline : [null, Validators.compose([Validators.required,Validators.minLength(6),Validators.maxLength(8),Validators.required,Validators.pattern('^[0-9]*$')])], + stdcode:[null, Validators.compose([Validators.minLength(2),Validators.maxLength(4),Validators.pattern('^[0-9]*$')])], + landline : [null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], company_name: [null],   addressline1: [null], @@ -218,7 +218,7 @@ export class AddPdComponent implements OnInit, OnDestroy { createRequiremnt(): FormGroup { return this._fb.group({ add_req_id:[null], - add_requirement: [null, Validators.compose([Validators.required])], + add_requirement: [null], isactive: [1], }); }; @@ -379,7 +379,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "applicant_name":formValue.applicant_name, "company_name":formValue.company_name, "mobile_no":formValue.mobile_no, - "landline":formValue.statecode +'-'+formValue.landline, + "landline":formValue.stdcode +'-'+formValue.landline, "applicant_type":1, "relation":"", }); 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 a89939c41..67687b695 100755 --- 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 @@ -32,12 +32,12 @@ Enter Valid Mobile Number. - - Enter Valid Phone Number. + + Enter Valid STD Code.  -  - Enter Valid Phone Number. + Enter Valid Landline Number. @@ -60,10 +60,18 @@ Enter Valid Mobile Number. - + + + + Enter Valid STD Number. +  -  + + + Enter Valid Landline Number. + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index 6123d338c..0cceec89d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -52,15 +52,15 @@ export class EditPdApplicantComponent implements OnInit { } loadApplicantFormData() { - let statecodesearch = this.mainApplicantData[0].landline.search("-"); - let statecode = this.mainApplicantData[0].landline.substr(0,statecodesearch); - console.log(statecode); - let landline = this.mainApplicantData[0].landline.substr(+statecodesearch + 1,8); + let stdcodesearch = this.mainApplicantData[0].landline.search("-"); + let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch); + console.log(stdcode); + let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8); this._EditApplicantForm = this._fb.group({ fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])], mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.required,Validators.minLength(10),Validators.maxLength(12)])], - statecode: [statecode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], company_name: [this.mainApplicantData[0].company_name], applicant_type: [this.mainApplicantData[0].applicant_type, Validators.compose([Validators.required])], @@ -76,12 +76,17 @@ export class EditPdApplicantComponent implements OnInit { } createItem(listData): FormGroup { if(listData){ + let stdcodesearch = listData.landline.search("-"); + let stdcode = listData.landline.substr(0,stdcodesearch); + let landline = listData.landline.substr(+stdcodesearch + 1,8); return this._fb.group({ label: ['Co Applicant'], fk_applicant_primary_id: [listData.pd_co_applicant_id], coapplicantName: [listData.applicant_name, Validators.compose([Validators.required])], coapplicant_mobile_no: [listData.mobile_no,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], - coapplicant_landline: [listData.landline,Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], + coapplicant_stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + // landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], + coapplicant_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], relationship: [listData.relation], applicant_type: [listData.applicant_type, Validators.compose([Validators.required])], company_name: [listData.company_name], @@ -93,7 +98,9 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [null], coapplicantName: [null, Validators.compose([Validators.required])], coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], - coapplicant_landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], + coapplicant_stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + coapplicant_landline: [null,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], + //coapplicant_landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], relationship: [null], applicant_type: [0], company_name: [null], @@ -123,7 +130,7 @@ export class EditPdApplicantComponent implements OnInit { "applicant_name":formValue.applicant_name, "company_name":formValue.company_name, "mobile_no":formValue.mobile_no, - "landline":formValue.statecode+'-'+formValue.landline, + "landline":formValue.stdcode+'-'+formValue.landline, "applicant_type":formValue.applicant_type, "relation":formValue.relationship, "isactive":1 @@ -135,7 +142,7 @@ export class EditPdApplicantComponent implements OnInit { "applicant_name":itemElement.coapplicantName, "relation":itemElement.relationship, "mobile_no":itemElement.coapplicant_mobile_no, - "landline":itemElement.coapplicant_landline, + "landline":itemElement.coapplicant_stdcode+'-'+itemElement.coapplicant_landline, "applicant_type":itemElement.applicant_type, "company_name":itemElement.company_name, "isactive":1 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index ddeb2d637..bcf27d053 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -56,6 +56,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { } ngOnInit() { + this.ListPdComponent.showListView(false); this.route.params.subscribe(params => { this.viewID = params['pdid']; }); From 611f27e8de38735cf51ad0f9f2ed7b445135bcf2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 15:57:35 +0530 Subject: [PATCH 4/7] UI changes --- .../app/layouts/admin/admin-layout.component.html | 12 ++++++------ .../allocation-view-more.component.html | 2 +- .../allocation-view-more.component.scss | 3 ++- .../edit-pd-applicant.component.scss | 2 +- .../pd-allocation/pd-allocation.component.html | 4 ++-- .../pd-allocation/pd-allocation.component.scss | 5 +++++ .../pd-requirement/pd-requirement.component.html | 2 +- .../pd-requirement/pd-requirement.component.scss | 3 ++- .../start-pd/forms/address/address.component.html | 2 +- .../start-pd/forms/address/address.component.scss | 3 ++- .../assessed-income/assessed-income.component.html | 2 +- .../assessed-income/assessed-income.component.scss | 3 ++- .../forms/assets-info/assets-info.component.html | 2 +- .../forms/assets-info/assets-info.component.scss | 3 ++- .../banking-details/banking-details.component.html | 2 +- .../banking-details/banking-details.component.scss | 3 ++- .../forms/business-info/business-info.component.html | 2 +- .../forms/business-info/business-info.component.scss | 3 ++- .../forms/client-info/client-info.component.html | 2 +- .../forms/client-info/client-info.component.scss | 3 ++- .../forms/current-loan/current-loan.component.html | 2 +- .../forms/current-loan/current-loan.component.scss | 3 ++- .../employment-info/employment-info.component.html | 2 +- .../employment-info/employment-info.component.scss | 3 ++- .../family-details/family-details.component.html | 2 +- .../family-details/family-details.component.scss | 3 ++- .../financial-info/financial-info.component.html | 2 +- .../financial-info/financial-info.component.scss | 3 ++- .../forms/general-info/general-info.component.html | 2 +- .../forms/general-info/general-info.component.scss | 3 ++- .../lender-representative.component.html | 2 +- .../lender-representative.component.scss | 3 ++- .../forms/loan-details/loan-details.component.html | 2 +- .../forms/loan-details/loan-details.component.scss | 3 ++- .../neighbour-hood/neighbour-hood.component.html | 2 +- .../neighbour-hood/neighbour-hood.component.scss | 3 ++- .../neighbour-hood/neighbour-hood.component.spec.ts | 0 .../forms/neighbour-hood/neighbour-hood.component.ts | 0 .../other-applicant-details.component.html | 2 +- .../other-applicant-details.component.scss | 3 ++- .../forms/other-income/other-income.component.html | 2 +- .../forms/other-income/other-income.component.scss | 3 ++- .../forms/personal-info/personal-info.component.html | 2 +- .../forms/personal-info/personal-info.component.scss | 3 ++- .../forms/rental-info/rental-info.component.html | 2 +- .../forms/rental-info/rental-info.component.scss | 3 ++- .../start-pd/forms/stock/stock.component.html | 2 +- .../start-pd/forms/stock/stock.component.scss | 3 ++- .../forms/supplier-info/supplier-info.component.html | 2 +- .../forms/supplier-info/supplier-info.component.scss | 3 ++- .../entity/entity-list/entity.list.component.html | 2 +- .../app/shared/menu-items/horizontal-menu-items.ts | 2 +- .../edit/edit-category/edit-category.component.html | 2 +- .../category-question-answer.component.html | 4 ++-- .../templates-list/templates.list.component.html | 6 +++++- 55 files changed, 90 insertions(+), 59 deletions(-) mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.spec.ts mode change 100644 => 100755 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index dd92367ca..f9cdd28a9 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -108,12 +108,12 @@

-
+
@@ -124,7 +124,7 @@ - @@ -145,7 +145,7 @@
- - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html index 13dece34f..2f3e829fe 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html @@ -1,5 +1,5 @@

-
+
{{data.first_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss index 8777abac5..ca19d341c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } ol { list-style-type: none; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss index 3bd6bebcf..6795e1e30 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss @@ -3,6 +3,6 @@ mat-form-field { } .paragraph_change { color: #fff !important; - background-color: #e00201 !important; + background-color: #e00201 !important; // padding: 10px !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html index c41ba5c4a..4d2e945c6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html @@ -1,5 +1,5 @@ -

-
+

+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss index 4a8d6adb2..044bbd96c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss @@ -15,4 +15,9 @@ .cdk-global-overlay-wrapper{ justify-content: center !important; } +.paragraph_change { + color: #fff !important; + background-color: #e00201 !important; + // padding: 10px !important; +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html index 914f09e74..25c364190 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss index 4fe099dd8..9bb4a0404 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss @@ -2,5 +2,6 @@ mat-form-field { margin: 0 2%; } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index edf72fb72..4f150c5d2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -2,7 +2,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss index 35daae966..e899923d3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index f9c8c2402..5f071b389 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 5e603e032..ab69d07d0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -35,7 +35,8 @@ tr.mat-footer-row { .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 c07476cda..acb2f4f66 100755 --- 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 @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss index 295f68262..8acfd1d59 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index c39bc3442..65381d8f6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -69,7 +69,7 @@

-
{{pageTitle}}
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss index 08086044f..96645e7af 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss @@ -11,7 +11,8 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 8304e99af..2efcff73a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -1,7 +1,7 @@

-
{{pageTitle}}
+
{{pageTitle}}
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 34bdc26e8..f49982241 100755 --- 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 @@ -33,7 +33,8 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index 77ee86f38..7faf85907 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -1,7 +1,7 @@

-
{{pageTitle}}
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss index 6dbbafcf7..c2c0ef8c2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 cc87f6dc9..42c95060c 100755 --- 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 @@ -1,7 +1,7 @@

-
{{pageTitle}}
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss index cd0448ed0..e639a3521 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss @@ -19,7 +19,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 985d7b252..da9d3a8da 100755 --- 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 @@ -1,6 +1,6 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss index 9e5a3eaf8..2138b2c0f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss @@ -21,7 +21,8 @@ } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 bcbbef8eb..06ed67ddf 100755 --- 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 @@ -1,6 +1,6 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss index 197f8353a..e7f2a1bcb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss @@ -24,7 +24,8 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index b5f22eecf..8c8d31237 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -2,7 +2,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss index 41f2bb3ed..b1652e4c4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss @@ -23,7 +23,8 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 3bcede64a..0b3e3fc52 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss index d730ff59a..448028b25 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .example-section { height: 120px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index 58085ce20..7867a8508 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -1,6 +1,6 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss index d422798d3..1ddd78f24 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss @@ -11,7 +11,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 7d9d47cbd..202c771b7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -1,6 +1,6 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss index aade5c39e..c010d7fa9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss @@ -23,7 +23,8 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html old mode 100644 new mode 100755 index 62e2d0d80..b795cfaa4 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss old mode 100644 new mode 100755 index f18a47720..d16b77a3b --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.spec.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts old mode 100644 new mode 100755 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html index 4d81081b0..ab04d54a4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss index ae78439a5..eee866396 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 71651f88f..7249bed24 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss index b4ffad50d..baeef985a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss @@ -18,7 +18,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 59e13fa12..144a5ab5e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss index b7f235278..7b668d62c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss @@ -1,5 +1,6 @@ .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index 6362fe0a1..586607736 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -1,7 +1,7 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss index f731f4f4f..8965f2346 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss @@ -27,7 +27,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 6c81c0054..291abc847 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -1,6 +1,6 @@

-
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss index b4ffad50d..baeef985a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss @@ -18,7 +18,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 772274f88..93b4ad4c9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -1,7 +1,7 @@

-
{{pageTitle}}
+
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss index 4e655f1ef..70945645a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss @@ -3,7 +3,8 @@ // } .paragraph_change { - color: #e00201 !important; + color: #fff !important; + background-color: #e00201 !important; } .mat-card-content { background-color: white; 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 30604576f..d2380d6c5 100755 --- 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,7 +1,7 @@
-
+
Entity Master
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 6e9485485..12d6afdcd 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 @@ -38,7 +38,7 @@ const HORIZONTALMENUITEMS = [ {state:'setting/mastermodule',name:'Master Details'}, {state:'setting/entity',name:'Entities'}, {state:'setting/pdteamlist',name:'PD Team'}, - {state:'template/questions', name: 'Questions'}, + // {state:'template/questions', name: 'Questions'}, {state:'template/templates', name: 'Templates'}, ] }, diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html index 3743bbaae..ffcd6bdd7 100755 --- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html @@ -14,7 +14,7 @@
- + % Weightage Required.! diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html index 92589721b..cc8b3ef87 100755 --- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html @@ -13,7 +13,7 @@ {{i+1}} )
- + % Ques. WT is Required.! @@ -61,7 +61,7 @@
- +
diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html index df2caf7d8..6d38e18e1 100755 --- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html @@ -26,14 +26,16 @@
- + + Template Name {{ template.template_name }} + Lender Details
{{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} ,

 @@ -41,10 +43,12 @@ + Actions + From 2e2f10e760f43735ad258ce5409a0dcfc1203f68 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 19:48:51 +0530 Subject: [PATCH 5/7] UI changes --- .../assets-info/assets-info.component.html | 3 +- .../client-info/client-info.component.html | 14 ++++++--- .../neighbour-hood.component.html | 29 ++++++++++++++----- .../supplier-info.component.html | 16 +++++++--- .../supplier-info.component.scss | 5 ++++ 5 files changed, 51 insertions(+), 16 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 acb2f4f66..a3e0feed8 100755 --- 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 @@ -294,7 +294,7 @@ - +
@@ -428,6 +428,7 @@
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index 7faf85907..23a199f3d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -17,6 +17,7 @@
+ @@ -96,7 +97,14 @@ --> - + + +
+ +
+ +
@@ -228,9 +236,7 @@ -->

-
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index b795cfaa4..ebd7ad237 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -6,11 +6,7 @@
{{pageTitle}}
-
- - {{types.type_name}} - -
+
@@ -18,7 +14,15 @@

+
+
+ + {{types.type_name}} + +
+
+ @@ -45,9 +49,15 @@ delete - + +
+ +
+ + + @@ -99,6 +109,12 @@ delete + +
+ +
+ + @@ -109,7 +125,6 @@
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 93b4ad4c9..d35c324bd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -1,3 +1,4 @@ +

@@ -14,6 +15,7 @@ +
@@ -110,6 +112,13 @@
+ +
+ +
+ + @@ -239,14 +248,13 @@ -->

-
- - +
+
+
\ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss index 70945645a..2ee011993 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss @@ -6,6 +6,11 @@ color: #fff !important; background-color: #e00201 !important; } +// ::ng-deep .cdk-overlay-pane{ +// max-width: 100vw !important; +// width: 100% !important; +// height: 95% !important; +// } .mat-card-content { background-color: white; } From 2c91799dd6535c2f045db51bba93f21d362133fb Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 20:36:32 +0530 Subject: [PATCH 6/7] loan details Changes :ps --- .../loan-details/loan-details.component.html | 46 +++--- .../loan-details/loan-details.component.ts | 146 ++++++++++++++++-- 2 files changed, 150 insertions(+), 42 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 7d9d47cbd..66eb0c29f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -54,7 +54,7 @@ + formControlName="is_topup" required> Yes No @@ -73,12 +73,13 @@ {{"₹"}} {{topUpAmtInWords}} Only - + + {{"₹"}} {{ownContributionInWords}} Only - + {{ sour.name }} @@ -97,17 +98,14 @@ - - -

Mortgage -

- - + +

Mortgage

 - + {{ typeprop.property_name }} + - - - + + + {{owner.applicant_name}} - Others + Others (Please Specify) - + + + + + - - - - {{ status.name }} {{status.id}} - - + + {{ status.name }} {{status.id}} + + {{"₹"}} {{valAsPerAgmtInWords}} Only --> - - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index a0776c18b..1b5a1cf33 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -31,15 +31,20 @@ import {ActivatedRoute, Router} from '@angular/router'; export class LoanDetailsComponent implements OnInit { public loanDetailsForm: FormGroup; private notifier: NotifierService; + pdid: number; form_id: number; exist_loan_amt: any; applicants: any; productAbbr: any; + subProductName: any; + isOtherPurpose: boolean = false; isSource: boolean = false; mortageCheck : boolean = true; + OtherOwnerFlag : boolean; + endUserList: any = []; ownerNames: any = []; m_endUseofLoad = []; @@ -55,6 +60,10 @@ export class LoanDetailsComponent implements OnInit { topUpAmtInWords: any; pageTitle: string ="Loan Details"; + mortageCardAccess: boolean; + mortageAccess: boolean = false; + propertyType : any; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -63,6 +72,7 @@ export class LoanDetailsComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.applicants = this.pd_all_details.pdapplicants_detials; this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr; + this.subProductName = this.pd_all_details.pdmaster_details.subproduct_name; this.exist_loan_amt = this.pd_all_details.pdmaster_details.loan_amount != '' ? this.pd_all_details.pdmaster_details.loan_amount :''; this.loanAmtInWords = this._pd.convertNumberToWords(this.exist_loan_amt); this.form_id = 10; @@ -99,9 +109,15 @@ export class LoanDetailsComponent implements OnInit { let ownername: any = []; owner.forEach(val => { ownername.push(val.owner_name); + if(val.owner_name == 'Others'){ + this.OtherOwnerFlag = true; + } + else{ + this.OtherOwnerFlag = false; + } }); - console.log('enduse', enduse); - console.log('ownername', ownername); + // console.log('enduse', enduse); + // console.log('ownername', ownername); this.loanDetailsForm.controls['loan_amount'].setValue(value.records.loan_amount); if(value.records.loan_amount){ this.loanAmtInWords = this._pd.convertNumberToWords(value.records.loan_amount); } @@ -126,18 +142,28 @@ export class LoanDetailsComponent implements OnInit { if (value.records.other_bt_lender) { this.loanDetailsForm.controls['other_bt_lender'].setValue(value.records.other_bt_lender); } - - this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution); - if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); } - - this.loanDetailsForm.controls['source'].setValue(value.records.source); + if(value.records.is_transfer != 'yes'){ + this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution); + if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); } + + this.loanDetailsForm.controls['source'].setValue(value.records.source); + } + if (value.records.lender_name_type) { this.loanDetailsForm.controls['lender_name_type'].setValue(value.records.lender_name_type); } + this.loanDetailsForm.controls['emi_level'].setValue(value.records.emi_level); this.loanDetailsForm.controls['property_type'].setValue(value.records.property_type); + this.propertyType = value.records.property_type; + //console.log(value.records.property_type); + this.mortage_type(value.records.property_type); + //console.log(this.propertyType); + this.loanDetailsForm.controls['property_type_others'].setValue(value.records.property_type_others); this.loanDetailsForm.controls['owner_name'].setValue(ownername); + this.loanDetailsForm.controls['other_owners_name'].setValue(value.records.other_owners_name); this.loanDetailsForm.controls['construction_status'].setValue(value.records.construction_status); + if(value.records.construction_status == 4 ){ this.loanDetailsForm.controls['percentage_of_construction'].setValue(value.records.percentage_of_construction); } @@ -150,6 +176,12 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['loandetails_remarks'].setValue(value.records.loandetails_remarks); } }) + + if(this.productAbbr == 'BL' || this.productAbbr == 'PL' || this.productAbbr == 'LL'){ + this.mortageCardAccess = false; + }else{ + this.mortageCardAccess = true; + } } // ============= @@ -182,9 +214,42 @@ getM_sourceofamount() { // this._pd.getAllMasterDatas('MORTAGEPROPERTYTYPE').subscribe( this._pd.getAllMasterDatas('MORTAGEPROPERTIES').subscribe( data => { - // console.log('sadfdfads',this.productAbbr); - this.m_mortageTypeProperty = data.records.filter(data => data.isactive == 1); - this.m_mortageTypeProperty = data.records.filter(data => data.group_name == this.productAbbr); + + // this.m_mortageTypeProperty = data.records.filter(data => data.isactive == 1); + // this.m_mortageTypeProperty = data.records.filter(data => data.group_name == this.productAbbr); + if(data.dataStatus==true){ + let that = this; + this.m_mortageTypeProperty = data.records.filter( + function(data){ + if(that.productAbbr != "LAP"){ + if(data.group_name == that.productAbbr && data.isactive==1){ + console.log('if data'); + return data; + } + } + else if(that.productAbbr == "LAP"){ + if(data.sub_group_name == that.subProductName && data.isactive==1){ + console.log('else data'); + return data; + } + } + // if(data.isactive==1 && data.group_name != "LAP"){ + // if(data.group_name == that.productAbbr){ + // return data;} + // }else if(data.group_name == "LAP" && data.sub_group_name == that.subProductName){ + // return data; + // }else{ + // return ; + // } + }); + + // console.log(this.m_mortageTypeProperty); + // console.log(this.propertyType); + // this.mortage_type(this.propertyType); + // if(this.propertyType != ''){ + // this.mortage_type(this.propertyType); + // } + } }, error => { // this.notifier.notify('warning', 'No Category Records Found.!'); @@ -227,12 +292,14 @@ getM_sourceofamount() { topup_amount: [''], lender: [''], other_bt_lender : [''], - own_contribution: ['', Validators.compose([Validators.required])], - source: ['', Validators.compose([Validators.required])], + own_contribution: [''], + source: [''], lender_name_type: [''], emi_level: ['', Validators.compose([Validators.required])], property_type: ['', Validators.compose([Validators.required])], + property_type_others:[''], owner_name: ['', Validators.compose([Validators.required])], + other_owners_name :[''], construction_status: ['', Validators.compose([Validators.required])], percentage_of_construction : [''], emv_per_customer: ['', Validators.compose([Validators.required])], @@ -250,6 +317,18 @@ getM_sourceofamount() { }); } ownerNameChange(event) { + let EventValue; + + event.value.forEach(option => { + EventValue = option; + if(EventValue == 'Others'){ + this.OtherOwnerFlag = true; + } + else{ + this.OtherOwnerFlag = false; + } + }); + // this.ownerNames = []; // event.value.forEach(option => { // this.ownerNames.push({owner_name: option}); @@ -282,6 +361,13 @@ getM_sourceofamount() { if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; } + else if(this.loanDetailsForm.controls['is_transfer'].value == 'no') { + records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value; + records.source = this.loanDetailsForm.controls['source'].value; + if (this.loanDetailsForm.controls['source'].value == 'other') { + records.lender_name_type = this.loanDetailsForm.controls['lender_name_type'].value; + } + } if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value; } @@ -292,13 +378,9 @@ getM_sourceofamount() { records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; } - records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value; - records.source = this.loanDetailsForm.controls['source'].value; - if (this.loanDetailsForm.controls['source'].value == 'other') { - records.lender_name_type = this.loanDetailsForm.controls['lender_name_type'].value; - } records.emi_level = this.loanDetailsForm.controls['emi_level'].value; records.property_type = this.loanDetailsForm.controls['property_type'].value; + records.property_type_others = this.loanDetailsForm.controls['property_type_others'].value; // records.owner_name_group = this.ownerNames; // console.log(this.loanDetailsForm.controls['owner_name'].value); let dataOwner_name = []; @@ -306,6 +388,7 @@ getM_sourceofamount() { dataOwner_name.push({owner_name: element}) }); records.owner_name_group = dataOwner_name; + records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value; records.construction_status = this.loanDetailsForm.controls['construction_status'].value; records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value; records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value; @@ -337,10 +420,21 @@ getM_sourceofamount() { this.loanDetailsForm.controls['is_topup'].clearValidators(); this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); // console.log('no',event.value); + this.loanDetailsForm.controls['source'].setValidators([Validators.required]); + this.loanDetailsForm.controls['source'].updateValueAndValidity(); + + this.loanDetailsForm.controls['own_contribution'].setValidators([Validators.required]); + this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); } else if(event.value == 'yes'){ this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); + + this.loanDetailsForm.controls['source'].clearValidators(); + this.loanDetailsForm.controls['source'].updateValueAndValidity(); + + this.loanDetailsForm.controls['own_contribution'].clearValidators(); + this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); // console.log('yes',event.value); } @@ -379,4 +473,22 @@ getM_sourceofamount() { } } + /** + * mortage_type + */ + mortage_type(mortage_value) + { + //console.log(mortage_value); + //let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0]; + let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id == mortage_value)[0]; + // console.log(mortagetypes); + if(mortagetypes.property_name=='Others (Please Specify)'){ + this.mortageAccess = true; + }else{ + this.mortageAccess = false; + } + + + } + } From 70f6310d1ef3c3669c3e831678ccb3a78ef1ac4a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 12 Dec 2018 20:45:16 +0530 Subject: [PATCH 7/7] Address and Financial : ps --- .../forms/address/address.component.html | 68 ++++++- .../forms/address/address.component.ts | 137 ++++++++++++- .../financial-info.component.html | 48 ++++- .../financial-info.component.ts | 185 +++++++++++++++--- 4 files changed, 394 insertions(+), 44 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index edf72fb72..32628e73b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -51,7 +51,7 @@ formControlName="locality_others"> - + {{data.description}} @@ -59,7 +59,7 @@ - + {{data.rating}} @@ -86,11 +86,15 @@ - + - + + + + + Yes @@ -98,18 +102,64 @@ - - + + + + {{m_addressType.address_type}} - - + + - + +
+ + + {{i+1}} . {{PremisesLabel[i]}} + + + + + + + + + + {{CL.name}} + + + + + + + + + {{ownerShip.name}} + + + + + + + + + + + + + + + +
+
- + + - + + - + + + Net Profit + Net Loss + + + + + + - + + + + + + + + + + - + + - + -->