diff --git a/ng6-seed/angular.json b/ng6-seed/angular.json index 65f5ce492..d9ae0d73e 100755 --- a/ng6-seed/angular.json +++ b/ng6-seed/angular.json @@ -86,7 +86,7 @@ "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.stage.ts" + "with": "src/environments/environment.prod.ts" }] } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index 0497bff42..313215ac6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -35,9 +35,10 @@
+
- +
Product {{l+1}}
@@ -139,16 +140,18 @@ type="number">
-
- - - -
- + + +
+ + + +
+
@@ -173,9 +176,10 @@
+
- +
Trading Product {{l+1}}
@@ -276,16 +280,18 @@ type="number">
-
- - - -
- + + +
+ + + +
+
@@ -305,14 +311,15 @@ - +
Service Provider Details
+
- +
Service Provider {{l+1}}
@@ -412,16 +419,18 @@ type="number">
-
- - - -
- + + +
+ + + +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts index 20ac8aca5..882d6bd78 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts @@ -239,8 +239,8 @@ export class QueriesDocsComponent implements OnInit { if(value == 'yes'){ // this.camera_btn[index]=true control.controls[index].removeControl('reason') - control.controls[index].addControl('img',new FormControl('',Validators.required)) - control.controls[index].addControl('is_new',new FormControl('',Validators.required)) + // control.controls[index].addControl('img',new FormControl('',Validators.required)) + // control.controls[index].addControl('is_new',new FormControl('',Validators.required)) } else if(value == 'no'){ // this.camera_btn[index]=false diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts index 05df48c95..ea8ff7b7e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts @@ -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.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.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 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) { 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.!'); return; } else { + /** html: 'Rent as Per Tenant = '+TenantRentAmt+ '
'+'Rent as Per Applicant =' + ApplicantRentAmt , */ Swal({ title: 'Confirm The Rent Amount', diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index ddf706ecc..35c63155e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -34,9 +34,10 @@
+
- +
Raw Material {{l+1}}
@@ -157,18 +158,20 @@
-
- - - -
- + + +
+ + + +
+
@@ -195,9 +198,10 @@
+
- +
Trading Product {{l+1}}
@@ -327,18 +331,20 @@
-
- - - -
- -
+ + +
+ + + +
+
+
@@ -365,9 +371,10 @@
+
- +
Service Provider {{l+1}}
@@ -500,18 +507,20 @@
-
- - - -
- + + +
+ + + +
+
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html index 41617c850..cb22f72bb 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html @@ -240,12 +240,12 @@ - + - + @@ -269,7 +269,7 @@ - + @@ -305,186 +305,195 @@ - + + DD:MM:YYYY HH:MM + DD:MM:YYYY HH:MM + HH:MM:SS + DD:MM:YYYY HH:MM + HH:MM:SS + DD:MM:YYYY HH:MM + HH:MM:SS + DD:MM:YYYY HH:MM + HH:MM:SS + DD:MM:YYYY HH:MM + HH:MM:SS + DD:MM:YYYY HH:MM + HH:MM:SS - + - + + DD:MM:YYYY HH:MM - + + HH:MM:SS + + + + + diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts index dfae98b82..88e682c38 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts @@ -61,6 +61,7 @@ export class PdMisComponent implements OnInit { 'inprogress_to_completed', 'sending_pd_report_date', 'completed_to_qc_complete', + 'total_tat', 'agency_name', 'officer_name', 'pd_status',
Sl Sr. No. {{i+1}} Name of the Main Applicant Main Applicant {{row.applicant}} Name of Underwriter Lender Name {{row.lender}} Outside City Limits (Yes/No) OGL (Yes/No) {{row.is_outside_city_limit}} Draft - DD:MM:YY HH:MM {{row.draft | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Triggered - DD:MM:YY HH:MM {{row.triggered | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Draft To Triggered - HH:MM {{row.draft_to_triggered }} -
-
 + 00:00:00 		Allocated - DD:MM:YY HH:MM {{row.allocated | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Triggered to Allocated - HH:MM {{row.triggered_to_allocated }} -
-
 + 00:00:00 		Accepted - DD:MM:YY HH:MM {{row.accepted | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Allocated to Accepted - HH:MM {{row.allocated_to_accepted }} -
-
 + 00:00:00 		Scheduled - DD:MM:YY HH:MM {{row.scheduled | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Accepted to Scheduled - HH:MM {{row.accepted_to_scheduled }} -
-
 + 00:00:00 		Initiated - DD:MM:YY HH:MM {{row.initiated | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Scheduled to Initiated - HH:MM {{row.scheduled_to_initiated }} -
-
 + 00:00:00 		Started - DD:MM:YY HH:MM {{row.started | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Initiated to Started - HH:MM {{row.initiated_to_started }} -
-
 + 00:00:00 		InProgress - DD:MM:YY HH:MM In-Progress + DD:MM:YYYY HH:MM {{row.inprogress | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Started to InProgress - HH:MM Started to In-Progress + HH:MM:SS {{row.started_to_inprogress }} -
-
 + 00:00:00 		Completed - DD:MM:YY HH:MM {{(row.completed | date: 'dd-MM-yyyy hh:mm a') || '-'}} -
-
 + 00-00-0000 00:00 		InProgress to Completed - HH:MM In-Progress to Completed + HH:MM:SS {{row.inprogress_to_completed }} -
-
 + 00:00:00 		QC Completed - DD:MM:YY HH:MM + DD:MM:YYYY HH:MM {{row.qc_complete | date: 'dd-MM-yyyy hh:mm a'}} -
-
 + 00-00-0000 00:00 		Completed to QC Completed - DD:MM:YY HH:MM - {{row.completed_to_qc_complete }} -
-
 + {{row.completed_to_qc_completed }} + 00:00:00 		Total TAT + HH:MM:SS + {{row.total_tat }} + 00:00:00 + PD Agency Name