merge: kms

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html

@@ -4,20 +4,25 @@
         <p>PD Address Details</p>
 <form class="address" [formGroup]="addressForm">
     <mat-form-field>
-        <input matInput placeholder="Address" formControlName="address">
+        <input matInput placeholder="Address" formControlName="address" required>
     </mat-form-field>
 
     <mat-form-field>
-        <mat-select placeholder="Address Type" formControlName="address_type">
+        <mat-select placeholder="Address Type" formControlName="address_type" required>
                 <mat-option value="{{m_addressType.address_type_id}}"
                 *ngFor="let m_addressType of addressData">{{m_addressType.address_type}}
     </mat-option>
         </mat-select>
     </mat-form-field>
+
+
+    <mat-form-field *ngIf="addressForm.controls['address_type'].value == 12">
+            <input matInput placeholder="Address Type Others" formControlName="address_type_others">
+    </mat-form-field>
  
     <mat-form-field>
         
-        <mat-select placeholder="Locality" formControlName="locality">
+        <mat-select placeholder="Locality" formControlName="locality" required>
             <mat-option value="{{m_locality.locality_id}}"
                                 *ngFor="let m_locality of localityData">{{m_locality.locality_name}}
                     </mat-option>
@@ -28,14 +33,14 @@
                formControlName="locality_others">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Approach to PD Location" formControlName="pd_location">
+        <mat-select placeholder="Approach to PD Location" formControlName="pd_location" required>
             <mat-option value="{{data.pd_location_approach_id}}"
                         *ngFor="let data of locationdata">{{data.description}}
             </mat-option>
         </mat-select>
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Comment on Locality" formControlName="comment_locality">
+        <mat-select placeholder="Comment on Locality" formControlName="comment_locality" required>
             <mat-option value="{{data.comments_on_locality_id}}"
                         *ngFor="let data of commentData">{{data.rating}}
             </mat-option>
@@ -43,12 +48,41 @@
     </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Customer Behaviour"
-                    formControlName="customer_behaviour">
+                    formControlName="customer_behaviour" required>
             <mat-option value="{{data.customer_behaviour_id}}"
                         *ngFor="let data of customerData">{{data.description}}
             </mat-option>
         </mat-select>
     </mat-form-field>
+    <mat-form-field>
+            <mat-select placeholder="Ownership" formControlName="address_ownership">
+                <mat-option value="{{ownerShip.id}}"
+                                    *ngFor="let ownerShip of ownerShipData">
+                            {{ownerShip.name}}
+                        </mat-option>
+            </mat-select>
+    </mat-form-field>
+    
+    <mat-form-field>
+            <mat-select placeholder="Is there any business activity is being run?"
+                        formControlName="bussiness_activity" required>
+                <mat-option value="yes">Yes</mat-option>
+                <mat-option value="no">No</mat-option>
+            </mat-select>
+    </mat-form-field>
+    
+    <mat-form-field *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'">
+                <mat-select placeholder="Bussiness Type" formControlName="bussiness_address_type">
+                        <mat-option value="{{m_addressType.address_type_id}}"
+                        *ngFor="let m_addressType of addressData">{{m_addressType.address_type}}
+                        </mat-option>
+                </mat-select>
+    </mat-form-field>
+            
+    <mat-form-field *ngIf="addressForm.controls['bussiness_address_type'].value == 12">
+                    <input matInput placeholder="Bussiness Address Type Others" formControlName="bussiness_address_type_others">
+    </mat-form-field>
+
     <mat-card>
         <mat-card-header>
             <p>Neighbourhood</p>     
@@ -56,31 +90,48 @@
         <div formArrayName="neighbourhood">
             <div *ngFor="let item of addressForm.controls.neighbourhood['controls']; let i=index" >
                 <mat-card-content class="matcard" [formGroup]="item">
+                <div>
                     <mat-form-field>
                         <input matInput placeholder="Neighbour Name"
-                               formControlName="name">
+                               formControlName="name" required>
                     </mat-form-field>
+                </div>
+                <div>
                     <mat-form-field>
                         <mat-select placeholder="Do you know"
-                                    formControlName="do_you_know">
+                                    formControlName="do_you_know" required>
                             <mat-option value="{{m_neighbourStatus}}"
                 *ngFor="let m_neighbourStatus of neighbourStatusData">{{m_neighbourStatus}}
                  </mat-option>
                         </mat-select>
                     </mat-form-field>
                     <mat-form-field>
+
+                            <mat-select placeholder="Is the applicant owner"
+                                        formControlName="is_owner" required>
+                
+                                <mat-option value="{{m_applicantOwner}}"
+                                        *ngFor="let m_applicantOwner of applicantOwnerData">{{m_applicantOwner}}
+                                    </mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                    </div>
+                    <!-- <mat-form-field>
                         <input matInput placeholder="How long do you know the applicant"
                                formControlName="how_long">
-                    </mat-form-field>
-                    <mat-form-field>
-                        <mat-select placeholder="Is the applicant owner"
-                                    formControlName="is_owner">
-            
-                            <mat-option value="{{m_applicantOwner}}"
-                                    *ngFor="let m_applicantOwner of applicantOwnerData">{{m_applicantOwner}}
-                                </mat-option>
-                        </mat-select>
-                    </mat-form-field>
+                    </mat-form-field> -->
+                    <div>
+                            <label>How long do you know the applicant?</label>
+                            <br>
+                                <mat-form-field>
+                                    <input matInput type="number" placeholder="Year" formControlName="how_long_year" required min='0'>
+                                </mat-form-field>
+                                <mat-form-field>
+                                    <input matInput type="number" placeholder="Month" formControlName="how_long_month" required min='0' max='12'>
+                                </mat-form-field>
+                        </div>
+
+                    
                     <button type="button" matTooltip="Add More Neighbour Details" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i==0"
                             (click)="addNeighbour($event)"
                            color="primary" style="float: right;">