diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 179ae916f..6c56cb46a 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -7188,22 +7188,9 @@ "dev": true }, "ng-pick-datetime": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/ng-pick-datetime/-/ng-pick-datetime-5.2.6.tgz", - "integrity": "sha512-5vXK+qCKn2Jn1GvcZTd7bYkkiNIrpEk147l/wSRlgitZHIiswsNCNfceNCSvZvgrQL2WncNvGKzDX8zM4sXu3Q==", - "requires": { - "@angular/cdk": "^5.2.0" - }, - "dependencies": { - "@angular/cdk": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.2.5.tgz", - "integrity": "sha512-GN8m1d+VcCE9+Bgwv06Y8YJKyZ0i9ZIq2ZPBcJYt+KVgnVVRg4JkyUNxud07LNsvzOX22DquHqmIZiC4hAG7Ag==", - "requires": { - "tslib": "^1.7.1" - } - } - } + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/ng-pick-datetime/-/ng-pick-datetime-6.0.16.tgz", + "integrity": "sha512-96rHNg+tGXmzJHvGoH2O8dF+MF7N4rKIehsi8Px3IZUOZM4qA6PE1w8SQzDvHQTIp/1NpiICvmt6BZK5IaDsFg==" }, "ng2-charts": { "version": "1.6.0", diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 388efbf41..e375efb12 100644 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -45,7 +45,7 @@ "karma-jasmine": "^1.1.1", "leaflet": "^1.0.2", "moment": "^2.15.0", - "ng-pick-datetime": "^5.2.6", + "ng-pick-datetime": "^6.0.16", "ng2-charts": "1.6.0", "ng2-dragula": "1.3.1", "ng2-file-upload": "1.2.1", diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index f13f963e8..02efbd61c 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -3,7 +3,7 @@ $blue: #05abe0; $grey: #343434; $p: 12px; mat-card-title{ - background-color:#f44336 !important; + background-color:#E00201 !important; color:#fff; padding-bottom: 1rem; margin-bottom: 0px; 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 2685bc62a..1ce374670 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 @@ -125,6 +125,9 @@ + + + +
{{(details.pd_type_name | slice:0:1)}}
+ + {{details.applicat_details[0].applicant_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss index 9e293a473..da56e3a1e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss @@ -13,4 +13,51 @@ } .fontsize{ font-size:14px; +} +// .pd_circle { +// width: 60px !important; +// height: 60px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// text-align: center; +// background: red +// } +// .FullPD-Class{ +// background:lightcoral; +// border: 2px lightcoral; +// } +// .SmartPD-Class{ +// background:thistle; +// border: 2px thistle; +// } +// .TelePD-Class{ +// background:lawngreen; +// border: 2px lawngreen; +// } + +.commonPDType{ + display:flex; + justify-content:flex-end; + color: #ffffff; + margin-top:4px; + margin-bottom:4px; + width: 95px; + height: 95px; + justify-content:center; + text-align: center; + border-radius: 50%; + line-height: 95px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index c798070d3..9111f5670 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -16,7 +16,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { tabStatus:string="COMPLETED"; public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); - displayedColumns = ['Name','Lenderid','Address','Status','Action']; + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; 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 c40b7d2cf..ffe2fb5c9 100644 --- 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 @@ -97,6 +97,7 @@ export class EditPdApplicantComponent implements OnInit { } } + get pdMainApplicant() { return this._EditApplicantForm.controls; } get pdCoApplicant() { return this._EditApplicantForm.get('coApplicantItems') as FormArray; } updatePdApplicant(formValue: any) { @@ -127,7 +128,7 @@ export class EditPdApplicantComponent implements OnInit { this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'Applicants updated..'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { 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 c148ee174..e96ea82ac 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 @@ -117,6 +117,9 @@ + + + @@ -134,3 +137,14 @@ + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 38a4ed5d8..cbce48097 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -133,6 +133,7 @@ export class EditPdMasterComponent implements OnInit { fk_city: [this.data.records.fk_city], fk_state: [this.data.records.fk_state],   pincode : [this.data.records.pincode], + remarks: [this.data.records.remarks], }); if(this.data.records.fk_lender_id && this.data.records.fk_product_id && this.data.records.fk_subproduct_id && this.data.records.fk_pd_type && this.data.records.fk_customer_segment && this.data.records.loan_amount && this.data.records.addressline1 && this.data.records.fk_city && this.data.records.fk_state && this.data.records.pincode){ this.enablePDButton=true; @@ -179,7 +180,7 @@ export class EditPdMasterComponent implements OnInit { Object.keys(my_array).forEach((key) => ( my_array[key] == null) && delete my_array[key]); this._pd.editPdMasterDetails(my_array, updateStatus).subscribe(result => { if (result.status == 200) { - this.notifier.notify('success', 'PD Master Updated.'); + this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close(); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 4487795cc..ef0a6b08f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -1,6 +1,13 @@ - + + + +
{{(details.pd_type_name | slice:0:1)}}
+ + {{details.applicat_details[0].applicant_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss index 9e293a473..5f4ab542d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss @@ -13,4 +13,39 @@ } .fontsize{ font-size:14px; +} +// .pd_circle { +// width: 50px !important; +// height: 50px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// line-height: 50px; +// text-align: center; +// background: red +// } +.commonPDType{ + display:flex; + justify-content:flex-end; + color: #ffffff; + margin-top:4px; + margin-bottom:4px; + width: 95px; + height: 95px; + justify-content:center; + text-align: center; + border-radius: 50%; + line-height: 95px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index af3a5df20..e58bf5688 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -14,7 +14,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { tabStatus:string="INPROGRESS"; public dataLengthTab2: number; public dataSourceTab2 = new MatTableDataSource(); - displayedColumns = ['Name','Lenderid','Address','Status','Action']; + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index 405e0fb14..c3d34c300 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -34,7 +34,7 @@ - done_all QC_Completed + done_all QC Completed 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 30d6932eb..6db4829c2 100644 --- 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 @@ -10,43 +10,51 @@
- +
+
- PD Details + PD Details
- +
+
+ + - -
-
- {{details.applicat_details[0].applicant_name}}
- {{details.lender_full_name}}({{details.lender_applicant_id}})
-
-
- - -
-
- - - -  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
- {{details.customer_segment_abbr}} {{details.loan_amount}}
- {{details.pd_date_of_initiation}}
- {{details.pd_status}} - {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - - - + +
+
+ {{details.applicat_details[0].applicant_name}} ({{details.customer_segment_abbr}})
+ {{details.lender_full_name}} ({{details.lender_applicant_id}})
+
+
+ + +
+
+ + + +  {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
+ + {{details.pd_date_of_initiation}} - + {{details.pd_status}} + + + +
+ +
+

No Record Found ...

@@ -70,6 +78,9 @@
+
+ II Full   II Smart +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts index 42fd05aae..226c149a2 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts @@ -46,7 +46,11 @@ pdList:any[] = []; "COMPLETED" :'COMPLETED', "QC_COMPLETED" :'QC_COMPLETED', }; + public getColor(type: number): string{ + return type == 1 ? "#009688" : "#673ab7" ; + } + constructor(notifier:NotifierService,private route: ActivatedRoute, private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) { this.notifier=notifier diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 785c6309b..e11883010 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -1,6 +1,13 @@ - + + + +
{{(details.pd_type_name | slice:0:1)}}
+ + {{details.applicat_details[0].applicant_name}}
@@ -22,8 +29,8 @@ - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + QC COMPLETED
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss index 9e293a473..5f4ab542d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss @@ -13,4 +13,39 @@ } .fontsize{ font-size:14px; +} +// .pd_circle { +// width: 50px !important; +// height: 50px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// line-height: 50px; +// text-align: center; +// background: red +// } +.commonPDType{ + display:flex; + justify-content:flex-end; + color: #ffffff; + margin-top:4px; + margin-bottom:4px; + width: 95px; + height: 95px; + justify-content:center; + text-align: center; + border-radius: 50%; + line-height: 95px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index cec61a7ba..360ca9a6f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -16,7 +16,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { tabStatus:string="QC_COMPLETED"; public dataLengthTab5: number; public dataSourceTab5 = new MatTableDataSource(); - displayedColumns = ['Name','Lenderid','Address','Status','Action']; + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index f8177653a..6f5fdaf0f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -1,6 +1,13 @@ - + + + +
{{(details.pd_type_name | slice:0:1)}}
+ + {{details.applicat_details[0].applicant_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss index 9e293a473..ed717c562 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss @@ -13,4 +13,30 @@ } .fontsize{ font-size:14px; +} + +.commonPDType{ + display:flex; + justify-content:flex-end; + color: #ffffff; + margin-top:4px; + margin-bottom:4px; + width: 95px; + height: 95px; + justify-content:center; + text-align: center; + border-radius: 50%; + line-height: 95px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 3e6ba6097..d6c030214 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -14,7 +14,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { tabStatus:string="SCHEDULED"; public dataLengthTab3: number; public dataSourceTab3 = new MatTableDataSource(); - displayedColumns = ['Name','Lenderid','Address','Status','Action']; + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts index aaa50062e..2f5f0a433 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts @@ -98,7 +98,7 @@ export class SmartPdAllocationComponent implements OnInit { let updateData = { "pd_id":this.data.pd_id, "fk_pd_allocated_to":pdOfficer.fk_user_id, - "excutive_id":excutiveOfficer.fk_user_id, + "executive_id":excutiveOfficer.fk_user_id, } this._pd.updatePdOfficer(updateData).subscribe( result => { 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 17ac0ee26..86135e42d 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 @@ -2,7 +2,7 @@ - + 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 4f0dd61f1..00b3d4d69 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 @@ -1,133 +1,137 @@ - - -
-
-
-

{{master.lender_full_name}} - {{master.lender_applicant_id}}

- {{master.pd_date_of_initiation}} -
-
+ + +
+
+
+

{{master.lender_full_name}} - {{master.lender_applicant_id}}

+ {{master.pd_date_of_initiation}} +
+
+ + + + + +
+ + + person{{master.pd_allocated_to | titlecase}}    + {{master.pd_status | titlecase}}  On {{master.scheduled_on}} + {{master.pd_status | titlecase}} + QC Completed +
+ +
+ +
+ +
+ + +
+ + - - - - -
- {{master.pd_allocated_to | titlecase}}    - {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} +
+ + +  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} + + + +

{{master.product_name}} / {{master.subproduct_name}}

+

{{master.pd_type_name}} /  {{master.loan_amount}}

+

{{master.addressline1}} , {{master.addressline2}} , {{master.addressline3}}

+ + + + +
+
+ + +
+ +
+ + Applicants + -
- -
- -
- -
- - -
- - - -
- - -  {{master.city_name}} / {{master.state_name}}-{{master.pincode}} - - - -

{{master.product_name}} / {{master.subproduct_name}}

-

{{master.pd_type_name}} /  {{master.loan_amount}}

-

{{master.addressline1}} , {{master.addressline2}} , {{master.addressline3}}

- + + + +

+ +  {{applicant.applicant_name}}     + +  {{applicant.mobile_no}}
Main Applicant +    {{applicant.relation_name}} +

+ + + +

No Applicant

 + +
+ +
+ + + + +
Documents
+ + + + +

{{documents.pd_document_title}}

+ + + + + + +

No Document

 - - -
-
- - -
- -
- - Applicants - + +
+
+ + + + +
PD History
+ + + + + + {{master.time}}       {{master.user}}
{{master.log}} - - - -

- -  {{applicant.applicant_name}}     - -  {{applicant.mobile_no}}
Main Applicant -    {{applicant.relation_name}} -

- - - -

No Applicant

 - -
- -
- - - - -
Documents
- - - - -

{{documents.pd_document_title}}

- - - - - - -

No Document

 - - -
-
- - - - -
PD History
- - - - - - {{masterHistory}} - - - - - - + - - -

No History

 - - + -
-
- -
- - - - + + + + +

No History

 + + + +
+
+ +
+ + + + 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 1ecb91ae6..a43a376a3 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 @@ -19,6 +19,8 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import 'hammerjs'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime'; + import { AgmCoreModule } from '@agm/core'; import { ManagePdRoutingModule } from './manage-pd.routing'; import { ListPdComponent } from './list-pd/list-pd.component'; @@ -30,7 +32,6 @@ import { PdAllocationComponent } from '../manage-pd/list-pd/pd-allocation/pd-all import { SmartPdAllocationComponent } from './list-pd/smart-pd-allocation/smart-pd-allocation.component'; import { PdTrigerService } from '../pd-service/pd-triger.service'; import { GetGeometricLocationService } from '../location-service/get-geometric-location.service'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime'; import { SchedulePdComponent } from './list-pd/schedule-pd/schedule-pd.component'; import { EditPdApplicantComponent } from './list-pd/edit-pd-applicant/edit-pd-applicant.component'; import { EditPdMasterComponent } from './list-pd/edit-pd-master/edit-pd-master.component'; 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 b9e6c908d..7ea892711 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 @@ -2,7 +2,7 @@ - + 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 14f062c2e..943abcf9c 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 @@ -14,8 +14,9 @@
{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - + {{master.pd_status | titlecase}} + QC Completed + @@ -112,9 +113,9 @@ - + - {{masterHistory}} + {{master.time}}       {{master.user}}
{{master.log}} diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 1d73fff24..61229ce5e 100644 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -33,18 +33,19 @@
- info@sineedge.com | +91-11-223333333 + info@sineedge.com | +91 9910112704 / +91 987104039
- + + \ No newline at end of file diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss index 4103bf472..c82aba065 100644 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -1,13 +1,33 @@ .form-bg { +// background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; +//background-image: url(../../../assets/images/login_o.jpg); + //background-color: #F44336; + background: url(../../../assets/images/bg.png) repeat-x 0 0 #E00201; height: 100vh !important; background-position: center !important; min-height: calc(0vh + 0px) !important; } +.signin-page{ + float: left; + width: 100%; + + padding-bottom: 40px; +} +// .form-bg { +// float: left; +// width: 100%; +// background-color: repeat-x 0 0 #F44336; +// padding-bottom: 40px; +// } .form-bg::before { background-color: rgba(0, 0, 0, 0) !important; } +.form-bg::after{ + background-color: #E00201; +} h3, .page-footer{ - color:red; + color:#E00201; + background-color:#ffffff; font-weight: bold; } .bottom-sec,.mat-green{ diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html index 9cff1014f..d68696cd4 100644 --- a/ng6-seed/src/app/template/questions/edit/edit.component.html +++ b/ng6-seed/src/app/template/questions/edit/edit.component.html @@ -39,9 +39,11 @@
+ +
diff --git a/ng6-seed/src/assets/images/bg.png b/ng6-seed/src/assets/images/bg.png new file mode 100644 index 000000000..6c8827466 Binary files /dev/null and b/ng6-seed/src/assets/images/bg.png differ diff --git a/ng6-seed/src/assets/images/login.jpg b/ng6-seed/src/assets/images/login_n.jpg similarity index 100% rename from ng6-seed/src/assets/images/login.jpg rename to ng6-seed/src/assets/images/login_n.jpg diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html index 175e6e180..51b54d9ba 100644 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -139,7 +139,8 @@ color:#000 !important; } - + +