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

smart pd changes

Browse Source
This commit is contained in:
sriram-at-840620226347 2020-09-18 18:48:01 +05:30
parent 8f9bdfaac2
commit d9bd3c29da
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,8 +297,13 @@ export class BusinessAssetsInfoComponent implements OnInit {
let selectedCity = this.cityArr.filter(element => element.city_id == dataValue.city)[0]; let selectedCity = this.cityArr.filter(element => element.city_id == dataValue.city)[0];
// console.log(selectedCity,dataValue.city,selectedState); // console.log(selectedCity,dataValue.city,selectedState);
let selectedPincode = this.pinArr.filter(element => element.pincode_id == dataValue.pincode)[0]; let selectedPincode = this.pinArr.filter(element => element.pincode_id == dataValue.pincode)[0];
console.log(selectedAddressType)
let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others; let addressType = dataValue.address_type != 1 && selectedAddressType ? selectedAddressType.address_type : dataValue.address_type_others;
console.log(addressType)
if(addressType == undefined){
addressType= ''
}
this.address_type = addressType; this.address_type = addressType;
let address = dataValue.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode); let address = dataValue.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode);

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
View File

@ -201,6 +201,7 @@ export class GeneralInfoComponent implements OnInit {
/** init form */ /** init form */
initFormDetails() { initFormDetails() {
console.log(this.fk_pd_type)
this._generalForm = this._fb.group({ this._generalForm = this._fb.group({
parent_pdid: this.parent_pdid, parent_pdid: this.parent_pdid,
pdid: this.pdid, pdid: this.pdid,
@ -212,7 +213,7 @@ export class GeneralInfoComponent implements OnInit {
company_with_relationships: this._fb.array([]), company_with_relationships: this._fb.array([]),
rental_income_rcv_in_years: '', rental_income_rcv_in_years: '',
rental_income_rcv_in_month: '', rental_income_rcv_in_month: '',
is_kyc: ['',Validators.compose([Validators.required])], is_kyc: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
kyc_and_captur_the_name: '', kyc_and_captur_the_name: '',
general_remark: '' general_remark: ''
}) })
@ -1107,7 +1108,9 @@ salariedcheck(){
this._generalForm.get('is_kyc').clearValidators(); this._generalForm.get('is_kyc').clearValidators();
} }
else{ else{
if(this.fk_pd_type != '2' && this.fk_pd_type != '3'){
this._generalForm.get('is_kyc').setValidators(Validators.compose([Validators.required])) this._generalForm.get('is_kyc').setValidators(Validators.compose([Validators.required]))
}
} }
this._generalForm.get('is_kyc').updateValueAndValidity() this._generalForm.get('is_kyc').updateValueAndValidity()
} }

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
View File

@ -100,7 +100,7 @@
<span *ngIf="RMCommentCard"> <span *ngIf="RMCommentCard">
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations" <mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations"
formControlName="is_sufficiant_raw" required> formControlName="is_sufficiant_raw" >
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let val of RMsufficientList" [value]="val.value" [disabled]="val.disabled"> <mat-option *ngFor="let val of RMsufficientList" [value]="val.value" [disabled]="val.disabled">
{{val.isdisplayvalue}} {{val.isdisplayvalue}}
@ -386,7 +386,7 @@
<br> <br>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations" <mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations"
formControlName="is_sufficiant_finished_and_traded_goods" required> formControlName="is_sufficiant_finished_and_traded_goods">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let val of TGsufficientList" [value]="val.value" [disabled]="val.isdisabled"> <mat-option *ngFor="let val of TGsufficientList" [value]="val.value" [disabled]="val.isdisabled">
{{val.isdisplayvalue}} {{val.isdisplayvalue}}
@ -502,7 +502,7 @@
<br> <br>
<mat-form-field style="width:90%"> <mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of finished / goods observed, sufficient considering the size of operations" <mat-select placeholder="Is the stock of finished / goods observed, sufficient considering the size of operations"
formControlName="is_sufficiant_service_goods" required> formControlName="is_sufficiant_service_goods">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option *ngFor="let val of SPsufficientList" [value]="val.value" [disabled]="val.isdisabled"> <mat-option *ngFor="let val of SPsufficientList" [value]="val.value" [disabled]="val.isdisabled">
{{val.isdisplayvalue}} {{val.isdisplayvalue}}