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

CCAFS · Feb 15, 2024 · 1de7ffc · 1de7ffc
2 parents 4bcc951 + a59c55b
commit 1de7ffc
Showing 1 changed file with 12 additions and 23 deletions.
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
@@ -1551,7 +1551,7 @@
               [@projectPartnerMacro element=priorityAction!{} name="deliverable.shfrmPriorityActions[${priorityAction_index}]" index=priorityAction_index opened=(deliverable.shfrmPriorityActions?size = 1)/]
             [/#list] 
           [#else]
-            <p class="noContactMessage">[@s.text name="shfrmManagement.actionsEmpty" /]</p>     
+            [#--p class="noContactMessage">[@s.text name="shfrmManagement.actionsEmpty" /]</p> --]    
           [/#if] 
 
         </div>
@@ -1575,12 +1575,12 @@
 [/#macro]
 
 [#macro subactionsSelectsctrlList ]
-    [#list shfrmPriorityActions as priorityAction]
+    [#list (shfrmPriorityActions)![] as priorityAction]
       <div id="subactionSelect-${priorityAction.id}">
       [#--  ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]}  --]
         [#if priorityAction.shfrmSubActions?has_content]
           <div class="baseselect">
-              [@customForm.select name="" label=""  i18nkey="project.activities.deliverableSelect" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id"  displayFieldName="name"  multiple=false required=true  className=" deliverableList" disabled=!editable/] 
+              [@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>
 
         [/#if]   
@@ -1621,22 +1621,23 @@
         <div class="fullPartBlock" listname="(${name}.shfrmSubActions)![]">
 
           <div class="subSectionsSelector" actionindex="${index}">
+
+            [#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/]
+              </div>  
+            [/#if]
+
             <div class="deliverableWrapper simpleBox form-group" >
               [#if element.shfrmSubActions?has_content]
                 [#list (element.shfrmSubActions)![] as subActionListItem]
                     [@subActionItemMacro subActionItem=subActionListItem name="${name}.shfrmSubActions"  index=subActionListItem_index /]
                 [/#list]
               [#else]
-                <div class="input"><p>[@s.text name="shfrmManagement.subActionsEmpty" /]</p></div>
+                [#-- <div class="input"><p>[@s.text name="shfrmManagement.subActionsEmpty" /]</p></div>--]
               [/#if]
             </div>
-
-            [#if editable]
-             <h5 class="sectionSubTitle">[@s.text name="shfrmManagement.subActions.add" /] <small>[@customForm.req required=true /]</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/]
-            </div>  
-            [/#if]
           </div>
 
         </div>
@@ -1664,20 +1665,8 @@
     
 
     <div class="">
-      <h1>In sua => Actions size: ${allSubActions?size}</h1>
-
-
-      [#list allSubActions as ctrlistitemmmm]
-          <p>&nbsp;&nbsp;&nbsp;&nbsp; * ctrl   name: ${(ctrlistitemmmm.name)!'Empty name'} - id: ${(ctrlistitemmmm.id)!'Empty id'}</p> 
-      [/#list]
-
       <div class="form-group row">
-
-       
         [@customForm.elementsListComponent name="${name}.shfrmSubAction.id" elementType="shfrmSubAction" help="deliverable.shfrmContribution.subAction.help" helpIcon=false label="deliverable.shfrmContribution.subAction" elementList=shfrmSubAction listName="(element.deliverableShfrmPriorityAction.shfrmSubActions)![]" keyFieldName="id" displayFieldName="name" required=true /]
-        [#--
-        [@customForm.select name="${name}.shfrmSubAction.id" label="" i18nkey="deliverable.shfrmContribution.subAction" listName="(element.deliverableShfrmPriorityAction.shfrmSubActions)![]" keyFieldName="id"  displayFieldName="name" multiple=false required=true className="countriesSelect" disabled=!editable/]
---]
       </div>
            
     </div>