Merge branch 'aiccra-shfrm-contribution-functionality' into aiccra-dev

CCAFS · Feb 15, 2024 · d693359 · d693359
2 parents 1de7ffc + 4a5d8fc
commit d693359
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -1930,7 +1930,7 @@ shfrmManagement.priorityActions.set=Set the control list for Priority Actions:
 shfrmManagement.priorityActions.title=Title
 shfrmManagement.priorityActions.description=Description
 shfrmManagement.priorityActions.add=Add new priority action
-shfrmManagement.subActions.add=Add new sub-action
+shfrmManagement.subActions.add=Add new sub-action(s)
 shfrmManagement.subActions.title=Title
 shfrmManagement.subActions.description=Description
 shfrmManagement.deliverables.info=See {0} deliverables attached

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
@@ -1579,8 +1579,8 @@
       <div id="subactionSelect-${priorityAction.id}">
       [#--  ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]}  --]
         [#if priorityAction.shfrmSubActions?has_content]
-          <div class="baseselect">
-              [@customForm.select name="" label=""  i18nkey="deliverable.shfrmContribution.subAction.help" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className=" deliverableList" disabled=!editable/] 
+          <div class="baseselect hideSelect">
+              [@customForm.select name="" label=""  i18nkey="deliverable.shfrmContribution.subAction.help" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id"  displayFieldName="name"  multiple=false required=true  className=" deliverableList" disabled=!editable/] 
           </div>
 
         [/#if]   
@@ -1625,11 +1625,11 @@
             [#if editable]
               [#--<h5 class="sectionSubTitle">[@s.text name="shfrmManagement.subActions.add" /] <small>[@customForm.req required=false /]</small></h5>--]
               <div class="form-group subActionsSelector">  
-                [@customForm.select name="" label="" help="deliverable.shfrmContribution.subAction.help" helpIcon=false i18nkey="shfrmManagement.subActions.add" listName="${name}.shfrmPriorityAction.shfrmSubActions" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className=" deliverableList" disabled=!editable/]
+                [@customForm.select name="" label="" help="" helpIcon=false i18nkey="deliverable.shfrmContribution.subAction.help" listName="${name}.shfrmPriorityAction.shfrmSubActions" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className=" deliverableList" disabled=!editable/]
               </div>  
             [/#if]
 
-            <div class="deliverableWrapper simpleBox form-group" >
+            <div class="deliverableWrapper form-group" >
               [#if element.shfrmSubActions?has_content]
                 [#list (element.shfrmSubActions)![] as subActionListItem]
                     [@subActionItemMacro subActionItem=subActionListItem name="${name}.shfrmSubActions"  index=subActionListItem_index /]

diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
@@ -27,6 +27,9 @@ body .WOS_tag p{
   margin: 0px;
   width: 350px;
 }
+.hideSelect{
+  display: none;
+}
 .loading-WOS-container{
   display: flex;
   align-items: center;

diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js
@@ -631,6 +631,7 @@ function addPartnerEvent(e) {
 
 function cloneSubActionSelect(value) {
   var $select = $(`#subactionSelect-${value}`).find('.baseselect').clone(true);
+  $select.removeClass('hideSelect');
   return $select;
 }