diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/FeedbackStatusAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/FeedbackStatusAction.java index ba0d4da0a0..fb73980576 100644 --- a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/FeedbackStatusAction.java +++ b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/projects/FeedbackStatusAction.java @@ -33,6 +33,7 @@ import org.cgiar.ccafs.marlo.utils.APConfig; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import javax.inject.Inject; @@ -49,19 +50,22 @@ public class FeedbackStatusAction extends BaseAction { private static final Logger LOG = LoggerFactory.getLogger(FeedbackStatusAction.class); + // Report name in bi-reports database table + private static final String REPORT_NAME = "QA process for PMC"; + // Managers private ProjectManager projectManager; - private String transaction; + private String transaction; // Front-end private long projectID; private GlobalUnit loggedCrp; private Project project; - private Project projectDB; + private Project projectDB; private BiReportsManager biReportsManager; - private BiParametersManager biParametersManager; + private BiParametersManager biParametersManager; // Front-end private List biReports; private List biParameters; @@ -118,9 +122,9 @@ public String getTransaction() { @Override public void prepare() throws Exception { + biReports = biReportsManager.findAll().stream() + .filter(bi -> bi != null && Objects.equals(bi.getReportName(), REPORT_NAME)).collect(Collectors.toList()); - biReports = biReportsManager.findAll().stream().filter(bi -> bi != null && bi.getReportName().equals("Feedback")) - .collect(Collectors.toList()); biParameters = biParametersManager.findAll(); // Get current CRP diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties index 8474f80cf1..aa2322e431 100644 --- a/marlo-web/src/main/resources/custom/aicrra.properties +++ b/marlo-web/src/main/resources/custom/aicrra.properties @@ -2224,7 +2224,7 @@ marloRequestCreation.webSiteLink.placeholder=https://example.com # Footer footer.contactEmail=MARLOSupport@cgiar.org -footer.copyrighAlert=Copyright © 2013-2024 Alliance of Bioversity International and CIAT. +footer.copyrighAlert=Copyright © 2013-{0} Alliance of Bioversity International and CIAT. footer.developedBy=Developed by the Innovation and Business Development (IBD) team of the Technology Integration Unit. footer.rightsReserved=Some rights reserved footer.report.issue=Please report any system problems and send us your feedback {0} diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties index 86db1af7c2..bbd31c01d1 100644 --- a/marlo-web/src/main/resources/global.properties +++ b/marlo-web/src/main/resources/global.properties @@ -2309,7 +2309,7 @@ marloRequestCreation.webSiteLink.placeholder=https://example.com # Footer footer.contactEmail=MARLOSupport@cgiar.org -footer.copyrighAlert=Copyright © 2013-2024 Alliance of Bioversity International and CIAT. +footer.copyrighAlert=Copyright © 2013-{0} Alliance of Bioversity International and CIAT. footer.developedBy=Developed by the Innovation and Business Development (IBD) team of the Technology Integration Unit. footer.rightsReserved=Some rights reserved footer.report.issue=Please report any system problems and send us your feedback {0} diff --git a/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl b/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl index 79f8b36c41..3b878a16c8 100644 --- a/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl @@ -87,7 +87,7 @@ [#-- Copyright --] diff --git a/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js b/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js index b59e330dfb..6b2f8bcbec 100644 --- a/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js +++ b/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js @@ -651,6 +651,9 @@ function hideShowOptionButtons(block, status) { block.find('img.clarificationCommentBtn').hide(); block.find('div.deleteCommentBtn').show(); block.find('.containerSentCommentBtn').hide(); + block.find('.correctCommentBtn').show(); + block.find('.editCommentBtn').show(); + block.find('.dismissCommentBtn').show(); block.find('.commentTitle').css('font-style', 'oblique'); block.find('.commentTitle').css('font-weight', '200'); block.find('.commentReadonly').css('font-style', 'oblique');