From 6b05e46d8f4c48d451ef08a7e8ccc8186f846e41 Mon Sep 17 00:00:00 2001
From: habile-technologies
 <83582152+habile-technologies@users.noreply.github.com>
Date: Fri, 21 May 2021 18:29:42 +0530
Subject: [PATCH] Not able to create the client address due to missing street
 field in UI (#3385)

* Not able to create the client address due to missing street field in UI
#3249

* address issue fixes

* Edit address and add address bug fix
---
 app/global-translations/locale-en.json        |  1 +
 .../client/CreateClientController.js          | 18 ++++++------
 .../client/ViewClientController.js            |  2 +-
 .../configurations/AddressFormController.js   | 22 +++++++++------
 .../configurations/EditAddressController.js   | 28 ++++++++++++-------
 app/views/administration/AddressForm.html     | 13 +++++++++
 app/views/administration/EditAddress.html     |  9 ++++++
 app/views/clients/createclient.html           | 22 ++++++++++-----
 app/views/clients/viewclient.html             |  8 ++++++
 9 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
index af668e42..6715b488 100644
--- a/app/global-translations/locale-en.json
+++ b/app/global-translations/locale-en.json
@@ -4284,6 +4284,7 @@
   "label.anchor.editrate": "Edit Rate",
   "label.error.rate.already.exist" : "Rate already exist.",
   "label.selectrate" : "Select Rate",
+   "label.input.street":"Street",
 
   "----End---": "--End of file--- "
 }
diff --git a/app/scripts/controllers/client/CreateClientController.js b/app/scripts/controllers/client/CreateClientController.js
index 03bafddf..bda0fd0e 100755
--- a/app/scripts/controllers/client/CreateClientController.js
+++ b/app/scripts/controllers/client/CreateClientController.js
@@ -100,12 +100,11 @@
 
                 scope.enableAddress=data.isAddressEnabled;
 
-                if(scope.enableAddress===true)
-                {
-                    scope.addressTypes=data.address[0].addressTypeIdOptions;
-                    scope.countryOptions=data.address[0].countryIdOptions;
-                    scope.stateOptions=data.address[0].stateProvinceIdOptions;
-
+                	   if (scope.enableAddress === true) {
+                           scope.addressTypes = data.address[0].addressTypeIdOptions;
+                           scope.countryOptions = data.address.countryIdOptions;
+                           scope.stateOptions = data.address.stateProvinceIdOptions;
+                       
                     resourceFactory.addressFieldConfiguration.get({entity:entityname},function(data){
 
                         for(var i=0;i<data.length;i++)
@@ -320,14 +319,13 @@
                         {
                             temp.addressTypeId=scope.addressArray[i].addressTypeId;
                         }
+                        if (scope.addressArray[i].street) {
+                            temp.street = scope.addressArray[i].street;
+                        }
                         if(scope.addressArray[i].addressLine1)
                         {
                             temp.addressLine1=scope.addressArray[i].addressLine1;
                         }
-                        if(scope.addressArray[i].street) 
-                        {
-                            temp.street=scope.addressArray[i].street;
-                        }
                         if(scope.addressArray[i].addressLine2)
                         {
                             temp.addressLine2=scope.addressArray[i].addressLine2;
diff --git a/app/scripts/controllers/client/ViewClientController.js b/app/scripts/controllers/client/ViewClientController.js
index 40866f6b..9ae5bdb2 100644
--- a/app/scripts/controllers/client/ViewClientController.js
+++ b/app/scripts/controllers/client/ViewClientController.js
@@ -39,7 +39,7 @@
                         for(var i=0;i<data.length;i++)
                         {
                             data[i].field='scope.view.'+data[i].field;
-                            eval(data[i].field+"="+data[i].is_enabled);
+                            eval(data[i].field+"="+data[i].isEnabled);
 
                         }
 
diff --git a/app/scripts/controllers/configurations/AddressFormController.js b/app/scripts/controllers/configurations/AddressFormController.js
index b500cae7..1885d864 100644
--- a/app/scripts/controllers/configurations/AddressFormController.js
+++ b/app/scripts/controllers/configurations/AddressFormController.js
@@ -22,15 +22,19 @@
           
 
 
-                for(var i=0;i<data.length;i++)
-                {
-                    data[i].field='$scope.'+data[i].field;
-                    eval(data[i].field+"="+data[i].is_enabled);
+                   for(var i=0;i<data.length;i++)
+                        {
+                            data[i].field='$scope.'+data[i].field;
+                            if(data[i].is_enabled == undefined) {
+                                //For dev.mifos.io or demo.mifos.io
+                                eval(data[i].field+"="+data[i].isEnabled);
+                            } else {
+                                //For fineract server
+                                eval(data[i].field+"="+data[i].is_enabled);
+                            }
+                        }
 
-                }
-
-
-            })
+                    })
             $scope.routeTo=function()
             {
                 location.path('/viewclient/'+clientId);
@@ -82,4 +86,4 @@
     });
 
 }
-(mifosX.controllers || {}));
\ No newline at end of file
+(mifosX.controllers || {}));
diff --git a/app/scripts/controllers/configurations/EditAddressController.js b/app/scripts/controllers/configurations/EditAddressController.js
index 4a98b386..982cc8a5 100644
--- a/app/scripts/controllers/configurations/EditAddressController.js
+++ b/app/scripts/controllers/configurations/EditAddressController.js
@@ -32,17 +32,20 @@
 
 
 
