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

Merge changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-07-27 18:13:43 +05:30
commit f159d130ca
9 changed files with 43 additions and 28 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/start-pd/forms/address/address.component.html
View File

@ -281,7 +281,7 @@
</div>
<div fxFlex="100">
<mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-select placeholder="Approach to PD Location"
formControlName="pd_location" required>
<mat-option>Select</mat-option>
@ -294,7 +294,7 @@
Approach to PD Location Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width: 46%;" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-select placeholder="Comment on Locality"
formControlName="comment_locality" required>
<mat-option>Select</mat-option>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
View File

@ -71,7 +71,7 @@
</div>
<mat-form-field style="width: 95%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width: 95%;" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-select
[placeholder]="placeholderName[i] ? placeholderName[i] :'Was any business activity seen at the Address Type during PD visit?'"
formControlName="business_is_pd_visited">
@ -84,7 +84,7 @@
</mat-form-field>
<mat-form-field *ngIf=" itemrow.get('business_is_pd_visited').value != '' && fk_pd_type != '3' && fk_pd_type != '2'" style="width: 95%;">
<mat-form-field *ngIf=" itemrow.get('business_is_pd_visited').value != '' && fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}" style="width: 95%;">
<input matInput autocomplete="off" placeholder="Remarks"
formControlName="business_pd_visited_remark">
<mat-error *ngIf="itemrow.controls['business_pd_visited_remark'].hasError('required')">Remarks

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

@ -1609,7 +1609,7 @@
<mat-card-title *ngIf="fk_pd_type == '3' || fk_pd_type == '2'">Company Name Board </mat-card-title>
</mat-card-header>
<mat-card-content class="matcard">
<mat-form-field *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<input matInput placeholder="Total" formControlName="officer_total" required>
<mat-error *ngIf="businessForm.controls['officer_total'].hasError('required')">Total Required</mat-error>
</mat-form-field>

18
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -31,9 +31,9 @@
<mat-card>
<mat-card-content>
<mat-card-subtitle>Location</mat-card-subtitle>
<mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width:94%;" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-select placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
formControlName="is_service_provided" required>
formControlName="is_service_provided" >
<mat-option>Select</mat-option>
<mat-option value="well_suited">Well Suited</mat-option>
<mat-option value="fairly_suited">Fairly Suited</mat-option>
@ -136,13 +136,13 @@
</div>
</div>
</span>
<div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-label>Any additional visit (Godown /multiple rental properties)</mat-label>&nbsp;&nbsp;
<mat-slide-toggle formControlName="was_the_pd_address_ogl" color="primary"></mat-slide-toggle>
</div>
<mat-form-field style="width:50%;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width:50%;" *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-select placeholder="Mode of Transport Used to Visit the PD address" formControlName="mode_of_transport_during_visit"
required>
>
<mat-option>Select</mat-option>
<mat-option value="two_wheeler"> Two Wheeler</mat-option>
<mat-option value="four_wheeler"> Four Wheeler</mat-option>
@ -156,11 +156,11 @@
<mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Specify the Mode of Transport Used to Visit the PD address Required</mat-error>
</mat-form-field>
<mat-card *ngIf="(lender_short_name == 'CLIX' || lender_short_name == 'MWISE' || prod_catagory == 'LAEP') && fk_pd_type != '3'">
<mat-card *ngIf="(lender_short_name == 'CLIX' || lender_short_name == 'MWISE' || prod_catagory == 'LAEP') && fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-card-content>
<mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
<mat-card-subtitle *ngIf="lender_short_name == 'MWISE'">MWISE</mat-card-subtitle>
<mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && prod_catagory == 'LAEP' && (fk_pd_type != '3' && fk_pd_type != '2')">
<mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && prod_catagory == 'LAEP' && fk_pd_type != '3'">
<mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
required>
<mat-option>Select</mat-option>
@ -176,7 +176,7 @@
Is there Competition to the applicant’s business in the location <strong>( {{ _finalRemarkForm.value.is_competition ===true ? 'Yes' : 'No'}} )</strong>
</mat-checkbox>
</div> -->
<div *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div *ngIf="fk_pd_type != '3'">
<mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['is_competition']">
<mat-select placeholder="Is there Competition to the applicant’s business in the location" formControlName="is_competition" (selectionChange)="clixChange($event.value,1)">
<mat-option>Select</mat-option>
@ -222,7 +222,7 @@
<mat-checkbox color="primary" formControlName="sealing_activity" (change)="clixChange($event.checked,3)">
Any sealing activity observed in the locality by PD office <strong>( {{ _finalRemarkForm.value.sealing_activity ===true ? 'Yes' : 'No'}} )</strong></mat-checkbox>
</div> -->
<div *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div *ngIf="fk_pd_type != '3'">
<mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['demolition_activity']">
<mat-select placeholder="Any sealing activity observed in the locality by PD officer" formControlName="sealing_activity" (selectionChange)="clixChange($event.value,3)">
<mat-option>Select</mat-option>

15
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
View File

