Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge : kms

Browse Source
This commit is contained in:
gandhimathi 2018-11-05 16:37:52 +05:30
parent bf2ed84d30
commit 99896dcb8e
7 changed files with 51 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
View File

@ -197,6 +197,19 @@ getPDFormDetailsWithID(pdID, formID ):Observable<any> {
) )
} }
// save Pd form details
savePDFormDetailsWithID(saveData: any): Observable<any> {
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<any>(this.apiUrl+"savePDFormDetails",{"records":saveData})
.pipe(
catchError(this.handleError('operation', []))
)
}
// save pd answers // save pd answers
savePDQuestions(saveData: any): Observable<any> { savePDQuestions(saveData: any): Observable<any> {
saveData.createdby = this._aws.getlocale(); saveData.createdby = this._aws.getlocale();

43
ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
View File

@ -35,53 +35,22 @@
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
</mat-row> </mat-row>
</mat-table> </mat-table>
</ng-container> </ng-container>
<div *ngIf="!noQuesMasterRecrdFound">
<mat-paginator [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>
</div>
</mat-card-content> </mat-card-content>
<!----<ng-container *ngIf="enityList.length > 0">
<div style="padding: 0 12px;">
<mat-card class="product-card" *ngFor="let product of dataSource.connect() | async">
<div fxLayout="row" fxLayoutAlign="start start">
<div fxFlex="90%" style="padding-top: 10px;">
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="10%">
{{ product.entity_name }}
</div>
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="40%">
<div> {{ product.full_name }} ({{product.short_name}})</div>
<div> {{ product.branch_name }} </div>
<div> {{product.city_name}}<span *ngIf="product.state_name">,</span> {{product.state_name}} </div>
</div>
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%">
<div> {{ product.phone_number }}</div>
<div> {{ product.official_email }}</div>
</div>
</div>
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<div fxFlex="0 1 auto" class="ml-xs">
</div>
</div>
</div>
<div fxFlex="10%">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editEntity(product)"><mat-icon>edit</mat-icon></button>
</div>
</div>
</mat-card>
</div>
</ng-container>-->
<mat-card *ngIf="noQuesMasterRecrdFound"> <mat-card *ngIf="noQuesMasterRecrdFound">
<mat-card-content> <mat-card-content>
<div class="no-record-found">No Record Found ... </div> <div class="no-record-found">No Record Found ... </div>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<div *ngIf="enityList.length > 0">
<mat-paginator [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>
</div>
</mat-card> </mat-card>
</div> </div>

2
ng6-seed/src/app/settings/entity/entity-list/entity.list.component.ts
View File

@ -43,7 +43,7 @@ export class EntityListComponent implements OnInit {
questionListData = null; questionListData = null;
public dataLength: number; public dataLength: number;
public dataSource = new MatTableDataSource(); public dataSource = new MatTableDataSource();
displayedColumns = ['categroy_name', 'question', 'actions']; displayedColumns = ['entity_name', 'name','contact', 'actions'];
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;

5
ng6-seed/src/app/template/questions/list/list.component.html
View File

@ -47,11 +47,10 @@
</mat-row> </mat-row>
</mat-table> </mat-table>
</ng-container> </ng-container>
<div *ngIf="productList.length > 0">
<mat-paginator [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize" <mat-paginator #paginator [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons> [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator> </mat-paginator>
</div>
<!---- <ng-container *ngIf="productList.length > 0"> <!---- <ng-container *ngIf="productList.length > 0">

46
ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
View File

@ -21,9 +21,9 @@
<!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add Questions</button>--> <!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add Questions</button>-->
</div> </div>
</div> </div>
<ng-container *ngIf="templateList.length > 0"> <mat-card-content>
<div style="padding: 0 12px;"> <ng-container >
<mat-table [dataSource]="dataSource" > <mat-table [dataSource]="dataSource" *ngIf="templateList.length > 0" >
<ng-container matColumnDef="template_name"> <ng-container matColumnDef="template_name">
<mat-cell fxFlex="25%" *matCellDef="let template;"> <mat-cell fxFlex="25%" *matCellDef="let template;">
@ -33,7 +33,7 @@
<ng-container matColumnDef="lender_details"> <ng-container matColumnDef="lender_details">
<mat-cell fxFlex="65%" *matCellDef="let template;"> <mat-cell fxFlex="65%" *matCellDef="let template;">
<div *ngIf="template.lender_details.length > 0" class="text-line-limit"> <div *ngIf="template.lender_details.length > 0" class="text-line-limit">
<span *ngFor="let lender of template.lender_details ; let last = last" > {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <i *ngIf="!last">,<br></i></span> <span *ngFor="let lender of template.lender_details ; let last = last" > {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <span *ngIf="!last">,<br><br></span></span>
</div> </div>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
@ -45,38 +45,18 @@
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;"> <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
</mat-row> </mat-row>
</mat-table> </mat-table>
<!----<mat-card class="product-card" *ngFor="let template of dataSource.connect() | async">
<div fxLayout="row" fxLayoutAlign="start start" style="padding: 6px 2px;">
<div fxFlex="90%" style="padding: 12px 8px;">
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="start center">
<div class="ml-xs" fxFlex="20%">
<span> {{ template.template_name }}</span>
</div>
<div class="ml-xs" fxFlex="80%">
<div *ngIf="template.lender_details.length > 0">
<span *ngFor="let lender of template.lender_details ; let last = last"> {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <i *ngIf="!last">,<br></i></span>
</div>
</div>
</div>
</div>
<div fxFlex="10%">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="goToEdit(template.template_id)"><mat-icon>edit</mat-icon></button>
</div>
</div>
</mat-card>-->
</div>
</ng-container> </ng-container>
<mat-card *ngIf="noQuesMasterRecrdFound">
<div class="no-record-found">No Record Found ... </div> <mat-paginator [length]="templateList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
</mat-card>
<div *ngIf="templateList.length > 0">
<mat-paginator #paginator class="mat-elevation-z1" [length]="templateList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons> [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator> </mat-paginator>
</div>
<mat-card *ngIf="noTemplMasterRecrdFound">
<mat-card-content>
<div class="no-record-found">No Record Found ... </div>
</mat-card-content>
</mat-card>
</mat-card-content>
</mat-card> </mat-card>
</div> </div>

4
ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss
View File

@ -25,8 +25,8 @@
overflow: hidden; overflow: hidden;
// white-space: nowrap; // white-space: nowrap;
display: -webkit-box; display: -webkit-box;
line-height: 16px; /* fallback */ line-height: 15px; /* fallback */
max-height: 32px; /* fallback */ max-height: 44px; /* fallback */
-webkit-line-clamp: 2; /* number of lines to show */ -webkit-line-clamp: 2; /* number of lines to show */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;

12
ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts
View File

@ -20,12 +20,13 @@ import { TemplatesAddComponent } from './templates-add/templates-add.component';
}) })
export class TemplateListComponent implements OnInit, OnDestroy { export class TemplateListComponent implements OnInit, OnDestroy {
public templateList = []; public templateList: any[] = [];
public listView: boolean; public listView: boolean;
public names: string; public names: string;
public noTemplMasterRecrdFound: boolean = false; public noTemplMasterRecrdFound: boolean = false;
public search_cid : any; public search_cid : any;
// pagination variable details // pagination variable details
length = 50; length = 50;
pageIndex = 0; pageIndex = 0;
@ -55,6 +56,10 @@ export class TemplateListComponent implements OnInit, OnDestroy {
this.getTemplateMastersListDetails(); this.getTemplateMastersListDetails();
} }
ngAfterViewInit() {
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}
// get question master list details // get question master list details
getTemplateMastersListDetails() { getTemplateMastersListDetails() {
@ -123,7 +128,10 @@ export class TemplateListComponent implements OnInit, OnDestroy {
//Called once, before the instance is destroyed. //Called once, before the instance is destroyed.
//Add 'implements OnDestroy' to the class. //Add 'implements OnDestroy' to the class.
} }
// padination page event call
pageChange(e) {
console.log(e);
}
public m_templateList = { public m_templateList = {
"dataStatus": true, "dataStatus": true,