From 215de92b412eee6f0a0f82dccfd20a0d5a1c1b1a Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Mon, 5 Nov 2018 12:19:23 +0530 Subject: [PATCH 1/3] save pd form service details check : kdk --- .../pd-service/pd-triger.service.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index a9e41f2d6..213e638bd 100644 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -197,6 +197,19 @@ getPDFormDetailsWithID(pdID, formID ):Observable { ) } + // save Pd form details + savePDFormDetailsWithID(saveData: any): Observable { + saveData.fk_createdby = this._aws.getlocale(); + saveData.fk_createdon = currentdate; + // saveData[0].fk_updatedby = this._aws.getlocale(); + // saveData[0].updatedon = currentdate; + + return this._http.post(this.apiUrl+"savePDFormDetails",{"records":saveData}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } + // save pd answers savePDQuestions(saveData: any): Observable { saveData.createdby = this._aws.getlocale(); From 73da3b4efd46686e1a1e5203294e1c91d09bcd92 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Mon, 5 Nov 2018 15:46:31 +0530 Subject: [PATCH 2/3] Templates UI --- .../questions/list/list.component.html | 7 ++- .../templates.list.component.html | 48 ++++++------------- .../templates.list.component.scss | 4 +- .../templates.list.component.ts | 12 ++++- 4 files changed, 29 insertions(+), 42 deletions(-) diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html index fd7fe1a92..ac0ed4c45 100644 --- a/ng6-seed/src/app/template/questions/list/list.component.html +++ b/ng6-seed/src/app/template/questions/list/list.component.html @@ -47,11 +47,10 @@ -
- - -
+ - -
- + + + @@ -33,7 +33,7 @@
- {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} ,
 + {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} ,
@@ -45,38 +45,18 @@ - - -
- - + + + + +
No Record Found ...
- -
- - -
+ + + diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss index a0999becd..00579aa03 100644 --- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss +++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss @@ -25,8 +25,8 @@ overflow: hidden; // white-space: nowrap; display: -webkit-box; - line-height: 16px; /* fallback */ - max-height: 32px; /* fallback */ + line-height: 15px; /* fallback */ + max-height: 44px; /* fallback */ -webkit-line-clamp: 2; /* number of lines to show */ -webkit-box-orient: vertical; diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts index c72aaf2e2..34122c711 100644 --- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts +++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts @@ -20,12 +20,13 @@ import { TemplatesAddComponent } from './templates-add/templates-add.component'; }) export class TemplateListComponent implements OnInit, OnDestroy { - public templateList = []; + public templateList: any[] = []; public listView: boolean; public names: string; public noTemplMasterRecrdFound: boolean = false; public search_cid : any; + // pagination variable details length = 50; pageIndex = 0; @@ -55,6 +56,10 @@ export class TemplateListComponent implements OnInit, OnDestroy { this.getTemplateMastersListDetails(); } + ngAfterViewInit() { + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } // get question master list details getTemplateMastersListDetails() { @@ -123,7 +128,10 @@ export class TemplateListComponent implements OnInit, OnDestroy { //Called once, before the instance is destroyed. //Add 'implements OnDestroy' to the class. } - + // padination page event call + pageChange(e) { + console.log(e); + } public m_templateList = { "dataStatus": true, From 53c5f08cd82adb78debaf93133272149df589925 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Mon, 5 Nov 2018 16:15:41 +0530 Subject: [PATCH 3/3] entity UI --- .../entity-list/entity.list.component.html | 45 +++---------------- .../entity-list/entity.list.component.ts | 4 +- 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index c6ce4f330..d1e73369d 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -34,54 +34,23 @@ - - + - - +
No Record Found ...
-
- - -
+ diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts index 5a2243c77..6e3aa81c9 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts @@ -36,14 +36,14 @@ export class EntityListComponent implements OnInit { // pagination variable details length = 50; pageIndex = 0; - pageSize = 10; + pageSize = 10; pageEvent: PageEvent; // data source variable details questionListData = null; public dataLength: number; public dataSource = new MatTableDataSource(); - displayedColumns = ['categroy_name', 'question', 'actions']; + displayedColumns = ['entity_name', 'name','contact', 'actions']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort;