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

merge chnages : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-11-15 15:45:27 +05:30
parent b20d041983
commit f6735b90cf
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<<<<<<< HEAD
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'"> <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
<mat-form-field> <mat-form-field>
<input matInput placeholder="Name of person met" formControlName="name_person_met"> <input matInput placeholder="Name of person met" formControlName="name_person_met">
@ -32,11 +31,6 @@
<input matInput placeholder="Designation of person met" formControlName="designation_person_met"> <input matInput placeholder="Designation of person met" formControlName="designation_person_met">
</mat-form-field> </mat-form-field>
</div> </div>
=======
<mat-form-field *ngIf="employmentForm.controls['was_met'].value == 'yes'">
<input matInput placeholder="Name and designation of person met" formControlName="name_designation">
</mat-form-field>
>>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
<mat-form-field> <mat-form-field>
<mat-select placeholder="Salary amount confirmed ?" <mat-select placeholder="Salary amount confirmed ?"
formControlName="confirm_salary"> formControlName="confirm_salary">
@ -71,13 +65,10 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<<<<<<< HEAD
<input matInput placeholder="Net Monthly Salary" <input matInput placeholder="Net Monthly Salary"
formControlName="net_monthly_salary"> formControlName="net_monthly_salary">
=======
<input matInput placeholder="Net Take Home" <input matInput placeholder="Net Take Home"
formControlName="net_take_home"> formControlName="net_take_home">
>>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Bonus or Incentive" <input matInput placeholder="Bonus or Incentive"