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

BBBBBBAAAAAAMerge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-07-11 16:36:26 +05:30
commit b39b256b21
9 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html
View File

@ -160,10 +160,10 @@
matTooltip="View" matTooltipPosition="above"> matTooltip="View" matTooltipPosition="above">
<mat-icon>visibility</mat-icon> <mat-icon>visibility</mat-icon>
</button> </button>
<button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)" <!-- <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
matTooltip="Copy PD" matTooltipPosition="above"> matTooltip="Copy PD" matTooltipPosition="above">
<mat-icon>file_copy</mat-icon> <mat-icon>file_copy</mat-icon>
</button> </button> -->
</mat-cell> </mat-cell>
</ng-container> </ng-container>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html
View File

@ -134,10 +134,10 @@
<button style ="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" <button style ="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View"
matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
<button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)" <!-- <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
matTooltip="Copy PD" matTooltipPosition="above"> matTooltip="Copy PD" matTooltipPosition="above">
<mat-icon>file_copy</mat-icon> <mat-icon>file_copy</mat-icon>
</button> </button> -->
</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;">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html
View File

@ -127,10 +127,10 @@
<mat-icon>sms</mat-icon> <mat-icon>sms</mat-icon>
</button> --> </button> -->
<button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button> <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" matTooltip="View" matTooltipPosition="above" color="primary"><mat-icon>visibility</mat-icon></button>
<button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)" <!-- <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
matTooltip="Copy PD" matTooltipPosition="above"> matTooltip="Copy PD" matTooltipPosition="above">
<mat-icon>file_copy</mat-icon> <mat-icon>file_copy</mat-icon>
</button> </button> -->
</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;">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html
View File

@ -132,10 +132,10 @@
</button> --> </button> -->
<button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button> <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
<button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)" <!-- <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
matTooltip="Copy PD" matTooltipPosition="above"> matTooltip="Copy PD" matTooltipPosition="above">
<mat-icon>file_copy</mat-icon> <mat-icon>file_copy</mat-icon>
</button> </button> -->
</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;">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html
View File

@ -132,10 +132,10 @@
</button> --> </button> -->
<button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button> <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="viewPD(details.is_child == 0 ? details.pd_id : details.parent_pd_id,details.random_string)" color="primary" matTooltip="View" matTooltipPosition="above"><mat-icon>visibility</mat-icon></button>
<button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)" <!-- <button style="float: right" mat-button mat-icon-button class="mb-1 hover-icon" type="button" color="primary" (click)="copyPD(details)"
matTooltip="Copy PD" matTooltipPosition="above"> matTooltip="Copy PD" matTooltipPosition="above">
<mat-icon>file_copy</mat-icon> <mat-icon>file_copy</mat-icon>
</button> </button> -->
</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;">

7
ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html
View File

@ -108,6 +108,13 @@
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.applicant_name" mat-line>{{row.applicant_name}}</span> </td> <span *ngIf="row.applicant_name" mat-line>{{row.applicant_name}}</span> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="sales_pd_type" sticky>
<th mat-header-cell *matHeaderCellDef mat-sort-header>Sales PD Type</th>
<td mat-cell *matCellDef="let row">
<span *ngIf="row.sales_pd_type == 2" mat-line>Telephonic PD</span>
<span *ngIf="row.sales_pd_type == 1" mat-line>Physical PD</span> </td>
</ng-container>
<ng-container matColumnDef="officer_name"> <ng-container matColumnDef="officer_name">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Sales Person</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Sales Person</th>

1
ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.ts
View File

@ -39,6 +39,7 @@ export class MisReportsComponent implements OnInit {
'sales_pd_id', 'sales_pd_id',
'sales_pd_sno', 'sales_pd_sno',
'applicant_name', 'applicant_name',
'sales_pd_type',
'officer_name', 'officer_name',
'status', 'status',
'createdon', 'createdon',

8
ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
View File

@ -52,8 +52,14 @@
<span style="text-align: center;font-weight:400;font-size: 17px;"> <small mat-line>{{details.abbr}}</small></span> <span style="text-align: center;font-weight:400;font-size: 17px;"> <small mat-line>{{details.abbr}}</small></span>
</mat-cell> </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="Sales PD Type">
<mat-cell class="cell" *matCellDef="let details" fxLayoutAlign="start" fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="10">
<span style="font-weight:500" *ngIf="details.sales_pd_type == 2"> <small mat-line>Telephonic PD</small></span>
<span style="font-weight:500" *ngIf="details.sales_pd_type == 1"> <small mat-line>Physical PD</small></span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="Officer Name"> <ng-container matColumnDef="Officer Name">
<mat-cell fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="13" class="cell" *matCellDef="let details;" fxLayoutAlign="center start"> <mat-cell fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="13" class="cell" *matCellDef="let details;" fxLayoutAlign="center start" style="text-align: center;">
<span *ngIf="!details.officer_name" mat-line> <span *ngIf="!details.officer_name" mat-line>
<small>--</small> <small>--</small>
</span> </span>

2
ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts
View File

@ -13,7 +13,7 @@ export class SalesPdComponent implements OnInit {
public dataSourceTab4 = new MatTableDataSource(); public dataSourceTab4 = new MatTableDataSource();
filter_input:string=''; filter_input:string='';
displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Officer Name','status','Create On','Action']; displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Sales PD Type','Officer Name','status','Create On','Action'];
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;