@ -116,7 +116,7 @@ export class FinalRemarksComponent implements OnInit {
this._finalRemarkForm.controls['mode_of_transport_during_visit'].updateValueAndValidity();
}
if((this.fk_pd_type != '3' && this.fk_pd_type != '2') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){
if((this.fk_pd_type != '3') && (this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')){
this.prod_catagory == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
this._finalRemarkForm.addControl('is_competition', new FormControl(''));
this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
@ -380,6 +380,8 @@ export class FinalRemarksComponent implements OnInit {
if (this._finalRemarkForm.invalid) {
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
this.validateAllFormFields(this._finalRemarkForm);
let inavalidCtrls = this.findInvalidControls();
console.log(inavalidCtrls)
return;
} else {
var answerFormValues = this._finalRemarkForm.value;
@ -710,7 +712,16 @@ export class FinalRemarksComponent implements OnInit {
}
});
}
public findInvalidControls() {
const invalid = [];
const controls = this._finalRemarkForm.controls;
for (const name in controls) {
if (controls[name].invalid) {
invalid.push(name);
}
}
return invalid;
}
/* imageCrop(pic) {
// let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id}
pic.pdid = this.pdid;

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

@ -17,7 +17,7 @@
<ng-template matTabContent>
<div fxLayout="row wrap">
<div fxFlex="100">
<mat-card *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-card *ngIf="fk_pd_type != '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-card-header>
<mat-card-title>
<p>Data as Per Financial Statements</p>
@ -507,7 +507,7 @@
<mat-radio-button value="no"> No</mat-radio-button>
</mat-radio-group>
</div><br/>
<div style="width:auto" *ngIf="financialForm.value.kuccha_records_shown == 'yes' && (fk_pd_type != '3' && fk_pd_type != '2')">
<div style="width:auto" *ngIf="financialForm.value.kuccha_records_shown == 'yes' && (fk_pd_type != '3')" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-label>Does the Number of Kuccha Bills and Values therein, justify the customer declared turnover?</mat-label><br/>
<mat-radio-group formControlName="customer_declared_turnover" >
<mat-radio-button value="yes">Yes

16
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
View File

@ -27,14 +27,14 @@
<div *ngIf="types.id==0">
<div formArrayName="neighbourhood_list">
<mat-card *ngFor="let neighbourhood of _neighbourhoodForm.controls.neighbourhood_list['controls']; let n = index; let last = last"
[formGroupName]="n">
[formGroupName]="n" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-card-content>
<mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width: 42%" *ngIf="fk_pd_type != '3'">
<input matInput autocomplete="off" placeholder="Neighbour Name" formControlName="neighbourhood_name" appCustomTitleCase
[value]="neighbourhood.get('neighbourhood_name').value" type="text">
</mat-form-field>
<mat-form-field style="width: 40%" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-form-field style="width: 40%" *ngIf="fk_pd_type != '3'">
<!-- Do You Know the Applicant -->
<mat-select placeholder=" Do you know about the applicants or their business?"
formControlName="do_know">
@ -44,8 +44,8 @@
</mat-select>
</mat-form-field>
<div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!='' && fk_pd_type != '3' && fk_pd_type != '2'">
<div fxFlex="80" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!='' && fk_pd_type != '3'">
<div fxFlex="80" *ngIf="fk_pd_type != '3'">
<label>As per you how long has this business been in operation?</label>
<mat-form-field *ngIf="!this.isDisplay[n]">
<mat-label>Year</mat-label>
@ -58,7 +58,7 @@
OnlyNumber type="text" (change)="ConvertMonthintoYear(neighbourhood,$event.target.value,1)">
</mat-form-field>
</div>
<div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3'">
<label>Do not know</label>
<div>
<mat-checkbox color="primary" formControlName="did_not_know_the_business_operation"
@ -70,7 +70,7 @@
<div fxLayout="row wrap" *ngIf="neighbourhood.controls.do_know.value!=''">
<div fxFlex="60" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div fxFlex="60" *ngIf="fk_pd_type != '3'">
<mat-form-field style="width: 95%" *ngIf="neighbourhood.controls.do_know.value!='' && !isDisplay2[n] ; else OtherCondition;">
<mat-select multiple placeholder="Who is the owner of the organisation?"
formControlName="organisation_owner" [compareWith]="compareObjects"
@ -92,7 +92,7 @@
type="text" [value]="neighbourhood.controls.other_organisation_owner.value" appCustomTitleCase>
</mat-form-field>
</div>
<div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<div fxFlex="10" style="text-align: center;" *ngIf="fk_pd_type != '3'">
<label>Do not know</label>
<div>
<mat-checkbox color="primary" formControlName="did_not_know_the_owner" (change)="toggleVisibility($event.checked,n,2)"></mat-checkbox>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts
View File

@ -22,7 +22,7 @@ export class VendorPdAllocationComponent implements OnInit {
public submitted = false;
cityList: any = [];
stateList: any = [];
i :Number = 0
i: Number = 0;
constructor(notifier: NotifierService,
private _fb: FormBuilder,
private dialogRef: MatDialogRef<VendorPdAllocationComponent>,

6
ng6-seed/src/assets/styles/app.scss
View File

@ -51,4 +51,8 @@ Author: TrendSetter Themes
@import "~angular-notifier/styles";
// import date time picker styles
@import "~ng-pick-datetime/assets/style/picker.min.css";
@import "~ng-pick-datetime/assets/style/picker.min.css";
.smartPd{
background-color: #00bcd44f !important;
}