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

Fairoj : pd list pagination issue and note label changed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-03-04 18:36:11 +05:30
parent 0a86178d21
commit 573814d34b
16 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@
</mat-list>
</mat-expansion-panel>
<p class="note" *ngIf="dataSourceTab1.data.length > 0">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="dataSourceTab1.data.length > 0">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab1" matSort *ngIf="PdListData.length > 0">
<ng-container matColumnDef="PDType">

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

@ -202,8 +202,10 @@ export class AllPdComponent implements OnInit, OnChanges {
this.dataSourceTab1.data = res['records'];
// console.log('records',res['records']);
this.dataSourceTab1.paginator = this.paginator;
this.PdListData = res['records'];
this.recordStatus=false;
}else{
this.PdListData=[];
this.notifier.notify('warning', 'No Records Found !');
this.dataSourceTab1.paginator['length'] = 0;
this.dataSourceTab1.paginator['pageIndex'] = 0;

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

@ -73,7 +73,7 @@
</mat-list>
</mat-expansion-panel>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab4" matSort *ngIf="completedPdListData.length > 0" >

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

@ -17,3 +17,10 @@
.toolbar-space {
flex: 0.01 0 auto;
}
p.note {
// float: right;
text-align: right;
font-size: 12px;
color: grey;
font-weight: bold;
}

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

@ -214,12 +214,13 @@ export class CompletedPdComponent implements OnInit, OnChanges {
if(res['dataStatus']==true)
{
this.dataSourceTab4 = res['records'];
this.dataSourceTab4.data = res['records'];
this.dataSourceTab4.paginator = this.paginator;
this.recordStatus=false;
this.completedPdListData = res['records'];
}else{
this.notifier.notify('warning', 'No Records Found !');
this.completedPdListData = []
this.dataSourceTab4.paginator['length'] = 0;
this.dataSourceTab4.paginator['pageIndex'] = 0;
this.dataSourceTab4.data = [];

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

@ -72,7 +72,7 @@
</mat-list>
</mat-expansion-panel>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab2" matSort *ngIf="progressPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">

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

@ -16,4 +16,11 @@
}
.toolbar-space {
flex: 0.01 0 auto;
}
p.note {
// float: right;
text-align: right;
font-size: 12px;
color: grey;
font-weight: bold;
}

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

@ -205,10 +205,12 @@ export class InprogressPdComponent implements OnInit, OnChanges {
this.xpandStatus = false;
if(res['dataStatus']==true)
{
this.dataSourceTab2 = res['records'];
this.progressPdListData = res['records'];
this.dataSourceTab2.data = res['records'];
this.dataSourceTab2.paginator = this.paginator;
this.recordStatus=false;
}else{
this.progressPdListData = []
this.notifier.notify('warning', 'No Records Found !');
this.dataSourceTab2.paginator['length'] = 0;
this.dataSourceTab2.paginator['pageIndex'] = 0;

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

@ -74,7 +74,7 @@
</mat-list>
</mat-expansion-panel>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab5" matSort *ngIf="qcCompletedPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">

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

@ -16,4 +16,11 @@
}
.toolbar-space {
flex: 0.01 0 auto;
}
p.note {
// float: right;
text-align: right;
font-size: 12px;
color: grey;
font-weight: bold;
}

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

@ -192,15 +192,17 @@ export class QcCompletedPdComponent implements OnInit, OnChanges {
this._pd.overAllSearchFormDetails(this.searchForm.value).subscribe(res => {
this.xpandStatus = false;
if (res['dataStatus'] == true) {
this.dataSourceTab5 = res['records'];
this.dataSourceTab5.data = res['records'];
this.dataSourceTab5.paginator = this.paginator;
this.recordStatus = false
this.qcCompletedPdListData = res['records'];
}else{
this.notifier.notify('warning', 'No Records Found !');
this.dataSourceTab5.paginator['length'] = 0;
this.dataSourceTab5.paginator['pageIndex'] = 0;
this.dataSourceTab5.data = [];
this.recordStatus = true
this.recordStatus = true
this.qcCompletedPdListData = []
}
},error => {
this.errorMessage.push(error);

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

@ -72,7 +72,7 @@
</mat-list>
</mat-expansion-panel>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="!recordStatus">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab3" matSort *ngIf="scheduledPdListData.length > 0" >
<ng-container matColumnDef="PDType">
<mat-cell fxFlex.xs="20" fxFlex.sm="15" fxFlex.md="13" fxFlex.lg="16" fxFlex.xl="13" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
@ -125,7 +125,7 @@
</mat-card-content>
<div [hidden]="recordStatus">
<mat-paginator *ngIf="!recordStatus" #paginator class="mat-elevation-z1" [length]="scheduledPdListData.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
<mat-paginator #paginator class="mat-elevation-z1" [length]="scheduledPdListData.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25,50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>

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

@ -16,4 +16,11 @@
}
.toolbar-space {
flex: 0.01 0 auto;
}
p.note {
// float: right;
text-align: right;
font-size: 12px;
color: grey;
font-weight: bold;
}

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

@ -205,10 +205,13 @@ export class ScheduledPdComponent implements OnInit, OnChanges {
this.xpandStatus = false;
if(res['dataStatus']==true)
{
this.dataSourceTab3 = res['records'];
this.dataSourceTab3.data = res['records'];
this.dataSourceTab3.paginator = this.paginator;
console.log("paginator",this.paginator);
this.recordStatus = false
this.scheduledPdListData = res['records'];
}else{
this.scheduledPdListData =[];
this.notifier.notify('warning', 'No Records Found !');
this.dataSourceTab3.paginator['length'] = 0;
this.dataSourceTab3.paginator['pageIndex'] = 0;

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

@ -20,7 +20,7 @@
<!-- <ng-template mat-tab-label>Sales PD</ng-template> -->
<mat-card-content [hidden]="salesPdData.length == 0" >
<p class="note" *ngIf="salesPdData.length > 0">Showing data for last 10 days. Showing data for last 10 days. To see older records, please use advanced filter</p>
<p class="note" *ngIf="salesPdData.length > 0">Showing data for last 10 days. To see older records, please use advanced filter</p>
<mat-table [dataSource]="dataSourceTab4" matSort *ngIf="salesPdData.length > 0" >
<ng-container matColumnDef="SalesPdId">

4
ng6-seed/src/environments/environment.ts
View File

@ -12,8 +12,8 @@ export const environment = {
// apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',
// apiEndpoint: 'https://demo.pdgenie.com/sparqapi/api/',
// apiEndpoint:'https://apitest.pdgenie.com/sparqapi/api/',
apiEndpoint:'http://localhost/sineEdge/sparqapi/api/',
apiEndpoint:'https://apitest.pdgenie.com/sparqapi/api/',
// apiEndpoint:'http://localhost/sineEdge/sparqapi/api/',
authorization: 'sparqvenba2018',