Merge branch 'master' into POC-140

src/app/models/address.model.ts

@@ -97,4 +97,53 @@ export class PersonAddress extends BaseModel {
   public set postalCode(v: string) {
     this._openmrsModel.postalCode = v;
   }
+  @serializable()
+  public get address8(): string {
+    return this._openmrsModel.address8;
+  }
+  public set address8(v: string) {
+    this._openmrsModel.address8 = v;
+  }
+  @serializable()
+  public get address9(): string {
+    return this._openmrsModel.address9;
+  }
+  public set address9(v: string) {
+    this._openmrsModel.address9 = v;
+  }
+  @serializable()
+  public get address10(): string {
+    return this._openmrsModel.address10;
+  }
+  public set address10(v: string) {
+    this._openmrsModel.address10 = v;
+  }
+  @serializable()
+  public get address11(): string {
+    return this._openmrsModel.address11;
+  }
+  public set address11(v: string) {
+    this._openmrsModel.address11 = v;
+  }
+  @serializable()
+  public get address12(): string {
+    return this._openmrsModel.address12;
+  }
+  public set address12(v: string) {
+    this._openmrsModel.address12 = v;
+  }
+  @serializable()
+  public get address13(): string {
+    return this._openmrsModel.address13;
+  }
+  public set address13(v: string) {
+    this._openmrsModel.address13 = v;
+  }
+  @serializable()
+  public get address14(): string {
+    return this._openmrsModel.address14;
+  }
+  public set address14(v: string) {
+    this._openmrsModel.address14 = v;
+  }
 }

src/app/openmrs-api/patient-resource.service.ts

@@ -16,7 +16,7 @@ export class PatientResourceService {
     'causeOfDeath,preferredName:(uuid,preferred,givenName,middleName,familyName),' +
     'attributes:(uuid,display,value,attributeType,dateCreated,dateChanged),preferredAddress:(uuid,preferred,address1,address2,cityVillage,longitude,' +
     'stateProvince,latitude,country,postalCode,countyDistrict,address3,address4,address5' +
-    ',address6,address7,address15)))';
+    ',address6,address7,address15,address8,address9,address10,address11,address12,address13,address14)))';
 
   constructor(
     protected http: HttpClient,

src/app/patient-dashboard/common/formentry/form-submission.service.ts

@@ -50,7 +50,6 @@ export class FormSubmissionService {
     payloadTypes: Array<string> = this.payloadTypes,
     optionalArg?: any
   ): Observable<any> {
-    console.log('ola', form);
     // create payload batch to be submitted on concurrently
     this.optionalSubmissionArgs = optionalArg;
     const payloadBatch: Array<Observable<any>> = this.createPayloadBatch(