18F · hursey013 · Sep 27, 2018 · Sep 21, 2018 · Sep 24, 2018 · Sep 24, 2018
diff --git a/api/location.go b/api/location.go
@@ -24,10 +24,13 @@ const (
 	LayoutStreetCity                          = "Street, City"
 )
 
-// Special layout flags for e-QIP integration for Country elements with CountriesNoUS type
+// Special layout flags for e-QIP integration for...
 const (
+	// Country elements with CountriesNoUS type
 	LayoutBirthPlaceWithoutCountyNoUS = "Birthplace without County CountriesNoUS"
 	LayoutBirthPlaceNoUS              = "Birthplace CountriesNoUS"
+	// APOFPO elements
+	LayoutMilitaryAddress = "Military Address"
 )
 
 // Location is a basic input.

diff --git a/api/templates/drug-used.xml b/api/templates/drug-used.xml
@@ -0,0 +1,11 @@
+<!-- Derived from drug.xml -->
+{{with $dt := radio .}}
+{{if $dt | ne ""}}
+<DrugUsed>
+{{if $dt | drugType | eq "Other"}}
+<Explanation>{{$dt}}</Explanation>
+{{end}}
+<Type>{{$dt | drugType}}</Type>
+</DrugUsed>
+{{end}}
+{{end}}
diff --git a/api/templates/drug.xml b/api/templates/drug.xml
@@ -0,0 +1,10 @@
+{{with $dt := radio .}}
+{{if $dt | ne ""}}
+<Drug>
+{{if $dt | drugType | eq "Other"}}
+<Explanation>{{$dt}}</Explanation>
+{{end}}
+<Type>{{$dt | drugType}}</Type>
+</Drug>
+{{end}}
+{{end}}
diff --git a/api/templates/foreign-contacts.xml b/api/templates/foreign-contacts.xml
@@ -9,7 +9,7 @@
     <Contact ID="{{inc $index}}">
       {{if locationIsPostOffice $Item.Address}}
       <APOFPO>
-        <Address>{{location $Item.Address}}</Address>
+        <Address>{{militaryAddress $Item.Address}}</Address>
         <AddressComment></AddressComment>
       </APOFPO>
       {{else}}

diff --git a/api/templates/foreign-travel.xml b/api/templates/foreign-travel.xml
@@ -65,7 +65,7 @@
         VisitFamilyOrFriends="True"
         {{end}}
         {{if (checkboxHas $Item.Purpose "Other") | eq "True"}}
-        Other="Other"
+        Other="True"
         {{end}}
         />
       <Threatened>

diff --git a/api/templates/history-employment.xml b/api/templates/history-employment.xml
@@ -11,7 +11,7 @@
       <WorkHours>{{radio $Item.Status}}</WorkHours>
       {{- if locationIsPostOffice $Item.Address}}
       <APOFPO>
-        <Address>{{location $Item.Address}}</Address>
+        <Address>{{militaryAddress $Item.Address}}</Address>
         <AddressComment></AddressComment>
       </APOFPO>
       {{end}}
@@ -168,7 +168,7 @@
         <Title>{{text $supervisor.Title}}</Title>
         {{if locationIsPostOffice $supervisor.Address}}
         <APOFPO>
-          <Address>{{location $supervisor.Address}}</Address>
+          <Address>{{militaryAddress $supervisor.Address}}</Address>
           <AddressComment></AddressComment>
         </APOFPO>
         {{else}}
@@ -186,7 +186,7 @@
         <LegalName>{{nameLastFirst $Item.ReferenceName}}</LegalName>
         {{if locationIsPostOffice $Item.ReferenceAddress}}
         <APOFPO>
-          <Address>{{location $Item.ReferenceAddress}}</Address>
+          <Address>{{militaryAddress $Item.ReferenceAddress}}</Address>
           <AddressComment></AddressComment>
         </APOFPO>
         {{else}}

diff --git a/api/templates/history-residence.xml b/api/templates/history-residence.xml
@@ -5,7 +5,7 @@
     <Residency ID="{{inc $index}}">
       {{if locationIsPostOffice $Item.Address}}
       <APOFPO>
-        <Address>{{location $Item.Address}}</Address>
+        <Address>{{militaryAddress $Item.Address}}</Address>
         <AddressComment>{{textarea $Item.Comments}}</AddressComment>
       </APOFPO>
       {{else}}
@@ -20,7 +20,7 @@
       <Verifier>
         {{if locationIsPostOffice $Item.ReferenceAddress}}
         <APOFPO>
-          <Address>{{location $Item.ReferenceAddress}}</Address>
+          <Address>{{militaryAddress $Item.ReferenceAddress}}</Address>
           <AddressComment>{{textarea $Item.Comments}}</AddressComment>
         </APOFPO>
         {{else}}