+                   for(var i=0;i<data.length;i++)
+                        {
+                            data[i].field='$scope.'+data[i].field;
+                            if(data[i].is_enabled == undefined) {
+                                //For dev.mifos.io or demo.mifos.io
+                                eval(data[i].field+"="+data[i].isEnabled);
+                            } else {
+                                //For fineract server
+                                eval(data[i].field+"="+data[i].is_enabled);
+                            }
+                        }
 
-                for(var i=0;i<data.length;i++)
-                {
-                    data[i].field='$scope.'+data[i].field;
-                    eval(data[i].field+"="+data[i].is_enabled);
+                    })
 
-                }
-
-
-
-            })
             $scope.routeTo=function()
             {
                 location.path('/viewclient/'+clientId);
@@ -61,6 +64,11 @@
                     {
                         if(data[i].addressId==addressId)
                         {
+
+                            if(data[i].street&&$scope.street)
+                            {
+                                $scope.formData.street=data[i].street;
+                            }
                             if(data[i].addressLine1&&$scope.addressLine1)
                             {
                                 $scope.formData.addressLine1=data[i].addressLine1;
@@ -139,4 +147,4 @@
     });
 
 }
-(mifosX.controllers || {}));
\ No newline at end of file
+(mifosX.controllers || {}));
diff --git a/app/views/administration/AddressForm.html b/app/views/administration/AddressForm.html
index 12690ce3..8e58808e 100644
--- a/app/views/administration/AddressForm.html
+++ b/app/views/administration/AddressForm.html
@@ -17,6 +17,19 @@
 
                 </div>
             </div>
+            
+			<div class="form-group" ng-show="street">
+				<label class="control-label col-sm-2" for="street">{{
+					'label.input.street' | translate }}<span class="required">*</span>
+				</label>
+
+				<div class="col-sm-3">
+					<input type="text" id="street" name="street"
+						ng-model="formData.street" class="form-control">
+				</div>
+
+			</div>
+            
 
 
             <div class="form-group" ng-show="addressLine1">
diff --git a/app/views/administration/EditAddress.html b/app/views/administration/EditAddress.html
index 9ee6ab8c..46386c8d 100644
--- a/app/views/administration/EditAddress.html
+++ b/app/views/administration/EditAddress.html
@@ -7,6 +7,15 @@
 
 
 
+            <div class="form-group" ng-show="street">
+                <label class="control-label col-sm-2" for="street">{{ 'label.input.street' | translate }}<span class="required">*</span></label>
+
+                <div class="col-sm-3">
+                    <input type="text" id="street" name="street"  ng-model="formData.street"  class="form-control">
+                </div>
+
+            </div>
+
 
             <div class="form-group" ng-show="addressLine1">
                 <label class="control-label col-sm-2" for="addressline1">{{ 'label.input.addressline1' | translate }}</label>
diff --git a/app/views/clients/createclient.html b/app/views/clients/createclient.html
index 3dbffb9c..de054713 100755
--- a/app/views/clients/createclient.html
+++ b/app/views/clients/createclient.html
@@ -434,7 +434,7 @@
                            </div>
                            <div class="col-sm-3"  >
                               <select chosen="addressTypes" name="addressType" ng-model="addressArray[$index].addressTypeId"  class="form-control"
-                                 ng-options="addressType.id as addressType.name for addressType in addressTypes track by addressType.id"
+                                 ng-options="addressType.id as addressType.name for addressType in addressTypes "
                                  value="addressTypeId" required late-validate></select>
                            </div>
                            <div class = "col-sm-2">
@@ -442,6 +442,19 @@
                            </div>
                            <a ng-click="removeAddress($index)" uib-tooltip="{{'label.remove.row' | translate}}"><i class="fa fa-times"></i></a>
                         </div>
+                          <div class="form-group" ng-show="street">
+                           <div class="control-label col-sm-2">
+                              <label>{{ 'label.input.street' | translate }}<span class="required">*</span></label>
+                           </div>
+                           <div class="col-sm-3">
+                              <input type="text" name="street"  ng-model="addressArray[$index].street"  class="form-control" required late-validate/>
+                           </div>
+                           <div class = "col-sm-2">
+                              <form-validate valattributeform="createclientform" valattribute="street"/>
+                           </div>
+                        </div>
+                        
+                        
                         <div class="form-group" ng-show="addressLine1">
                            <label class="control-label col-sm-2" >{{ 'label.input.addressline1' | translate }}</label>
                            <div class="col-sm-3">
@@ -460,12 +473,7 @@
                               <input type="text"  name="addressline3" ng-model="addressArray[$index].addressLine3"  class="form-control">
                            </div>
                         </div>
-                        <div class="form-group" ng-show="street">
-                           <label class="control-label col-sm-2" >{{ 'label.input.street' | translate }}<span class="required">*</span></label>
-                           <div class="col-sm-3">
-                              <input type="text"  name="street" ng-model="addressArray[$index].street"  class="form-control">
-                           </div>
-                        </div>
+                     
                         <div class="form-group" ng-show="city">
                            <label class="control-label col-sm-2" >{{ 'label.input.city' | translate }}</label>
                            <div class="col-sm-3">
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html
index d24706bc..8ad62e7a 100755
--- a/app/views/clients/viewclient.html
+++ b/app/views/clients/viewclient.html
@@ -849,6 +849,14 @@
 							</tr>
 							</thead>
 							<tbody>
+							<tr ng-show="view.street">
+								<th >
+									{{'label.input.street' | translate }}
+								</th>
+								<td>
+									{{address.street}}
+								</td>
+							</tr>
 							<tr ng-show="view.addressLine1">
 								<th>
 									{{'label.input.addressline1' | translate }}