merge : ps

This commit is contained in:
venbatechnologies@gmail.com 2019-04-20 13:32:46 +05:30
commit 0529c1f859
26 changed files with 40 additions and 39 deletions

View File

@ -113,7 +113,7 @@
<!-- <mat-error *ngIf="pdMain.fk_pd_type.hasError('required')">PD Type Required.</mat-error> -->
</mat-form-field>
<mat-form-field style="width: 28%">
<mat-form-field style="width: 60%">
<input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" OnlyNumber required autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{pdMain.loan_amount.value | numberToWords}} Only</mat-hint>
<!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->

View File

@ -15,7 +15,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>

View File

@ -14,7 +14,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label={{pageTitle}}>

View File

@ -81,7 +81,7 @@
</button>
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">

View File

@ -12,7 +12,7 @@
</button>
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label={{pageTitle}}>
<ng-template matTabContent>

View File

@ -11,7 +11,7 @@
</button>
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">

View File

@ -8,7 +8,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<ng-container *ngIf="waitLoading && existCompanyList.length > 0 ;">
<mat-card *ngFor="let companyList of existCompanyList">
<mat-card-header>

View File

@ -15,7 +15,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>

View File

@ -12,10 +12,11 @@
</h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
<form [formGroup]="_supplierQuesFrom" (submit)="onSubmit()" novalidate>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>
<mat-card *ngIf="manufacturingForm">
<h5 style="margin: 12px;padding:10px !important;">Manufacturing Product Details</h5>
<div formArrayName="manufacturing_details">

View File

@ -14,7 +14,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
@ -61,7 +61,7 @@
formControlName="others_loan_type">
<mat-error *ngIf="details.controls['others_loan_type'].hasError('required')">Loan Type Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%; height:105px;">
<mat-form-field style="width:80%; height:105px;">
<input matInput autocomplete="off" placeholder="Loan Amount"
formControlName="loan_amount" OnlyNumber type="text">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('loan_amount').value != ''">{{"&#8377;"}} {{details.get('loan_amount').value | numberToWords}} Only</mat-hint>
@ -116,7 +116,7 @@
formControlName="other_frequency">
<mat-error *ngIf="details.controls['other_frequency'].hasError('required')">Frequency" Required</mat-error>
</mat-form-field>
<mat-form-field *ngIf="details.get('frequency').value != ''" style="width:45%">
<mat-form-field *ngIf="details.get('frequency').value != ''" style="width:80%">
<input matInput autocomplete="off" [placeholder]="placeholderName[i] != '' ? placeholderName[i] : 'Instalment Amount' "
formControlName="emi" OnlyNumber type="text">

View File

@ -8,7 +8,7 @@
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" (click)="closeDialogue()"><mat-icon>close</mat-icon></button>
</div>
</h2>
<mat-dialog-content formArrayName="family_list">
<mat-dialog-content formArrayName="family_list" style="border-bottom: 2px solid #e2412f8f;">
<mat-card *ngFor="let family of _OtherForm.controls.family_list['controls']; let f = index;" [formGroupName]="f">
<mat-card-content>
<mat-form-field style="width: 40%">

View File

@ -11,7 +11,7 @@
</button>
</div>
</h2>
<mat-dialog-content formArrayName="applicant_list">
<mat-dialog-content formArrayName="applicant_list" style="border-bottom: 2px solid #e2412f8f;">
<mat-card *ngFor="let applicant of _OtherForm.controls.applicant_list['controls']; let r = index;"
[formGroupName]="r">
<mat-card-content>

View File

