AMP-31090: Resolving Errors in the AF with disaggregated indicators.

Author: brianbrix

amp/src/main/java/org/dgfoundation/amp/onepager/components/features/me/singlecountry/AmpMEItemFeaturePanel.html

@@ -24,7 +24,7 @@
 			<tr>
 				<td colspan="2">
 					<div>
-						<div>
+						<div wicket:id="baseTargetContainer">
 							<b><span> <wicket:trn>
 								Base Values
 							</wicket:trn>: </span></b><span wicket:id = "base"></span> <b><span>

amp/src/main/java/org/dgfoundation/amp/onepager/components/features/me/singlecountry/AmpMEItemFeaturePanel.java

@@ -7,6 +7,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
@@ -100,16 +101,17 @@ public AmpMEItemFeaturePanel(String id, String fmName, final IModel<IndicatorAct
         final boolean hasDisaggregation = indicator.getObject().getDisaggregation() != null
                 && !indicator.getObject().getDisaggregation().isEmpty();
 
-        final Label indicatorBaseValueLabel = new Label("base", new LoadableDetachableModel<String>() {
+        WebMarkupContainer baseTargetContainer = new WebMarkupContainer("baseTargetContainer");
+        baseTargetContainer.setVisible(!hasDisaggregation);
+
+        baseTargetContainer.add(new Label("base", new LoadableDetachableModel<String>() {
             @Override
             protected String load() {
                 return globalBaseVal.getOriginalValue() != null ? String.valueOf(globalBaseVal.getOriginalValue()) : "N/A";
             }
-        });
-        indicatorBaseValueLabel.setVisible(!hasDisaggregation);
-        add(indicatorBaseValueLabel);
+        }));
 
-        final Label indicatorBaseDateLabel = new Label("baseDate", new LoadableDetachableModel<String>() {
+        baseTargetContainer.add(new Label("baseDate", new LoadableDetachableModel<String>() {
             @Override
             protected String load() {
                 if (globalBaseVal.getOriginalValueDate() != null) {
@@ -119,20 +121,16 @@ protected String load() {
                     return "N/A";
                 }
             }
-        });
-        indicatorBaseDateLabel.setVisible(!hasDisaggregation);
-        add(indicatorBaseDateLabel);
+        }));
 
-        final Label indicatorTargetValueLabel = new Label("target", new LoadableDetachableModel<String>() {
+        baseTargetContainer.add(new Label("target", new LoadableDetachableModel<String>() {
             @Override
             protected String load() {
                 return globalTargetVal.getOriginalValue() != null ? String.valueOf(globalTargetVal.getOriginalValue()) : "N/A";
             }
-        });
-        indicatorTargetValueLabel.setVisible(!hasDisaggregation);
-        add(indicatorTargetValueLabel);
+        }));
 
-        final Label indicatorTargetDateLabel = new Label("targetDate", new LoadableDetachableModel<String>() {
+        baseTargetContainer.add(new Label("targetDate", new LoadableDetachableModel<String>() {
             @Override
             protected String load() {
                 if (globalTargetVal.getOriginalValueDate() != null) {
@@ -142,9 +140,9 @@ protected String load() {
                     return "N/A";
                 }
             }
-        });
-        indicatorTargetDateLabel.setVisible(!hasDisaggregation);
-        add(indicatorTargetDateLabel);
+        }));
+
+        add(baseTargetContainer);
         AmpMEActualValuesFormTableFeaturePanel valuesTable = new AmpMEActualValuesFormTableFeaturePanel("valuesSubsection", indicator, conn, "Actual Values", false, 7) {
             @Override
             protected void onConfigure() {