artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 14:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3343: Missing address street field (#3344)

Browse Source 
merging the PRs as it is reviewed and approved
This commit is contained in:
Benura Abeywardena 2021-02-14 14:21:07 +05:30 committed by GitHub
parent 01e2a400dc
commit 9ea62d9394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/global-translations/locale-en.json
View File

@ -2671,6 +2671,7 @@
"label.input.addressline1": "Address Line 1",
"label.input.addressline2": "Address Line 2",
"label.input.addressline3": "Address Line 3",
"label.input.street": "Street",
"label.input.town_village": "Town / Village",
"label.input.county_district": "County / District",
"label.input.state_province": "State / Province",

7
app/scripts/controllers/client/CreateClientController.js
View File

@ -37,7 +37,6 @@
scope.tf = "HH:mm";
scope.clientId = routeParams.clientId;
var requestParams = {staffInSelectedOfficeOnly:true};
if (routeParams.groupId) {
requestParams.groupId = routeParams.groupId;
@ -109,8 +108,6 @@
resourceFactory.addressFieldConfiguration.get({entity:entityname},function(data){
for(var i=0;i<data.length;i++)
{
data[i].field='scope.'+data[i].field;
@ -327,6 +324,10 @@
{
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;

6
app/views/clients/createclient.html
View File

@ -460,6 +460,12 @@
<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">