Merge pull request #2511 from CCAFS/aiccra-dev-A2-392-IPI-2.3

Aiccra dev a2 392 ipi 2.3
CCAFS · Apr 18, 2024 · 4fc8b21 · 4fc8b21
2 parents f5b94f6 + 20e5c57
commit 4fc8b21
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
@@ -106,15 +106,17 @@
       <div class="button-exit close-modal-evidences">
         <div class="x-close-modal" ></div>
       </div>
-      <p class="title-modal-evidences">Are you sure you want to remove this cluster?</p>
+      <p class="title-modal-evidences">Remove cluster</p>
       <div class="text-modal-evidences">
-        <p>When you remove the selected cluster, the information shared in the Dissemination and Metadata tab of the Trainee-related contribution will also be deleted. 
-        If you are certain you want to proceed, you will need to redistribute all of the Trainees among the remaining clusters that are contributing to this deliverable.</p>          
+        <p>It is not possible to remove the shared cluster from the list, this cluster has already been submitted and has trainees related.</p>
+        <br>
+        <p>We suggest the following actions so you can save the information correctly:</p>
+        <ul>
+          <li>Distribute the remaining values across the shared cluster list</li>
+          <li>Contact the cluster leader to unsubmitt the cluster and update the information.</li>
+        </ul>       
       </div>                
       <div class="container-buttons-evidences"> 
-        <div class="button-close-modal close-modal-evidences remove-cluster-alert">
-          <p>Remove cluster</p>
-        </div>
         <div class="button-close-modal close-modal-evidences">
           <p>Close</p>
         </div>

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
@@ -411,25 +411,25 @@
             </div>
             <div class="col-md-2 participantsNumbers">
               <div class="text-area-container">
-              [@customForm.input name="${customName}[${index}].participants" placeholder="global.number" className="numericInput" editable=editable showTitle=false/]
+              [@customForm.input name="${customName}[${index}].participants"  placeholder="global.number" className="numericInput" editable=editable showTitle=false disabled=action.isSubmit((cluster.project.id))/]
               </div>
               <br>
             </div>
             <div class="col-md-2 femaleNumbers">
               <div class="text-area-container">
-                [@customForm.input name="${customName}[${index}].females" placeholder="global.number" className="numericInput" editable=editable showTitle=false/]
+                [@customForm.input name="${customName}[${index}].females" placeholder="global.number" className="numericInput" editable=editable showTitle=false disabled=action.isSubmit((cluster.project.id))/]
               </div>
               <br>
             </div>
             <div class="col-md-2 africanNumbers">
               <div class="text-area-container">
-                [@customForm.input name="${customName}[${index}].african" placeholder="global.number" className="numericInput" editable=editable showTitle=false/]
+                [@customForm.input name="${customName}[${index}].african" placeholder="global.number" className="numericInput" editable=editable showTitle=false disabled=action.isSubmit((cluster.project.id))/]
               </div>
               <br>
             </div>
             <div class="col-md-2 youthNumbers">
               <div class="text-area-container">
-                [@customForm.input name="${customName}[${index}].youth" placeholder="global.number" className="numericInput" editable=editable showTitle=false/]
+                [@customForm.input name="${customName}[${index}].youth" placeholder="global.number" className="numericInput" editable=editable showTitle=false disabled=action.isSubmit((cluster.project.id))/]
               </div>
               <br>
             </div>

diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css
@@ -1035,7 +1035,7 @@ div.fieldFocus-deliverable {
   max-width: 100%;
   padding: 30px 50px;
   border-radius: 15px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  border: 2px solid rgba(43, 166, 203, 1);
   /* text-align: center; */
 }
 

diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
@@ -117,7 +117,10 @@ $('.listindicators .setSelect2').select2().on('change', function() {
   initialRemaining();
   });
 
-
+  // Validate cluster removed in select2
+/*   $(".listClusters .removeElement").on("click", function () {
+    console.log("Remove Shared from Select2");
+  }); */
 
   // close modal evidences
   $('.close-modal-evidences').on('click', closeModalEvidences);

diff --git a/marlo-web/src/main/webapp/global/js/global.js b/marlo-web/src/main/webapp/global/js/global.js
@@ -933,11 +933,13 @@ function alertRemoveCluster() {
 
     $('.close-modal-evidences').on('click', function () {
       modal.hide();
-      if ($(this).hasClass('remove-cluster-alert')) {
+      reject(true);
+      // In case that we allow the user to close the modal rwemoving the cluster
+    /*       if ($(this).hasClass('remove-cluster-alert')) {
         resolve(false);
       } else {
         reject(true);
-      }
+      } */
     });
   });
 }
@@ -1033,8 +1035,6 @@ function initialRemaining() {
 
 }
 
-
-
 function onSelectElementPrimary() {
   var $select = $(this);
   var $parent = $(this).parents('.elementsListComponent');