Merge branch 'aiccra-staging' into aiccra-dev

CCAFS · Feb 21, 2024 · 12f58d6 · 12f58d6
2 parents c6f76b3 + 59b3af8
commit 12f58d6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/...data/src/main/java/org/cgiar/ccafs/marlo/data/dao/mysql/ExpectedStudyProjectMySQLDAO.java b/...data/src/main/java/org/cgiar/ccafs/marlo/data/dao/mysql/ExpectedStudyProjectMySQLDAO.java
@@ -72,8 +72,8 @@ public List<ExpectedStudyProject> findAll() {
 
   @Override
   public List<ExpectedStudyProject> getByProjectAndPhase(long projectId, long phaseId) {
-    String query =
-      "select distinct esp from ExpectedStudyProject esp " + "where project.id = :projectId and phase.id = :phaseId";
+    String query = "select distinct esp from ExpectedStudyProject esp "
+      + "where project.id = :projectId and phase.id = :phaseId and is_active = 1";
     Query createQuery = this.getSessionFactory().getCurrentSession().createQuery(query);
     createQuery.setParameter("projectId", projectId);
     createQuery.setParameter("phaseId", phaseId);

diff --git a/marlo-web/pom.xml b/marlo-web/pom.xml
@@ -555,7 +555,7 @@
                     <goal>minify</goal>
                   </goals>
                </execution>
-                 
+                <!--
 				<execution>
 				    <id>crp-minify</id>
 				    <configuration>	
@@ -566,7 +566,7 @@
 				        <includes>
 			              <include>**/*.js</include>
 			            </includes>
-			            <!-- Exclude already minified files. -->
+			            
 			            <excludes>
 			              <exclude>**/*.min.*</exclude>
 			            </excludes>
@@ -578,6 +578,7 @@
 		                 <goal>minify</goal>
 		              </goals>
                 </execution>
+				--> 
                </executions>
 			</plugin>
 

diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/BaseAction.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/BaseAction.java
@@ -3487,7 +3487,9 @@ public List<ProjectExpectedStudy> getexpectedCrpOutcomes(Long id) {
                 .collect(Collectors.toList());
             if (filteredCrpOutcomes != null && !filteredCrpOutcomes.isEmpty()) {
               projectExpectedStudy.setCrpOutcomes(new ArrayList<>(filteredCrpOutcomes));
+              if(!expectedStudies.contains(projectExpectedStudy)) {
               expectedStudies.add(projectExpectedStudy);
+              }
             }
           }
         }

diff --git a/.../cgiar/ccafs/marlo/action/json/project/DeliverablesByDisseminationURLHandleDOIAction.java b/.../cgiar/ccafs/marlo/action/json/project/DeliverablesByDisseminationURLHandleDOIAction.java
@@ -84,18 +84,16 @@ public String execute() throws Exception {
     }
 
     if (deliverables != null && !deliverables.isEmpty() && phase != null) {
-      deliverables = deliverables.stream()
-        .filter(d -> d != null && d.isActive() && d.getId() != null && d.getId() != deliverableID
-          && d.getDeliverableInfo(phase).isActive())
+      deliverables = deliverables.stream().filter(d -> d != null && d.getId() != deliverableID)
         .sorted(Comparator.comparing(Deliverable::getId)).collect(Collectors.toList());
 
       if (deliverables != null && !deliverables.isEmpty()) {
 
         List<DeliverableSearchSummary> deliverableDTOs = new ArrayList<>();
         for (Deliverable deliverable : deliverables) {
-          if (deliverable != null && deliverable.getId() != null) {
-            deliverable = deliverableManager.getDeliverableById(deliverable.getId());
-          }
+
+          deliverable = deliverableManager.getDeliverableById(deliverable.getId());
+
           DeliverableDissemination deliverableDissemination = new DeliverableDissemination();
           boolean isDOIDuplicated = false;
           boolean isDisseminationURLDuplicated = false;

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudy.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudy.ftl
@@ -3,7 +3,7 @@
 [#assign currentSectionString = "project-${actionName?replace('/','-')}-${expectedID}-phase-${(actualPhase.id)!}" /]
 [#assign pageLibs = [ "select2", "blueimp-file-upload", "flag-icon-css", "components-font-awesome"] /]
 [#assign customJS = [
-  "${baseUrlMedia}/js/projects/projectStudy.js?20230418",
+  "${baseUrlMedia}/js/projects/projectStudy.js?20240219",
   "${baseUrlCdn}/global/js/fieldsValidation.js",
   "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20231017"
   ] 

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/studies/study.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/studies/study.ftl
@@ -3,7 +3,7 @@
 [#assign currentSectionString = "${actionName?replace('/','-')}-${(expectedStudy.id)!}-phase-${(actualPhase.id)!}" /]
 [#assign pageLibs = ["select2" ,"blueimp-file-upload", "flag-icon-css" ] /]
 [#assign customJS = [
-  "${baseUrlMedia}/js/projects/projectStudy.js?20230413",
+  "${baseUrlMedia}/js/projects/projectStudy.js?20240219",
   "${baseUrlCdn}/global/js/fieldsValidation.js"
 ] /]
 [#assign customCSS = [

diff --git a/marlo-web/src/main/webapp/crp/js/projects/projectStudy.js b/marlo-web/src/main/webapp/crp/js/projects/projectStudy.js
@@ -246,7 +246,7 @@ function attachEvents() {
       var $element = $('#multiInput-references-template').clone(true).removeAttr("id");
       var $listLength = $list.children().length;
 
-      if ($listLength <= 10) {
+      if ($listLength <= 20) {
         // Remove template tag
         $element.find('input, textarea').each(function (i, e) {
           e.name = (e.name).replace("_TEMPLATE_", "");