@ -12,7 +12,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>
@ -183,14 +183,14 @@
</mat-option>
</mat-select>
</mat-form-field> -->
<mat-form-field style="width: 33%">
<mat-form-field style="width: 80%">
<input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary"
OnlyNumber type="text" autocomplete="off" required>
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['gross_monthly_salary'].value != ''">{{"&#8377;"}} {{employmentForm.controls['gross_monthly_salary'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls['gross_monthly_salary'].hasError('required')">Gross Monthly Salary Required</mat-error>
</mat-form-field>
<mat-form-field style="width:33%">
<mat-form-field style="width:80%">
<input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary"
OnlyNumber type="text" autocomplete="off" required>
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['net_monthly_salary'].value != ''">{{"&#8377;"}} {{employmentForm.controls['net_monthly_salary'].value | numberToWords}} Only</mat-hint>
@ -198,36 +198,36 @@
<!-- <input matInput placeholder="Net Take Home"
formControlName="net_take_home"> -->
</mat-form-field>
<mat-form-field style="width: 33%">
<mat-form-field style="width: 80%">
<input matInput placeholder="Amount paid through Bank"
formControlName="amount_paid_through_bank" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['amount_paid_through_bank'].value != ''">{{"&#8377;"}} {{employmentForm.controls['amount_paid_through_bank'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls.amount_paid_through_bank.hasError('max')">Given Value is More than Net Salary</mat-error>
<mat-error *ngIf="employmentForm.controls.amount_paid_through_bank.hasError('min')">Given Value is Less than Net Salary</mat-error>
</mat-form-field>
<mat-form-field style="width: 33%">
<mat-form-field style="width: 80%">
<input matInput placeholder="Amount paid in Cash"
formControlName="amount_paid_in_cash" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != ''">{{"&#8377;"}} {{employmentForm.controls['amount_paid_in_cash'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls.amount_paid_in_cash.hasError('max')">Given Value is More than Net Salary</mat-error>
<mat-error *ngIf="employmentForm.controls.amount_paid_in_cash.hasError('min')">Given Value is Less than Net Salary</mat-error>
</mat-form-field>
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0">
<mat-form-field style="width: 38%" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0">
<mat-select placeholder="Is the Amount is Validated or Not" formControlName="check_validated">
<mat-option>Select</mat-option>
<mat-option value="validated">Validated</mat-option>
<mat-option value="not validated">Not Validated</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0 && employmentForm.controls['check_validated'].value == 'validated'">
<mat-form-field style="width: 38%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0 && employmentForm.controls['check_validated'].value == 'validated'">
<input matInput placeholder="How was it Validated" formControlName="how_was_it_validated">
</mat-form-field>
<mat-form-field style="width: 33%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0 && employmentForm.controls['check_validated'].value == 'not validated'">
<mat-form-field style="width: 38%;" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != '' && employmentForm.controls['amount_paid_in_cash'].value != 0 && employmentForm.controls['check_validated'].value == 'not validated'">
<input matInput placeholder="Why was it not Validated"
formControlName="why_was_it_not_validated">
</mat-form-field>
<mat-form-field style="width: 33%">
<mat-form-field style="width: 38%">
<mat-select placeholder="Is There Any Delay in Receiving the Salary" formControlName="any_delays">
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
@ -237,14 +237,14 @@
formControlName="any_delays"> -->
</mat-form-field>
<mat-form-field style="width: 33%">
<mat-form-field style="width: 80%">
<input matInput placeholder="Bonus or Incentive" formControlName="bonus_incentive"
OnlyNumber type="text" autocomplete="off" required>
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['bonus_incentive'].value != ''">{{"&#8377;"}} {{employmentForm.controls['bonus_incentive'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls['bonus_incentive'].hasError('required')">Bonus or Incentive Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-form-field style="width: 38%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Bonus Frequency" formControlName="bonus_frequency">
<mat-option>Select</mat-option>
<mat-option *ngFor="let fd of frequency_data" [value]="fd.frequency_id">{{
@ -252,7 +252,7 @@
</mat-select>
</mat-form-field>
<mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-form-field style="width: 38%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">
<mat-select placeholder="Type of Bonus" formControlName="bonus_type">
<mat-option>Select</mat-option>
<mat-option value="fixed">Fixed</mat-option>

View File

@ -11,7 +11,7 @@
</div>
</h2>
<form *ngIf="noRecordsFound" class="address" [formGroup]="familyForm">
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>

View File

@ -12,7 +12,7 @@
</h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
<form [formGroup]="_finalRemarkForm" (submit)="onSubmit()" novalidate>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-card>
<mat-form-field style="width:50%;">
<mat-select placeholder="Customer Behaviour" formControlName="final_custormer_remark_type">

View File

@ -11,7 +11,7 @@
</button>
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>

View File

@ -13,7 +13,7 @@
</button>
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>

View File

@ -15,7 +15,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">

View File

@ -12,7 +12,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">

View File

@ -20,7 +20,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group mat-align-tabs="center">
<mat-tab *ngFor="let types of check_type; let t = index" label="{{types.type_name}}">
<ng-template matTabContent>

View File

@ -14,7 +14,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">

View File

@ -11,7 +11,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>

View File

@ -17,7 +17,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-card>
<mat-card-header>
<mat-card-title>Property Details</mat-card-title>

View File

@ -13,7 +13,7 @@
</div>
</h2>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<div fxLayout="row wrap">
<div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100" class="m-gap p-gap" *ngFor="let ad of existing_rental_list let i = index;">
<mat-card>

View File

@ -13,7 +13,7 @@
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
<form [formGroup]="stockForms" (submit)="submitDetails($event); false;">
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>

View File

@ -12,7 +12,7 @@
</h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
<form [formGroup]="_supplierQuesFrom" (submit)="onSubmit()" novalidate>
<mat-dialog-content>
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>