From 826d0e9c22a0f08760c618edb2278f77eb035501 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 22 Dec 2018 12:48:30 +0530
Subject: [PATCH] UI changes

---
 .../client-info/client-info.component.html    | 32 +++++++++----------
 .../employment-info.component.html            | 22 +++++++------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index aea09fcdc..1ba1c7b45 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -17,7 +17,7 @@
                                 <mat-card style="margin: 12px;">
                                     <h6 style="margin: 12px;">Raw Material #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width:30%">
                                             <mat-select placeholder="Manufacturing Product Name" formControlName="manufacturing_product_name">
                                                 <mat-option *ngFor="let pm of m_manufacturingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
                                             </mat-select>
@@ -25,23 +25,23 @@
                                         <!--<mat-form-field style="width: 100%">
                                             <input matInput placeholder="Raw Material Name" formControlName="manufacturing_raw_material_name">
                                         </mat-form-field>-->
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Client Name" formControlName="manufacturing_client_name">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Name" formControlName="manufacturing_contact_person_name">
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Mobile Number" formControlName="manufacturing_contact_person_mobile_number">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type">
                                                 <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
                                             </mat-select>
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%" *ngIf="items.get('manufacturing_payment_type').value == 3">
+                                        <mat-form-field style="width: 30%" *ngIf="items.get('manufacturing_payment_type').value == 3">
                                             <input matInput placeholder="Number of days of credit provided" formControlName="manufacturing_credit_days">
                                         </mat-form-field>
                                     </div>
@@ -75,7 +75,7 @@
                                 <mat-card style="margin: 12px;">
                                     <h6 style="margin: 12px;">Trading Product #{{l+1}}</h6>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Trading Product Name" formControlName="trade_product_name">
                                                 <mat-option *ngFor="let pm of m_tradingProducts[0]" [value]="pm.name">{{ pm.name }}</mat-option>
                                             </mat-select>
@@ -83,23 +83,23 @@
                                         <!--<mat-form-field style="width: 100%">
                                             <input matInput placeholder="Trade Product Name" formControlName="trade_product_name">
                                         </mat-form-field>-->
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Client Name" formControlName="trade_client_name">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name">
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Mobile Number" formControlName="trade_product_contact_person_mobile_number">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type">
                                                 <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
                                             </mat-select>
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%" *ngIf="items.get('trade_product_payment_type').value == 3">
+                                        <mat-form-field style="width: 30%" *ngIf="items.get('trade_product_payment_type').value == 3">
                                             <input matInput placeholder="Number of days of credit provided" formControlName="trade_product_credit_days">
                                         </mat-form-field>
                                     </div>
@@ -142,18 +142,18 @@
                                         <!--<mat-form-field style="width: 100%">
                                             <input matInput placeholder="Trade Product Name" formControlName="trade_product_name">
                                         </mat-form-field>-->
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Client Name" formControlName="service_provider_client_name">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Name" formControlName="service_provider_product_contact_person_name">
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Contact Person Mobile Number" formControlName="service_provider_product_contact_person_mobile_number">
                                         </mat-form-field>
-                                        <mat-form-field style="width: 100%">
+                                        <mat-form-field style="width: 30%">
                                             <mat-select placeholder="Payment Type" formControlName="service_provider_product_payment_type">
                                                 <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
                                             </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index 5aba83c46..ecfd75fbf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -74,32 +74,34 @@
                                         <mat-card-header>
                                             <p>Salary Details<p>
                                         </mat-card-header>
-                                        <mat-card-content class="matcard">
-                                                <mat-form-field>
+                                        <mat-card-content>
+                                            <div fxLayout="row wrap">
+                                                <div fxFlex="100">
+                                                <mat-form-field style="width: 33%">
                                                 <input matInput placeholder="Date of Salary" formControlName="which_date_the_salary_is_rcv" type="number" min='1' max='31'>
                                                 </mat-form-field>
-                                            <mat-form-field>
+                                            <mat-form-field style="width: 33%">
                                                 <input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary" (keypress)="keyPress($event)" required>
                                             </mat-form-field>
 
-                                            <mat-form-field>
+                                            <mat-form-field style="width:33%">
                                                 <input matInput placeholder="Net Monthly Salary"
                                                     formControlName="net_monthly_salary" (keypress)="keyPress($event)" required>
                                                 <!-- <input matInput placeholder="Net Take Home"
                                                     formControlName="net_take_home"> -->
                                             </mat-form-field>
-                                            <mat-form-field>
+                                            <mat-form-field style="width: 33%">
                                                 <input matInput placeholder="Bonus or Incentive"
                                                     formControlName="bonus_incentive" (keypress)="keyPress($event)" required>
                                             </mat-form-field>
 
-                                            <mat-form-field *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">            
+                                            <mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">            
                                                             <mat-select placeholder="Bonus Frequency" formControlName="bonus_frequency">
                                                                             <mat-option  *ngFor="let fd of frequency_data"  [value]="fd.frequency_id">{{ fd.name }}</mat-option>
                                                             </mat-select>
                                             </mat-form-field>
 
-                                            <mat-form-field *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">            
+                                            <mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_incentive'].value != '' && employmentForm.controls['bonus_incentive'].value != '0' ">            
                                                     <mat-select  placeholder="Type of Bonus" 
                                                                 formControlName="bonus_type">
                                                         <mat-option value="fixed">Fixed</mat-option>
@@ -107,10 +109,10 @@
                                                         <mat-option value="others">Others</mat-option>
                                                     </mat-select>
                                             </mat-form-field>
-                                            <mat-form-field *ngIf="employmentForm.controls['bonus_type'].value == 'others'">
+                                            <mat-form-field style="width: 33%" *ngIf="employmentForm.controls['bonus_type'].value == 'others'">
                                                     <input matInput placeholder="Bonus Type Others" formControlName="bonus_type_other">
                                             </mat-form-field> 
-                                            <mat-form-field>
+                                            <mat-form-field style="width: 33%">
                                                 <mat-select placeholder="Any Delays"
                                                     formControlName="any_delays">
                                                     <mat-option value="yes">Yes</mat-option>
@@ -119,6 +121,8 @@
                                                 <!-- <input matInput placeholder="Any Delays"
                                                     formControlName="any_delays"> -->
                                             </mat-form-field>
+                                            </div>
+                                            </div>
                                         </mat-card-content>
                                     </mat-card>
                                 </mat-card>