From 7ba81c23b81871154f037b24a8d895f5c885cfad Mon Sep 17 00:00:00 2001 From: Yecksin Mauricio <53352977+yecksin@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:44:11 -0500 Subject: [PATCH 1/3] :wrench: chore(deliverableMacros): hide subactionSelect templates --- .../main/webapp/WEB-INF/global/macros/deliverableMacros.ftl | 2 +- .../src/main/webapp/crp/css/projects/projectDeliverable.css | 3 +++ .../webapp/crp/js/projects/deliverables/deliverableShfrm.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) 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 index 946659d192..484dd3c492 100644 --- 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,7 +1579,7 @@
[#-- ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]} --] [#if priorityAction.shfrmSubActions?has_content] -
+
[@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/]
diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css index 10f7bf6ddb..f4a58a92b2 100644 --- 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 index f88ba358e0..db5e0c046a 100644 --- 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; } From e43106c7891bcf6df19e592ef671b519b3f5dcac Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Thu, 15 Feb 2024 15:24:36 -0500 Subject: [PATCH 2/3] :art: style(shfrm Contribution): Update labels in deliverables section --- marlo-web/src/main/resources/custom/aicrra.properties | 2 +- .../main/webapp/WEB-INF/global/macros/deliverableMacros.ftl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties index fe9cb07312..cc1e886ca6 100644 --- a/marlo-web/src/main/resources/custom/aicrra.properties +++ b/marlo-web/src/main/resources/custom/aicrra.properties @@ -1917,7 +1917,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 index 7cf85bad92..b42ee3e2d8 100644 --- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl @@ -1580,7 +1580,7 @@ [#-- ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]} --] [#if priorityAction.shfrmSubActions?has_content]
- [@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.priorityAction.help" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id" displayFieldName="name" multiple=false required=true className=" deliverableList" disabled=!editable/]
[/#if] @@ -1625,11 +1625,11 @@ [#if editable] [#--
[@s.text name="shfrmManagement.subActions.add" /] [@customForm.req required=false /]
--]
- [@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/]
[/#if] -
+
[#if element.shfrmSubActions?has_content] [#list (element.shfrmSubActions)![] as subActionListItem] [@subActionItemMacro subActionItem=subActionListItem name="${name}.shfrmSubActions" index=subActionListItem_index /] From 4a5d8fc81dbce5e6793fc6bbcca80b5dd7bbab3d Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Thu, 15 Feb 2024 15:27:26 -0500 Subject: [PATCH 3/3] :art: style(shfrm Contribution): Update sub action label deliverables section --- .../src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b42ee3e2d8..083b53af2c 100644 --- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl @@ -1580,7 +1580,7 @@ [#-- ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]} --] [#if priorityAction.shfrmSubActions?has_content]
- [@customForm.select name="" label="" i18nkey="deliverable.shfrmContribution.priorityAction.help" 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="name" multiple=false required=true className=" deliverableList" disabled=!editable/]
[/#if]