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

Fairoj:issue fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-09-20 19:58:49 +05:30
parent 04dff2e12f
commit b9351e1076
7 changed files with 156 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/angular.json
View File

@ -86,7 +86,7 @@
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "src/environments/environment.ts", "replace": "src/environments/environment.ts",
"with": "src/environments/environment.stage.ts" "with": "src/environments/environment.prod.ts"
}] }]
} }
} }

71
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
View File

@ -35,9 +35,10 @@
<div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="main_raw_materials"> <div formArrayName="main_raw_materials">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Product {{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Product {{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
@ -139,16 +140,18 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.main_raw_materials.controls.length > 1" (click)="removeRawMaterials(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" <div align="end">
color="primary" matTooltip="Delete" matTooltipPosition="above"> <span *ngIf="item.controls.main_raw_materials.controls.length > 0" (click)="removeRawMaterials(l)">
<mat-icon>delete</mat-icon> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
</button> color="primary" matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div>
</div> </div>
</mat-card>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
@ -173,9 +176,10 @@
<div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="trading_products"> <div formArrayName="trading_products">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.trading_products['controls']; let l=index" <div *ngFor="let items of item.controls.trading_products['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Trading Product {{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Trading Product {{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
@ -276,16 +280,18 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.trading_products.controls.length > 1" (click)="removeTradingProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" <div align="end">
color="primary" matTooltip="Delete" matTooltipPosition="above"> <span *ngIf="item.controls.trading_products.controls.length > 0" (click)="removeTradingProduct(l)">
<mat-icon>delete</mat-icon> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
</button> color="primary" matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div>
</div> </div>
</mat-card>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
@ -305,14 +311,15 @@
</mat-card> </mat-card>
<!--===========================: service provider details : START--> <!--===========================: service provider details : START-->
<mat-card *ngIf="serviceProviderForm"> <mat-card *ngIf="serviceProviderForm">
<!--<h5 style="margin: 12px;padding:10px !important;">Service Provider Product Details</h5>--> <h5 style="margin: 12px;padding:10px !important;">Service Provider Details</h5>
<div formArrayName="service_provider_details"> <div formArrayName="service_provider_details">
<div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.service_provider_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="service_products"> <div formArrayName="service_products">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.service_products['controls']; let l=index" <div *ngFor="let items of item.controls.service_products['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Service Provider {{l+1}}</h6> <h6 style="margin: 12px;padding:10px !important;">Service Provider {{l+1}}</h6>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
@ -412,16 +419,18 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.service_products.controls.length > 1" (click)="removeServiceProduct(l)">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" <div align="end">
color="primary" matTooltip="Delete" matTooltipPosition="above"> <span *ngIf="item.controls.service_products.controls.length > 0" (click)="removeServiceProduct(l)">
<mat-icon>delete</mat-icon> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"
</button> color="primary" matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div>
</div> </div>
</mat-card>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts
View File

@ -239,8 +239,8 @@ export class QueriesDocsComponent implements OnInit {
if(value == 'yes'){ if(value == 'yes'){
// this.camera_btn[index]=true // this.camera_btn[index]=true
control.controls[index].removeControl('reason') control.controls[index].removeControl('reason')
control.controls[index].addControl('img',new FormControl('',Validators.required)) // control.controls[index].addControl('img',new FormControl('',Validators.required))
control.controls[index].addControl('is_new',new FormControl('',Validators.required)) // control.controls[index].addControl('is_new',new FormControl('',Validators.required))
} }
else if(value == 'no'){ else if(value == 'no'){
// this.camera_btn[index]=false // this.camera_btn[index]=false

12
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts
View File

@ -331,7 +331,7 @@ export class ManageRentalVerificationComponent implements OnInit {
(element.rental_remaining_months=='' || element.rental_remaining_months>=0) ? control.controls[index].addControl('rental_remaining_months', new FormControl('', Validators.required)) : control.controls[index].removeControl('rental_remaining_months'); (element.rental_remaining_months=='' || element.rental_remaining_months>=0) ? control.controls[index].addControl('rental_remaining_months', new FormControl('', Validators.required)) : control.controls[index].removeControl('rental_remaining_months');
element.agreement_monthly_rent_amount ? control.controls[index].addControl('agreement_monthly_rent_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_monthly_rent_amount'); element.agreement_monthly_rent_amount ? control.controls[index].addControl('agreement_monthly_rent_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_monthly_rent_amount');
element.agreement_security_deposit_amount ? control.controls[index].addControl('agreement_security_deposit_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_security_deposit_amount'); element.agreement_security_deposit_amount ? control.controls[index].addControl('agreement_security_deposit_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_security_deposit_amount');
element.hasOwnProperty('differences_loanapplicant_rentagreement') ? control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl('', Validators.required)) : control.controls[index].removeControl('differences_loanapplicant_rentagreement'); element.hasOwnProperty('differences_loanapplicant_rentagreement') ? control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl('')) : control.controls[index].removeControl('differences_loanapplicant_rentagreement');
//agreement owners //agreement owners
element.agreement_property_owners_name ? control.controls[index].addControl('agreement_property_owners_name', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_property_owners_name'); element.agreement_property_owners_name ? control.controls[index].addControl('agreement_property_owners_name', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_property_owners_name');
@ -994,10 +994,20 @@ export class ManageRentalVerificationComponent implements OnInit {
if (this._rentalForm.invalid) { if (this._rentalForm.invalid) {
this.validateAllFormFields(this._rentalForm); this.validateAllFormFields(this._rentalForm);
console.log("formData",formData)
const invalid = [];
const controls = this._rentalForm.controls;
for (const name in controls) {
if (controls[name].invalid) {
invalid.push(name);
}
}
console.log(invalid);
this.notifier.notify('warning', 'Please Fill/Correct All Mandatory Fields.!'); this.notifier.notify('warning', 'Please Fill/Correct All Mandatory Fields.!');
return; return;
} }
else { else {
/** html: 'Rent as Per Tenant = '+TenantRentAmt+ '<br>'+'Rent as Per Applicant =' + ApplicantRentAmt , */ /** html: 'Rent as Per Tenant = '+TenantRentAmt+ '<br>'+'Rent as Per Applicant =' + ApplicantRentAmt , */
Swal({ Swal({
title: 'Confirm The Rent Amount', title: 'Confirm The Rent Amount',

83
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
View File

@ -34,9 +34,10 @@
<div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.manufacturing_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="main_raw_materials"> <div formArrayName="main_raw_materials">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index" <div *ngFor="let items of item.controls.main_raw_materials['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Raw Material {{l+1}} <h6 style="margin: 12px;padding:10px !important;">Raw Material {{l+1}}
</h6> </h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -157,18 +158,20 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.main_raw_materials.controls.length > 1"
(click)="removeRawMaterials(l)"> <div align="end">
<button mat-raised-button mat-icon-button <span *ngIf="item.controls.main_raw_materials.controls.length > 0"
class="mr-1 mb-1 hover-icon" color="primary" (click)="removeRawMaterials(l)">
matTooltip="Delete" matTooltipPosition="above"> <button mat-raised-button mat-icon-button
<mat-icon>delete</mat-icon> class="mr-1 mb-1 hover-icon" color="primary"
</button> matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div>
</div> </div>
</mat-card>
</div> </div>
<div fxLayout="row"> <div fxLayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
@ -195,9 +198,10 @@
<div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.trade_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="trading_products"> <div formArrayName="trading_products">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.trading_products['controls']; let l=index" <div *ngFor="let items of item.controls.trading_products['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Trading Product <h6 style="margin: 12px;padding:10px !important;">Trading Product
{{l+1}}</h6> {{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -327,18 +331,20 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.trading_products.controls.length > 1"
(click)="removeTradingProduct(l)"> <div align="end">
<button mat-raised-button mat-icon-button <span *ngIf="item.controls.trading_products.controls.length > 0"
class="mr-1 mb-1 hover-icon" color="primary" (click)="removeTradingProduct(l)">
matTooltip="Delete" matTooltipPosition="above"> <button mat-raised-button mat-icon-button
<mat-icon>delete</mat-icon> class="mr-1 mb-1 hover-icon" color="primary"
</button> matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div> </div>
</div>
</mat-card>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">
@ -365,9 +371,10 @@
<div *ngFor="let item of _supplierQuesFrom.controls.servicing_details['controls']; let i=index" <div *ngFor="let item of _supplierQuesFrom.controls.servicing_details['controls']; let i=index"
[formGroupName]="i"> [formGroupName]="i">
<div formArrayName="service_providers"> <div formArrayName="service_providers">
<mat-card style="margin: 12px;">
<div *ngFor="let items of item.controls.service_providers['controls']; let l=index" <div *ngFor="let items of item.controls.service_providers['controls']; let l=index"
[formGroupName]="l"> [formGroupName]="l">
<mat-card style="margin: 12px;">
<h6 style="margin: 12px;padding:10px !important;">Service Provider <h6 style="margin: 12px;padding:10px !important;">Service Provider
{{l+1}}</h6> {{l+1}}</h6>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -500,18 +507,20 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div align="end">
<span *ngIf="item.controls.service_providers.controls.length > 1"
(click)="removeServiceProvider(l)"> <div align="end">
<button mat-raised-button mat-icon-button <span *ngIf="item.controls.service_providers.controls.length > 0"
class="mr-1 mb-1 hover-icon" color="primary" (click)="removeServiceProvider(l)">
matTooltip="Delete" matTooltipPosition="above"> <button mat-raised-button mat-icon-button
<mat-icon>delete</mat-icon> class="mr-1 mb-1 hover-icon" color="primary"
</button> matTooltip="Delete" matTooltipPosition="above">
</span> <mat-icon>delete</mat-icon>
</div> </button>
</mat-card> </span>
</div>
</div> </div>
</mat-card>
</div> </div>
<div fxlayout="row"> <div fxlayout="row">
<div fxFlex="100" align="center"> <div fxFlex="100" align="center">

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

@ -240,12 +240,12 @@
<table mat-table #table [dataSource]="dataSource" matSort> <table mat-table #table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="serialno" sticky> <ng-container matColumnDef="serialno" sticky>
<th mat-header-cell *matHeaderCellDef mat-sort-header>Sl </th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Sr. No. </th>
<td mat-cell *matCellDef="let row; let i = index;"> {{i+1}} </td> <td mat-cell *matCellDef="let row; let i = index;"> {{i+1}} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="applicant" sticky> <ng-container matColumnDef="applicant" sticky>
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name of the Main Applicant </th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Main Applicant </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.applicant" mat-line>{{row.applicant}}</span> </td> <span *ngIf="row.applicant" mat-line>{{row.applicant}}</span> </td>
</ng-container> </ng-container>
@ -269,7 +269,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="name_of_underwriter"> <ng-container matColumnDef="name_of_underwriter">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name of Underwriter </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> Lender Name </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.lender" mat-line>{{row.lender}}</span> </td> <span *ngIf="row.lender" mat-line>{{row.lender}}</span> </td>
</ng-container> </ng-container>
@ -305,186 +305,195 @@
</ng-container> </ng-container>
<ng-container matColumnDef="ocl"> <ng-container matColumnDef="ocl">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Outside City Limits (Yes/No) </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> OGL (Yes/No) </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.is_outside_city_limit" mat-line>{{row.is_outside_city_limit}}</span> </td> <span *ngIf="row.is_outside_city_limit" mat-line>{{row.is_outside_city_limit}}</span> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="draft"> <ng-container matColumnDef="draft">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Draft <th mat-header-cell *matHeaderCellDef mat-sort-header> Draft
DD:MM:YY HH:MM </th> DD:MM:YYYY HH:MM </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.draft" mat-line>{{row.draft | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.draft" mat-line>{{row.draft | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.draft" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.draft" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="receiving_pd_date"> <ng-container matColumnDef="receiving_pd_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Triggered <th mat-header-cell *matHeaderCellDef mat-sort-header> Triggered
DD:MM:YY HH:MM </th> DD:MM:YYYY HH:MM </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.triggered" mat-line>{{row.triggered | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.triggered" mat-line>{{row.triggered | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.triggered" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.triggered" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="draft_to_trigger"> <ng-container matColumnDef="draft_to_trigger">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Draft To Triggered <th mat-header-cell *matHeaderCellDef mat-sort-header> Draft To Triggered
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.draft_to_triggered" mat-line>{{row.draft_to_triggered }}</span> <span *ngIf="row.draft_to_triggered" mat-line>{{row.draft_to_triggered }}</span>
<span *ngIf="!row.draft_to_triggered" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.draft_to_triggered" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="allocated"> <ng-container matColumnDef="allocated">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Allocated <th mat-header-cell *matHeaderCellDef mat-sort-header> Allocated
DD:MM:YY HH:MM </th> DD:MM:YYYY HH:MM </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.allocated" mat-line>{{row.allocated | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.allocated" mat-line>{{row.allocated | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.allocated" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.allocated" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="triggered_to_allocated"> <ng-container matColumnDef="triggered_to_allocated">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Triggered to Allocated <th mat-header-cell *matHeaderCellDef mat-sort-header>Triggered to Allocated
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.triggered_to_allocated" mat-line>{{row.triggered_to_allocated }}</span> <span *ngIf="row.triggered_to_allocated" mat-line>{{row.triggered_to_allocated }}</span>
<span *ngIf="!row.triggered_to_allocated" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.triggered_to_allocated" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="accepted"> <ng-container matColumnDef="accepted">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Accepted <th mat-header-cell *matHeaderCellDef mat-sort-header> Accepted
DD:MM:YY HH:MM </th> DD:MM:YYYY HH:MM </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.accepted" mat-line>{{row.accepted | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.accepted" mat-line>{{row.accepted | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.accepted" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.accepted" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="allocated_to_accepted"> <ng-container matColumnDef="allocated_to_accepted">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Allocated to Accepted <th mat-header-cell *matHeaderCellDef mat-sort-header>Allocated to Accepted
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.allocated_to_accepted" mat-line>{{row.allocated_to_accepted }}</span> <span *ngIf="row.allocated_to_accepted" mat-line>{{row.allocated_to_accepted }}</span>
<span *ngIf="!row.allocated_to_accepted" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.allocated_to_accepted" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="confirmation_pd_date"> <ng-container matColumnDef="confirmation_pd_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Scheduled <th mat-header-cell *matHeaderCellDef mat-sort-header>Scheduled
DD:MM:YY HH:MM</th> DD:MM:YYYY HH:MM</th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.scheduled" mat-line>{{row.scheduled | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.scheduled" mat-line>{{row.scheduled | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.scheduled" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.scheduled" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="accepted_to_scheduled"> <ng-container matColumnDef="accepted_to_scheduled">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Accepted to Scheduled <th mat-header-cell *matHeaderCellDef mat-sort-header>Accepted to Scheduled
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.accepted_to_scheduled" mat-line>{{row.accepted_to_scheduled }}</span> <span *ngIf="row.accepted_to_scheduled" mat-line>{{row.accepted_to_scheduled }}</span>
<span *ngIf="!row.accepted_to_scheduled" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.accepted_to_scheduled" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="initiated"> <ng-container matColumnDef="initiated">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Initiated <th mat-header-cell *matHeaderCellDef mat-sort-header> Initiated
DD:MM:YY HH:MM </th> DD:MM:YYYY HH:MM </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.initiated" mat-line>{{row.initiated | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.initiated" mat-line>{{row.initiated | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.initiated" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.initiated" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="scheduled_to_initiated"> <ng-container matColumnDef="scheduled_to_initiated">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Scheduled to Initiated <th mat-header-cell *matHeaderCellDef mat-sort-header>Scheduled to Initiated
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.scheduled_to_initiated" mat-line>{{row.scheduled_to_initiated }}</span> <span *ngIf="row.scheduled_to_initiated" mat-line>{{row.scheduled_to_initiated }}</span>
<span *ngIf="!row.scheduled_to_initiated" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.scheduled_to_initiated" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="start_of_conducting_pd_date"> <ng-container matColumnDef="start_of_conducting_pd_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Started <th mat-header-cell *matHeaderCellDef mat-sort-header> Started
DD:MM:YY HH:MM</th> DD:MM:YYYY HH:MM</th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.started" mat-line>{{row.started | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.started" mat-line>{{row.started | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.started" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.started" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="initiated_to_started"> <ng-container matColumnDef="initiated_to_started">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Initiated to Started <th mat-header-cell *matHeaderCellDef mat-sort-header>Initiated to Started
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.initiated_to_started" mat-line>{{row.initiated_to_started }}</span> <span *ngIf="row.initiated_to_started" mat-line>{{row.initiated_to_started }}</span>
<span *ngIf="!row.initiated_to_started" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.initiated_to_started" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="inprogress"> <ng-container matColumnDef="inprogress">
<th mat-header-cell *matHeaderCellDef mat-sort-header> InProgress <th mat-header-cell *matHeaderCellDef mat-sort-header> In-Progress
DD:MM:YY HH:MM</th> DD:MM:YYYY HH:MM</th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.inprogress" mat-line>{{row.inprogress | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.inprogress" mat-line>{{row.inprogress | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.inprogress" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.inprogress" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="started_to_inprogress"> <ng-container matColumnDef="started_to_inprogress">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Started to InProgress <th mat-header-cell *matHeaderCellDef mat-sort-header>Started to In-Progress
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.started_to_inprogress" mat-line>{{row.started_to_inprogress }}</span> <span *ngIf="row.started_to_inprogress" mat-line>{{row.started_to_inprogress }}</span>
<span *ngIf="!row.started_to_inprogress" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.started_to_inprogress" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="end_of_conducting_pd_date"> <ng-container matColumnDef="end_of_conducting_pd_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Completed <th mat-header-cell *matHeaderCellDef mat-sort-header> Completed
DD:MM:YY HH:MM</th> DD:MM:YYYY HH:MM</th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.completed" mat-line>{{(row.completed | date: 'dd-MM-yyyy hh:mm a') || '-'}}</span> <span *ngIf="row.completed" mat-line>{{(row.completed | date: 'dd-MM-yyyy hh:mm a') || '-'}}</span>
<span *ngIf="!row.completed" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.completed" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="inprogress_to_completed"> <ng-container matColumnDef="inprogress_to_completed">
<th mat-header-cell *matHeaderCellDef mat-sort-header>InProgress to Completed <th mat-header-cell *matHeaderCellDef mat-sort-header>In-Progress to Completed
HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.inprogress_to_completed" mat-line>{{row.inprogress_to_completed }}</span> <span *ngIf="row.inprogress_to_completed" mat-line>{{row.inprogress_to_completed }}</span>
<span *ngIf="!row.inprogress_to_completed" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.inprogress_to_completed" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="sending_pd_report_date"> <ng-container matColumnDef="sending_pd_report_date">
<th mat-header-cell *matHeaderCellDef mat-sort-header>QC Completed <th mat-header-cell *matHeaderCellDef mat-sort-header>QC Completed
DD:MM:YY HH:MM DD:MM:YYYY HH:MM
</th> </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.qc_complete" mat-line>{{row.qc_complete | date: 'dd-MM-yyyy hh:mm a'}}</span> <span *ngIf="row.qc_complete" mat-line>{{row.qc_complete | date: 'dd-MM-yyyy hh:mm a'}}</span>
<span *ngIf="!row.qc_complete" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.qc_complete" mat-line>00-00-0000 00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="completed_to_qc_complete"> <ng-container matColumnDef="completed_to_qc_complete">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Completed to QC Completed <th mat-header-cell *matHeaderCellDef mat-sort-header>Completed to QC Completed
DD:MM:YY HH:MM </th> HH:MM:SS </th>
<td mat-cell *matCellDef="let row"> <td mat-cell *matCellDef="let row">
<span *ngIf="row.completed_to_qc_complete" mat-line>{{row.completed_to_qc_complete }}</span> <span *ngIf="row.completed_to_qc_completed" mat-line>{{row.completed_to_qc_completed }}</span>
<span *ngIf="!row.completed_to_qc_complete" mat-line><h5 style="text-align: center">-</h5></span> <span *ngIf="!row.completed_to_qc_completed" mat-line>00:00:00</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="total_tat">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Total TAT
HH:MM:SS </th>
<td mat-cell *matCellDef="let row">
<span *ngIf="row.total_tat" mat-line>{{row.total_tat }}</span>
<span *ngIf="!row.total_tat" mat-line>00:00:00</span>
</td>
</ng-container>
<ng-container matColumnDef="agency_name"> <ng-container matColumnDef="agency_name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> PD Agency Name </th> <th mat-header-cell *matHeaderCellDef mat-sort-header> PD Agency Name </th>

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

@ -61,6 +61,7 @@ export class PdMisComponent implements OnInit {
'inprogress_to_completed', 'inprogress_to_completed',
'sending_pd_report_date', 'sending_pd_report_date',
'completed_to_qc_complete', 'completed_to_qc_complete',
'total_tat',
'agency_name', 'agency_name',
'officer_name', 'officer_name',
'pd_status', 'pd_status',