From c9f1f0266b4e2b460cd04e5639d22723495a2bc3 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 1 Nov 2018 10:56:22 +0530 Subject: [PATCH 01/11] Icon Changes In PD screen --- .../list-pd/all-pd/all-pd.component.html | 23 ++++++++++++++++++- .../list-pd/all-pd/all-pd.component.scss | 12 +++++++++- .../list-pd/all-pd/all-pd.component.ts | 2 +- .../completed-pd/completed-pd.component.html | 8 +++++++ .../completed-pd/completed-pd.component.scss | 12 +++++++++- .../completed-pd/completed-pd.component.ts | 2 +- .../inprogress-pd.component.html | 9 +++++++- .../inprogress-pd.component.scss | 12 +++++++++- .../inprogress-pd/inprogress-pd.component.ts | 2 +- .../qc-completed-pd.component.html | 9 +++++++- .../qc-completed-pd.component.scss | 12 +++++++++- .../qc-completed-pd.component.ts | 2 +- .../scheduled-pd/scheduled-pd.component.html | 9 +++++++- .../scheduled-pd/scheduled-pd.component.scss | 12 +++++++++- .../scheduled-pd/scheduled-pd.component.ts | 2 +- .../list-pd/view-pd/view-pd.component.html | 8 +++++-- .../app/session/login/login-component.scss | 1 + .../questions/edit/edit.component.html | 2 +- 18 files changed, 122 insertions(+), 17 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index c90384612..07380fb50 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -1,6 +1,27 @@ - + + + + + + + + + + + + + + + {{details.applicat_details[0].applicant_name}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss index 9e293a473..eaa2718fe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -13,4 +13,14 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} +.pd_circle { + width: 50px !important; + height: 50px; + border-radius: 50%; + font-size: 18px; + color: #ffffff; + line-height: 50px; + text-align: center; + background: red + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 119655690..28ace0589 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -16,7 +16,7 @@ export class AllPdComponent implements OnInit, OnChanges { tabStatus:string="ALL"; public dataLengthTab1: number; public dataSourceTab1 = 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/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 6b1dabefe..be998a087 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -1,6 +1,14 @@ + + + + + + {{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..eaa2718fe 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,14 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} +.pd_circle { + width: 50px !important; + height: 50px; + border-radius: 50%; + font-size: 18px; + color: #ffffff; + line-height: 50px; + text-align: center; + background: red + } \ 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/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..81f2fa52b 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.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..eaa2718fe 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,14 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} +.pd_circle { + width: 50px !important; + height: 50px; + border-radius: 50%; + font-size: 18px; + color: #ffffff; + line-height: 50px; + text-align: center; + background: red + } \ 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/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..79ccd28ad 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.applicat_details[0].applicant_name}}
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..eaa2718fe 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,14 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} +.pd_circle { + width: 50px !important; + height: 50px; + border-radius: 50%; + font-size: 18px; + color: #ffffff; + line-height: 50px; + text-align: center; + background: red + } \ 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..c4aacb045 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.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..eaa2718fe 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,14 @@ } .fontsize{ font-size:14px; -} \ No newline at end of file +} +.pd_circle { + width: 50px !important; + height: 50px; + border-radius: 50%; + font-size: 18px; + color: #ffffff; + line-height: 50px; + text-align: center; + background: red + } \ 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/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 6b9143ef8..cc0931f41 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 @@ -12,8 +12,12 @@ -
- {{master.pd_allocated_to | titlecase}}    +
+ + + person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} {{master.pd_status | titlecase}}  On  {{ (master.updatedon)? (master.updatedon | slice:0:10):(master.updatedon) }} diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss index 4103bf472..dd97db7a8 100644 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -1,4 +1,5 @@ .form-bg { + background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; height: 100vh !important; background-position: center !important; min-height: calc(0vh + 0px) !important; 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 e12eb9c4d..e2372cddf 100644 --- a/ng6-seed/src/app/template/questions/edit/edit.component.html +++ b/ng6-seed/src/app/template/questions/edit/edit.component.html @@ -41,7 +41,7 @@
Active/InActive - +
From 4eac9889542406a1662dee689d2a8a571181ca3f Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 11:45:18 +0530 Subject: [PATCH 02/11] Notifier UI --- .../list-pd/edit-pd-applicant/edit-pd-applicant.component.ts | 2 +- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 2 +- .../manage-pd/list-pd/list-pd.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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..5e8e55e37 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 @@ -127,7 +127,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.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 38a4ed5d8..d0017b2c0 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 @@ -179,7 +179,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/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 From e2212df4d761a48f9eef63199d2d809da2689136 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 14:59:45 +0530 Subject: [PATCH 03/11] date time picker issues changes --- ng6-seed/package.json | 2 +- .../src/app/personal-discussion/manage-pd/manage-pd.module.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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'; From 6eb3de5a6285458be2faf91561d7d4bcd9815b21 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 15:00:45 +0530 Subject: [PATCH 04/11] merge : kms --- .../list-pd/edit-pd-applicant/edit-pd-applicant.component.ts | 2 +- .../list-pd/edit-pd-master/edit-pd-master.component.ts | 2 +- .../manage-pd/list-pd/list-pd.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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..5e8e55e37 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 @@ -127,7 +127,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.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 38a4ed5d8..d0017b2c0 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 @@ -179,7 +179,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/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 From 647fb7f25dea9242364e01bc628f3c6a05cd2e4d Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 15:43:12 +0530 Subject: [PATCH 05/11] Map Pd Card --- .../map-pd-view/map-pd-view.component.html | 61 +++++++++++-------- .../map-pd-view/map-pd-view.component.ts | 4 ++ 2 files changed, 40 insertions(+), 25 deletions(-) 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 From 892728d4b99d93a13ef4685d288eedba942bb14f Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Thu, 1 Nov 2018 16:16:47 +0530 Subject: [PATCH 06/11] QC Completed UI --- .../list-pd/all-pd/all-pd.component.html | 27 ++++++------------- .../qc-completed-pd.component.html | 4 +-- .../list-pd/start-pd/start-pd.component.html | 2 +- .../list-pd/view-pd/view-pd.component.html | 4 +-- .../qc-list/qc-start/qc-start.component.html | 2 +- .../qc-list/qc-view/qc-view.component.html | 5 ++-- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 07380fb50..36f9c405b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -3,23 +3,9 @@ - - - - - - - - - - + @@ -43,9 +29,12 @@ - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + {{details.pd_status}} + QC COMPLETED
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{details.scheduled_on}} 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 79ccd28ad..db5b97a42 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 @@ -29,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/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 5c135271d..0d66e14f8 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 @@ -19,8 +19,8 @@ person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - + {{master.pd_status | titlecase}} + QC Completed
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..90c7bd59b 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 + From f9f29b6a773a7a294933d506c85e2d8aa8332027 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 1 Nov 2018 17:38:36 +0530 Subject: [PATCH 07/11] ICON changes in pd screen and login images Changes : ps --- .../list-pd/all-pd/all-pd.component.html | 8 ++- .../list-pd/all-pd/all-pd.component.scss | 42 +++++++++++--- .../completed-pd/completed-pd.component.html | 6 +- .../completed-pd/completed-pd.component.scss | 53 +++++++++++++++--- .../inprogress-pd.component.html | 6 +- .../inprogress-pd.component.scss | 41 +++++++++++--- .../qc-completed-pd.component.html | 6 +- .../qc-completed-pd.component.scss | 41 +++++++++++--- .../scheduled-pd/scheduled-pd.component.html | 6 +- .../scheduled-pd/scheduled-pd.component.scss | 32 ++++++++--- .../list-pd/view-pd/view-pd.component.html | 2 +- .../app/session/login/login-component.scss | 23 +++++++- ng6-seed/src/assets/images/bg.png | Bin 0 -> 1315 bytes .../assets/images/{login.jpg => login_n.jpg} | Bin 14 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 ng6-seed/src/assets/images/bg.png rename ng6-seed/src/assets/images/{login.jpg => login_n.jpg} (100%) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 07380fb50..e02e7d359 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -2,15 +2,17 @@ - + - + +
{{(details.pd_type_name | slice:0:1)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss index eaa2718fe..41ca2a034 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -14,13 +14,39 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .pd_circle { +// border: 5px red !important; +// width: 50px; +// height: 50px; +// border-radius: 50px !important; +// // font-size: 18px; +// // color: red; +// // line-height: 50px; +// // text-align: center; +// background: #fff; +// } +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index be998a087..86e8b7e0e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -2,11 +2,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 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 eaa2718fe..f7963f6f7 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 @@ -14,13 +14,50 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .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; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 81f2fa52b..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,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 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 eaa2718fe..67347bd56 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 @@ -14,13 +14,38 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .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; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 79ccd28ad..52a57a3ec 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,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 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 eaa2718fe..67347bd56 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 @@ -14,13 +14,38 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .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; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index c4aacb045..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,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 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 eaa2718fe..c7faca5e9 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 @@ -14,13 +14,29 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; + +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.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/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 5c135271d..7fbec37ae 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 @@ -19,7 +19,7 @@ person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} + {{master.pd_status | titlecase}} diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss index dd97db7a8..bbb8c363d 100644 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -1,14 +1,33 @@ .form-bg { - background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; +// 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 #E31F26; 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: #E31F26; +} h3, .page-footer{ - color:red; + color:#E31F26; + background-color:#ffffff; font-weight: bold; } .bottom-sec,.mat-green{ diff --git a/ng6-seed/src/assets/images/bg.png b/ng6-seed/src/assets/images/bg.png new file mode 100644 index 0000000000000000000000000000000000000000..6c8827466ae6af2f8fab6c9991d4699b9136dcff GIT binary patch literal 1315 zcmai!TWAzl7{{k3RI$~H?Tf9E=>(s2XU@#toMXl%?(FJ9C&bM{@(`@EGiNu`-I+7a zoV_GekrpW$XdX%xF$CWPLEAt|p|J`=l+u>ISXv^jV6n9jV=vHBuRXKLt`@R%Ue1Nz z_y2C^n`8Zbd)BRebuGg%>oR-QEM1>tm{oVztfISub80=uWnmCWx zjI9?@7U|~b!7oq`!*txXazkWDdjlHS=JkN#>$Xd+8Kx&ucXgwL2%ASm%Tc&{vzIy6 zG8JwxssYVSq7iHFn1=?&`f|ot$&gJhv5W1gLn>e+qO*0o?D(**a1C8Z_rbNmu?>Wj z6mBV~A+4WHVh^!V9)t`K18hv>#c(7Zk8fusAOZnMf+&T=I1Eb=0CxG~s5j3nz^s~H z_C-$$H$sRD1))}}@wG6Iy`mt>vK(kgQiu{Ef7Bs*J>>Y^O$8PChG)6N!VViK>Umrt z3P&SdO2KwpvW~x8CR#9|uDgQBgCL~_Xc{fft$5{zbJGw|8QI7oK4rxgORJ=5Eqp~; z+iuZ5$)cyZtw{U1Q5OkWqjZ~c=g`>5PhQJP5_?#p{5x|JN4MbrWETI}Ut-|PvXc$If|3PWvO`Yif3!4Tk zV9(ZR^{wEo3a(RZc+)hPaeSgX2Fj=kM-$^M%Y?hrVOdNADH2J?L@^cJ5lyA!xD0xw zxRi{^Qqxw&MkVM$)7E@y8*XbGyyl=wP(_|qMP}N=Hrwa~wA#l4+UhOan(bo|+u8~= z7$JC@&%D*<6&-+J+nPLjXw5Ei=)ih(G6xcK!*r^zXVl(YeSRU=yRqZ-HSbQ%KS_M@ z(wRze_~?e2v-^7h+};`Mocn4E=Pi6cZCra?{NwPY3$t(i{p)uN@W##`9u~Z7GY{Tg zyuN9=YvN#MatJGCzKD=Dq#1SH>?Mc-Z&mkBKM7*TOf(@SvZ+dH>?)eD(aT z_rKjTi6-;qxvnq&{HJv2_e-mVgNrBrn!Z)Kv%Yft{`p$xp;L?dUVHI{%9$g#A53gc zIpWk^=H{o5;=i1n{BSC~tNL3}0gv3xv291=&x_=<(?5N1uX^sr1k=G(yFZ?P{PNG^ P!EY;*>QgW5KJd=J>h8PR literal 0 HcmV?d00001 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 From f4f8caccfb20cd5b4380562d50444d1b12e5efb7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 17:43:04 +0530 Subject: [PATCH 08/11] pd remarks changes --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 3 +++ .../manage-pd/list-pd/add-pd/add-pd.component.ts | 2 ++ .../edit-pd-applicant.component.ts | 1 + .../edit-pd-master/edit-pd-master.component.html | 14 ++++++++++++++ .../edit-pd-master/edit-pd-master.component.ts | 1 + .../smart-pd-allocation.component.ts | 2 +- 6 files changed, 22 insertions(+), 1 deletion(-) 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 @@ + + + + + + @@ -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 d0017b2c0..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; 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 => { From 4c3e27f01e55efd57535db372ebdfc5994c0a4e6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 1 Nov 2018 17:44:03 +0530 Subject: [PATCH 09/11] merge : kms --- .../list-pd/all-pd/all-pd.component.html | 27 +++----- .../map-pd-view/map-pd-view.component.html | 61 +++++++++++-------- .../map-pd-view/map-pd-view.component.ts | 4 ++ .../qc-completed-pd.component.html | 4 +- .../list-pd/start-pd/start-pd.component.html | 2 +- .../list-pd/view-pd/view-pd.component.html | 4 +- .../qc-list/qc-start/qc-start.component.html | 2 +- .../qc-list/qc-view/qc-view.component.html | 5 +- 8 files changed, 57 insertions(+), 52 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 07380fb50..36f9c405b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -3,23 +3,9 @@ - - - - - - - - - - + @@ -43,9 +29,12 @@ - {{details.pd_status}}
- {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} - + {{details.pd_status}} + QC COMPLETED
+ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + + {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} + {{details.scheduled_on}} 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 79ccd28ad..db5b97a42 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 @@ -29,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/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 5c135271d..0d66e14f8 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 @@ -19,8 +19,8 @@ person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - + {{master.pd_status | titlecase}} + QC Completed 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..90c7bd59b 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 + From 0c256131d4ff4c8041266e111210e3299a0709fe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 2 Nov 2018 13:16:50 +0530 Subject: [PATCH 10/11] css Changes : ps --- ng6-seed/package-lock.json | 19 +++-------------- .../app/dashboard/dashboard.component.scss | 2 +- .../list-pd/all-pd/all-pd.component.scss | 6 +++--- .../completed-pd/completed-pd.component.scss | 6 +++--- .../inprogress-pd.component.scss | 6 +++--- .../qc-completed-pd.component.scss | 6 +++--- .../scheduled-pd/scheduled-pd.component.scss | 6 +++--- .../app/session/login/login-component.html | 21 ++++++++++--------- .../app/session/login/login-component.scss | 6 +++--- ng6-seed/src/index.html | 3 ++- 10 files changed, 35 insertions(+), 46 deletions(-) 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/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/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss index 41ca2a034..2d0c755e6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -31,12 +31,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; 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 f7963f6f7..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 @@ -42,12 +42,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; 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 67347bd56..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 @@ -30,12 +30,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; 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 67347bd56..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 @@ -30,12 +30,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; 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 c7faca5e9..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 @@ -21,12 +21,12 @@ color: #ffffff; margin-top:4px; margin-bottom:4px; - width: 60px; - height: 60px; + width: 95px; + height: 95px; justify-content:center; text-align: center; border-radius: 50%; - line-height: 60px; + line-height: 95px; } .fullPD{ background:#009688; 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 bbb8c363d..c82aba065 100644 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -2,7 +2,7 @@ // 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 #E31F26; + background: url(../../../assets/images/bg.png) repeat-x 0 0 #E00201; height: 100vh !important; background-position: center !important; min-height: calc(0vh + 0px) !important; @@ -23,10 +23,10 @@ background-color: rgba(0, 0, 0, 0) !important; } .form-bg::after{ - background-color: #E31F26; + background-color: #E00201; } h3, .page-footer{ - color:#E31F26; + color:#E00201; background-color:#ffffff; font-weight: bold; } 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; } - + + From 824b0e790798dfd06be589173ad02294dc300ce3 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 2 Nov 2018 15:47:51 +0530 Subject: [PATCH 11/11] PD History --- .../list-pd/view-pd/view-pd.component.html | 261 +++++++++--------- .../qc-list/qc-view/qc-view.component.html | 4 +- 2 files changed, 132 insertions(+), 133 deletions(-) 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 8cb9256dd..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,138 +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 +
+ +
+ +
+ +
+ + +
+ + - - - - -
- - - person{{master.pd_allocated_to | titlecase}}    - {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} - QC Completed +
+ + +  {{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/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 90c7bd59b..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 @@ -113,9 +113,9 @@ - + - {{masterHistory}} + {{master.time}}       {{master.user}}
{{master.log}}