From 3030f803c891c588dfa42213f9607909031ddfcf Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Thu, 22 Feb 2024 09:04:53 -0500 Subject: [PATCH] :wrench: chore(Shfrm contribution): Update labels in soil deliverables section --- marlo-web/src/main/resources/custom/aicrra.properties | 3 ++- marlo-web/src/main/resources/global.properties | 3 ++- .../main/webapp/WEB-INF/crp/views/projects/deliverableInfo.ftl | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties index 1f7a27271b..178b80b1d3 100644 --- a/marlo-web/src/main/resources/custom/aicrra.properties +++ b/marlo-web/src/main/resources/custom/aicrra.properties @@ -930,7 +930,7 @@ deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.planning=Is this deliverable expected to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: -deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM indicator in the next question +deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM priority action and sub-action in the next question deliverable.shfrmContribution.narrative.reporting=Provide a short narrative on the contribution of this deliverable to the SHFRM deliverable.shfrmContribution.narrative.planning=Provide a short narrative on the expected contribution of this deliverable to the SHFRM deliverable.shfrmContribution.priorityAction=To which priority action of the SHFRM is this deliverable contributing to? @@ -2682,6 +2682,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 the SHFRM indicator 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 index 7afffa59a4..2544cfd073 100644 --- a/marlo-web/src/main/resources/global.properties +++ b/marlo-web/src/main/resources/global.properties @@ -933,7 +933,7 @@ deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster deliverable.shfrmContribution.question.reporting=Is this deliverable contributing to the Soil Health and Fertiliser Road Map (SHFRM) implementation: deliverable.shfrmContribution.question.planning=Is this deliverable expected to contribute to the Soil Health and Fertiliser Road Map (SHFRM) implementation: -deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM indicator in the next question +deliverable.shfrmContribution.question.help=If you select yes, please make sure to select the SHFRM priority action and sub-action in the next question deliverable.shfrmContribution.narrative.reporting=Provide a short narrative on the contribution of this deliverable the SHFRM deliverable.shfrmContribution.narrative.planing=Provide a short narrative on the expected contribution of this deliverable the SHFRM deliverable.shfrmContribution.priorityAction=To which priority action of the SHFRM is this deliverable contributing to? @@ -2773,6 +2773,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 the SHFRM indicator 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/webapp/WEB-INF/crp/views/projects/deliverableInfo.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/deliverableInfo.ftl index 0ed4bfdd8d..a92c1360bd 100644 --- 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 @@
- [@customForm.elementsListComponent name="deliverable.crpOutcomes" elementType="crpProgramOutcome" elementList=(deliverable.crpOutcomes)![] label="project.deliverable.generalInformation.keyOutput" listName="programOutcomes" keyFieldName="id" 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 displayFieldName="composedName" required=true maxLimit=3/]
[@s.text name="project.deliverable.generalInformation.keyOutputNotice" /]