Skip to content

Commit

Permalink
Merge branch 'aiccra-shfrm-contribution-functionality' into aiccra-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
kenjitm committed Feb 22, 2024
2 parents 1a2e9bb + 3030f80 commit 4d3483b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion marlo-web/src/main/resources/custom/aicrra.properties
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster

deliverable.shfrmContribution.question.reporting=Is this deliverable <b>contributing</b> to the Soil Health and Fertiliser Road Map (SHFRM) implementation:
deliverable.shfrmContribution.question.planning=Is this deliverable <b>expected</b> 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?
Expand Down Expand Up @@ -2703,6 +2703,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.
Expand Down
3 changes: 2 additions & 1 deletion marlo-web/src/main/resources/global.properties
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ deliverable.missing.activity.alert=There are {0} deliverable(s) in this cluster

deliverable.shfrmContribution.question.reporting=Is this deliverable <b>contributing</b> to the Soil Health and Fertiliser Road Map (SHFRM) implementation:
deliverable.shfrmContribution.question.planning=Is this deliverable <b>expected</b> 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?
Expand Down Expand Up @@ -2785,6 +2785,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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" 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/]
<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" /]
Expand Down

0 comments on commit 4d3483b

Please sign in to comment.