Merge branch 'aiccra-staging' into aiccra-dev

CCAFS · Mar 14, 2024 · d6f6894 · d6f6894
2 parents 23ba902 + d50e738
commit d6f6894
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 112 deletions.
diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/DeliverableAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/DeliverableAction.java
@@ -694,12 +694,15 @@ public void fillSoilIndicatorsText() {
         for (SoilIndicator soilIndicator : soilIndicators) {
           if (soilIndicator != null && soilIndicator.getIndicatorName() != null) {
             if (soilIndicatorsText == null) {
-              soilIndicatorsText = soilIndicator.getIndicatorName();
+              soilIndicatorsText = soilIndicatorsText + "(" + soilIndicator.getIndicatorName();
             } else {
-              soilIndicatorsText.concat(", " + soilIndicator.getIndicatorName());
+              soilIndicatorsText = soilIndicatorsText + ", " + soilIndicator.getIndicatorName();
             }
           }
-
+        }
+        if (soilIndicatorsText != null && !soilIndicatorsText.isEmpty()) {
+          soilIndicatorsText = soilIndicatorsText.replace("null", "");
+          soilIndicatorsText = soilIndicatorsText + ")";
         }
       }
     } catch (Exception e) {

diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/summaries/ReportingSummaryAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/summaries/ReportingSummaryAction.java
diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -2685,7 +2685,7 @@ project.deliverable.generalInformation.year=Year of expected completion
 project.deliverable.generalInformation.justification=Status justification
 project.deliverable.generalInformation.outcome=Outcome
 project.deliverable.generalInformation.keyOutput=Performance Indicators
-project.deliverable.generalInformation.keyOutput.help=If you select yes in SHFRM question, please make sure to select at least one SHFRM indicator
+project.deliverable.generalInformation.keyOutput.help=If you select yes in SHFRM question, please make sure to select at least one SHFRM indicator {0}
 project.deliverable.generalInformation.keyOutputNotice=If the indicator you are looking for is not listed, please ensure the indicator is mapped to this cluster by clicking here
 project.deliverable.generalInformation.keyOutputNotList1=Remember that you must to add cluster of activities
 project.deliverable.generalInformation.keyOutputNotList2=, then you will be able to select key outputs.

diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties
@@ -2776,7 +2776,7 @@ project.deliverable.generalInformation.year=Year of expected completion
 project.deliverable.generalInformation.justification=Status justification
 project.deliverable.generalInformation.outcome=Outcome
 project.deliverable.generalInformation.keyOutput=Key Output
-project.deliverable.generalInformation.keyOutput.help=If you select yes in SHFRM question, please make sure to select at least one SHFRM indicator
+project.deliverable.generalInformation.keyOutput.help=If you select yes in SHFRM question, please make sure to select at least one SHFRM indicator {0}
 project.deliverable.generalInformation.keyOutputNotice=Click here to add or edit the list of contribution to performance indicators
 project.deliverable.generalInformation.keyOutputNotList1=Remember that you must to add cluster of activities
 project.deliverable.generalInformation.keyOutputNotList2=, then you will be able to select key outputs.

diff --git a/marlo-web/src/main/resources/pentaho/crp/ProjectFullPDF(Planning).prpt b/marlo-web/src/main/resources/pentaho/crp/ProjectFullPDF(Planning).prpt
diff --git a/marlo-web/src/main/resources/pentaho/crp/ProjectFullPDF(Reporting).prpt b/marlo-web/src/main/resources/pentaho/crp/ProjectFullPDF(Reporting).prpt
diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableInfo.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableInfo.ftl
@@ -161,7 +161,7 @@
     <div class="form-group listindicators" >
 
 
-        [@customForm.elementsListComponent name="deliverable.crpOutcomes" elementType="crpProgramOutcome" elementList=(deliverable.crpOutcomes)![] label="project.deliverable.generalInformation.keyOutput" listName="programOutcomes" keyFieldName="id" help="project.deliverable.generalInformation.keyOutput.help" helpIcon=false displayFieldName="composedName" required=true maxLimit=3/]
+        [@customForm.elementsListComponent name="deliverable.crpOutcomes" elementType="crpProgramOutcome" elementList=(deliverable.crpOutcomes)![] label="project.deliverable.generalInformation.keyOutput" listName="programOutcomes" keyFieldName="id" help="project.deliverable.generalInformation.keyOutput.help" helpIcon=false paramText=soilIndicatorsText displayFieldName="composedName" required=true maxLimit=3/]
           <div class="note left">
             <a href="[@s.url namespace=namespace action="${crpSession}/contributionsCrpList"][@s.param name='projectID']${project.id?c}[/@s.param][#include "/WEB-INF/global/pages/urlGlobalParams.ftl" /][/@s.url]">
               <span class="glyphicon glyphicon-info-sign"></span> [@s.text name="project.deliverable.generalInformation.keyOutputNotice" /]