diff --git a/api/templates/identification-haircolor.xml b/api/templates/identification-haircolor.xml
@@ -1 +1 @@
-<HairColor>{{ radio . }}</HairColor>
+<HairColor>{{radio . | hairType}}</HairColor>
diff --git a/api/templates/location-address-apofpo-state-zipcode.xml b/api/templates/location-address-apofpo-state-zipcode.xml
@@ -0,0 +1,4 @@
+<Address>{{.props.street}}</Address>
+<ApoFpo>{{.props.city}}</ApoFpo>
+<State>{{toUpper .props.state}}</State>
+<ZipCode>{{.props.zipcode}}</ZipCode>
diff --git a/api/templates/relatives-and-associates.xml b/api/templates/relatives-and-associates.xml
@@ -59,7 +59,7 @@
       {{if not $deceased }}
       {{if locationIsPostOffice $Item.Address}}
       <APOFPO>
-        <Address>{{location $Item.Address}}</Address>
+        <Address>{{militaryAddress $Item.Address}}</Address>
         <AddressComment></AddressComment>
         <Answer></Answer>
         <AnswerComment></AnswerComment>

diff --git a/api/templates/spouse-present-marriage.xml b/api/templates/spouse-present-marriage.xml
@@ -4,7 +4,7 @@
   <CurrentSpouse ID="1">
     {{if locationIsPostOffice $Item.Address}}
     <APOFPO>
-      <Address>{{location $Item.Address}}</Address>
+      <Address>{{militaryAddress $Item.Address}}</Address>
       <AddressComment></AddressComment>
       <!-- TODO -->
       <Answer></Answer>

diff --git a/api/templates/substance-drug-ordered.xml b/api/templates/substance-drug-ordered.xml
@@ -33,10 +33,7 @@
         <Comment></Comment>
         <Explanation>{{textarea $Item.Explanation}}</Explanation>
       </CounselingOrderedBy>
-      <Drug>
-        <Explanation></Explanation>
-        <Type>{{radio $Item.DrugType}}</Type>
-      </Drug>
+      {{tmpl "drug.xml" $Item.DrugType}}
       {{if branch $Item.ActionTaken | eq "Yes"}}
       <Doctor>
         <Name>

diff --git a/api/templates/substance-drug-purchase.xml b/api/templates/substance-drug-purchase.xml
@@ -5,10 +5,7 @@
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
     <Activity ID="{{inc $index}}">
-      <Drug>
-        <Explanation></Explanation>
-        <Type>{{radio $Item.DrugType}}</Type>
-      </Drug>
+      {{tmpl "drug.xml" $Item.DrugType}}
       <FirstInvolvementDate Type="{{dateEstimated $Item.FirstInvolvement}}">{{monthYear $Item.FirstInvolvement}}</FirstInvolvementDate>
       <MostRecentInvolvementDate Type="{{dateEstimated $Item.RecentInvolvement}}">{{monthYear $Item.RecentInvolvement}}</MostRecentInvolvementDate>
       <Nature>{{textarea $Item.NatureOfInvolvement}}</Nature>

diff --git a/api/templates/substance-drug-usage.xml b/api/templates/substance-drug-usage.xml
@@ -5,10 +5,7 @@
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
     <Instance ID="{{inc $index}}">
-      <DrugUsed>
-        <Explanation></Explanation>
-        <Type>{{radio $Item.DrugType}}</Type>
-      </DrugUsed>
+      {{tmpl "drug-used.xml" $Item.DrugType}}
       <FirstUseDate Type="{{dateEstimated $Item.FirstUse}}">{{monthYear $Item.FirstUse}}</FirstUseDate>
       <MostRecentUseDate Type="{{dateEstimated $Item.RecentUse}}">{{monthYear $Item.RecentUse}}</MostRecentUseDate>
       <Nature>{{textarea $Item.NatureOfUse}}</Nature>

diff --git a/api/templates/substance-drug-voluntary.xml b/api/templates/substance-drug-voluntary.xml
@@ -5,10 +5,7 @@
     {{range $index, $item := .props.List.props.items}}
     {{with $Item := $item.Item}}
     <Consultation ID="{{inc $index}}">
-      <Drug>
-        <Type>{{radio $Item.DrugType}}</Type>
-        <Explanation></Explanation>
-      </Drug>
+      {{tmpl "drug.xml" $Item.DrugType}}
       <Doctor>
         <Name>
           <Last>{{doctorLastName $Item.TreatmentProvider}}</Last>

diff --git a/api/testdata/complete-scenarios/test5.xml b/api/testdata/complete-scenarios/test5.xml
@@ -4274,10 +4274,6 @@
                       <Answer MedicalProfessional="True"/>
                       <Explanation>Doctor said I needed to go</Explanation>
                     </CounselingOrderedBy>
-                    <Drug>
-
-
-      </Drug>
                     <SuccessfullyCompletedTreatmentProgram>
 
       </SuccessfullyCompletedTreatmentProgram>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<HairColor>{{ radio . }}</HairColor>
		<HairColor>{{radio . \| hairType}}</HairColor>