merge : kms
This commit is contained in:
gandhimathi
parent
f339d46ebe
commit
74c4b8aff3
@ -19,7 +19,7 @@
|
||||
<input matInput placeholder="Net Profit / Loss" formControlName="financial_net_profit" (change)="calMargin( i, details); calYearVariation( i, details)" type="number" required>
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<input matInput placeholder="Margin" formControlName="financial_margin" (keypress)="keyPress($event)" required>
|
||||
<input matInput placeholder="Net Profit to Sales %" formControlName="financial_margin" (keypress)="keyPress($event)" required>
|
||||
</mat-form-field>
|
||||
<mat-form-field *ngIf="i != 0">
|
||||
<input matInput [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" placeholder="Variation from Previous Year" formControlName="financial_variation" (keypress)="keyPress($event)">
|
||||
@ -42,7 +42,7 @@
|
||||
</mat-card>
|
||||
<mat-card>
|
||||
<mat-card-header>
|
||||
<p>Estimated Value<p>
|
||||
<p>Actual Values as per Customer<p>
|
||||
</mat-card-header>
|
||||
<div formArrayName="estimated_value">
|
||||
<div *ngFor="let details of financialForm.controls.estimated_value['controls']; let i=index"
|
||||
@ -63,9 +63,9 @@
|
||||
<mat-form-field *ngIf="i != 0">
|
||||
<input matInput [ngClass]="{'highlight': details.controls['estimate_variation'].value >= 40 || details.controls['estimate_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="estimate_variation" (keypress)="keyPress($event)">
|
||||
</mat-form-field>
|
||||
<mat-form-field>
|
||||
<!--<mat-form-field>
|
||||
<input matInput placeholder="Reason For Major Difference" formControlName="estimate_reason" required>
|
||||
</mat-form-field>
|
||||
</mat-form-field>-->
|
||||
<button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
|
||||
matTooltip="Add More Estimated Value" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" *ngIf="i==0">
|
||||
<mat-icon>add</mat-icon>
|
||||
|
||||
@ -109,7 +109,7 @@ export class FinancialInfoComponent implements OnInit {
|
||||
estimate_net_profit: ['', Validators.compose([Validators.required, Validators.pattern(/^-?[1-9]\d*|0$/)])],
|
||||
estimate_margin: ['', Validators.compose([Validators.required])],
|
||||
estimate_variation: [''],
|
||||
estimate_reason: ['', Validators.compose([Validators.required])],
|
||||
// estimate_reason: ['', Validators.compose([Validators.required])],
|
||||
});
|
||||
}
|
||||
addDate() {
|
||||
|
||||
@ -59,19 +59,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<div fxLayout="row" fxLayoutGap="14px" fxLayoutAlign="start none">
|
||||
<div fxFlex="30">
|
||||
<mat-form-field style="width:100%">
|
||||
<!-- <div fxFlex="30">
|
||||
<mat-form-field style="width:100%">
|
||||
<mat-select (selectionChange)="selectedFreqPurchase($event)" placeholder="Frequency of Purchase" formControlName="frequency_of_purchase" required>
|
||||
<mat-option *ngFor="let feq of m_freqOfPurchase" [value]="feq.frequency_id">{{ feq.name }}</mat-option>
|
||||
</mat-select>
|
||||
<!-- <mat-error *ngIf="sup.controls['frequency_of_purchase'].hasError('required') && sup.controls['frequency_of_purchase'].touched" class="mat-text-warn">PaymentMode Type Required.</mat-error> -->
|
||||
</mat-form-field>
|
||||
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div *ngIf="sup.get('frequency_of_purchase').value == 8" fxFlex="30">
|
||||
<mat-form-field class="ml-xs example-full-width">
|
||||
<input matInput placeholder="Others Details" formControlName="freq_purchase_others_text_value">
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div fxFlex="30" style="text-align:center;">
|
||||
<span *ngIf="_supplierQuesFrom.controls.supplier_details.controls.length > 1" (click)="removeLanguage(i)">
|
||||
|
||||
@ -50,7 +50,7 @@ public m_paymentModeType= [];
|
||||
// 'name': 'Combination of Both'
|
||||
// },
|
||||
// ];
|
||||
public m_freqOfPurchase= [];
|
||||
//public m_freqOfPurchase= [];
|
||||
// public m_freqOfPurchase= [
|
||||
// {
|
||||
// 'id': "1",
|
||||
@ -95,24 +95,24 @@ public m_freqOfPurchase= [];
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.getM_FreqOfPurchase();
|
||||
// this.getM_FreqOfPurchase();
|
||||
this.getM_PaymentModeType();
|
||||
this.getPdSupplierFormDetails();
|
||||
}
|
||||
|
||||
// ==================
|
||||
|
||||
getM_FreqOfPurchase() {
|
||||
this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
|
||||
data => {
|
||||
this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
|
||||
},
|
||||
error => {
|
||||
//getM_FreqOfPurchase() {
|
||||
// this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
|
||||
// data => {
|
||||
// this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
|
||||
// },
|
||||
// error => {
|
||||
// this.notifier.notify('warning', 'No Category Records Found.!');
|
||||
// this.m_assets_type = "No Category Records Found.";
|
||||
}
|
||||
)
|
||||
}
|
||||
/// }
|
||||
// )
|
||||
// }
|
||||
|
||||
getM_PaymentModeType() {
|
||||
this.pdTrigerService.getAllMasterDatas('PAYMENTMODE').subscribe(
|
||||
@ -183,8 +183,8 @@ apiLoadFinish: boolean = false;
|
||||
payment_mode: ['', Validators.compose([Validators.required])],
|
||||
per_of_immediate_advance_payment:[''],
|
||||
credit_period:[''],
|
||||
frequency_of_purchase: ['', Validators.compose([Validators.required])],
|
||||
freq_purchase_others_text_value: ['']
|
||||
// frequency_of_purchase: ['', Validators.compose([Validators.required])],
|
||||
// freq_purchase_others_text_value: ['']
|
||||
});
|
||||
}
|
||||
|
||||
@ -196,8 +196,8 @@ apiLoadFinish: boolean = false;
|
||||
payment_mode: [data.payment_mode, Validators.compose([Validators.required])],
|
||||
per_of_immediate_advance_payment:[data.per_of_immediate_advance_payment || ''],
|
||||
credit_period:[data.credit_period || ''],
|
||||
frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])],
|
||||
freq_purchase_others_text_value: [data.freq_purchase_others_text_value || '']
|
||||
//frequency_of_purchase: [data.frequency_of_purchase, Validators.compose([Validators.required])],
|
||||
//freq_purchase_others_text_value: [data.freq_purchase_others_text_value || '']
|
||||
});
|
||||
}
|
||||
|
||||
@ -213,9 +213,9 @@ apiLoadFinish: boolean = false;
|
||||
mobile_number: val.mobile_number,
|
||||
payment_mode: val.payment_mode,
|
||||
per_of_immediate_advance_payment: val.per_of_immediate_advance_payment,
|
||||
credit_period: val.credit_period,
|
||||
frequency_of_purchase: val.frequency_of_purchase,
|
||||
freq_purchase_others_text_value: val.freq_purchase_others_text_value
|
||||
credit_period: val.credit_period
|
||||
// frequency_of_purchase: val.frequency_of_purchase,
|
||||
// freq_purchase_others_text_value: val.freq_purchase_others_text_value
|
||||
};
|
||||
const control = <FormArray>this._supplierQuesFrom.controls['supplier_details'];
|
||||
control.push(this.initDetailsWithdata(vals));
|
||||
|
||||
@ -24,12 +24,12 @@
|
||||
<mat-card style="max-height:400px;overflow: auto;">
|
||||
|
||||
<mat-card-content>
|
||||
<button (click)="mailnav.toggle()" color="primary" fxHide="false" fxshow.gt-sm mat-icon-button mat-raised-button>
|
||||
<button matTooltip="Menu" matTooltipPosition="above" (click)="mailnav.toggle()" color="primary" fxHide="false" fxshow.gt-sm mat-icon-button mat-raised-button>
|
||||
<mat-icon style="color: white;">short_text</mat-icon>
|
||||
</button>
|
||||
<mat-sidenav-container class="app-inner background-none shadow-none mail-db">
|
||||
<mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
|
||||
<button _ngcontent-c21="" [disabled]="actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);"><span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus ) }}</span></button>
|
||||
|
||||
|
||||
<!--{{ (currentPDStatus==pdStatusCheck.INPROGRESS)? 'COMPLETE':(currentPDStatus) }} -->
|
||||
<div *ngIf="categoryList != ''">
|
||||
@ -56,6 +56,9 @@
|
||||
<span class="mt-0">{{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }}</span>
|
||||
</mat-list-item>
|
||||
</mat-list>
|
||||
|
||||
<button _ngcontent-c21="" matTooltip="Complete Question" matTooltipPosition="above" [disabled]="actualQuestions!=answeredQuestions" class="compose-btn mat-warn mat-raised-button mb-1" (click)="changePDStatus(pdStatusCheck.COMPLETED);" style="margin-top:10px;"><span>{{currentPDStatus==pdStatusCheck.INPROGRESS ? 'COMPLETE':(currentPDStatus==pdStatusCheck.QC_COMPLETED ? 'QC COMPLETED' : currentPDStatus ) }}</span></button>
|
||||
|
||||
<!--<mat-list>-->
|
||||
<!--<mat-list-item (click)="OnSelectDirectForms(rentalDetail)" style="background-color:#e0e0e0">-->
|
||||
<!--<span class="mt-0">{{rentalDetail.form_name}}</span>-->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user