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

Aiccra dev a2 392 ipi 2.3

Author: MetalPrime

marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl

@@ -101,7 +101,7 @@
 
 <section class="container">
 
-  <div class="modal-evidences" style="display: none">
+  <div class="modal-deliverable modal-evidences" style="display: none">
     <div class="content-modal">
       <div class="button-exit close-modal-evidences">
         <div class="x-close-modal" ></div>
@@ -124,6 +124,24 @@
     </div>              
   </div>
 
+  <div class=" modal-deliverable modal-indicator" style="display: none">
+    <div class="content-modal">
+      <div class="button-exit close-modal-indicator">
+        <div class="x-close-modal" ></div>
+      </div>
+      <p class="title-modal-evidences title-modal-indicator">Remove Indicator</p>
+      <div class="text-modal-evidences text-modal-indicator">
+        <p>It is not possible to remove the indicator from the list, since this deliverable has shared clusters that have already been submitted and have related trainees.</p>
+
+      </div>                
+      <div class="container-buttons-evidences"> 
+        <div class="button-close-modal close-modal-indicator">
+          <p>Close</p>
+        </div>
+      </div> 
+    </div>   
+  </div>
+
     <div class="row">
       [#-- Project Menu --]
       <div class="col-md-3">

marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css

@@ -981,7 +981,7 @@ div.fieldFocus-deliverable {
   font-weight: 620;
 }
 
-.modal-evidences{
+.modal-deliverable{
   display: flex;
   background-color: #50505070;
   align-items: center;

marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js

@@ -91,11 +91,37 @@ $('.listindicators .setSelect2').select2().on('change', function() {
 });
 
   // Validate indicator removed in select2
-  $(".listindicators .removeElement").on("click", function () {
+  $(".listindicators .removeElement").on("click",async function () {
 
-    // detects when an element is removed and checks if the IPI 2.3 flag is still in the list
-    $(this).closest("li").remove();
-    searchIndicator();
+    //These is validation for the IPI 2.3 indicator is selected and is able to be removed
+    if($(this).siblings('.elementRelationID').val() === "7505"){
+
+      const inputs = document.querySelectorAll("div.form-group.row[clusteridparticipant] .participantsNumbers input");
+    
+      const values = [];
+      inputs.forEach(input => {
+        values.push(parseInt(input.value));
+      });
+      var sumData = values.reduce((a, b) => a + b, 0);
+      if (sumData > 0) { 
+        // If the flag is still in the list, the user is notified that the element is related to the IPI 2.3 indicator
+        try {
+          await alertRemoveIndicatorIPI2_3();
+        } catch (error) {
+          return;
+        }
+      } else {
+        $(this).closest("li").remove();
+        searchIndicator();
+        return
+      }
+      
+    } else {
+      // detects when an element is removed and checks if the IPI 2.3 flag is still in the list
+      $(this).closest("li").remove();
+      searchIndicator();
+      return
+    }
   });
 
   // Validate which cluster is sectioned in select2
@@ -125,6 +151,9 @@ $('.listindicators .setSelect2').select2().on('change', function() {
   // close modal evidences
   $('.close-modal-evidences').on('click', closeModalEvidences);
 
+  // close modal indicator
+  $('.close-modal-indicator').on('click', closeModalIndicator);
+
   initialTotals();
   initialRemaining();
   reviewSharedclusters();
@@ -421,6 +450,12 @@ function closeModalEvidences(){
 
 }
 
+function closeModalIndicator(){
+  let modal = $('.modal-indicator');
+  console.log("close modal indicator");
+  modal.hide();
+}
+
 function validateRequiredTagToCategory() {
   var statusID = $('select[name="deliverable.deliverableInfo.status"]').val();
   if (statusID != '7' && statusID != '5') {

marlo-web/src/main/webapp/global/js/global.js

@@ -867,7 +867,33 @@ async function onClickRemoveElement() {
     return;
   }
 
+  // check if the indicator IPI2.3 has information, to avoid removing, it in the Performance Indicator
+  if (id === "7505" || name.includes("IPI 2.3")) {
 
+    //Represents a collection of input elements that contain the information of the total participants for each shared clusters.
+   
+    const inputs = document.querySelectorAll("div.form-group.row[clusteridparticipant] .participantsNumbers input");
+    
+    const values = [];
+    inputs.forEach(input => {
+      values.push(parseInt(input.value));
+    });
+    var sumData = values.reduce((a, b) => a + b, 0);
+    if (sumData > 0) { 
+      
+      try {
+        // Wait for the user to click on the modal
+        await alertRemoveIndicatorIPI2_3();
+      } catch (error) {
+        // User clicked on the close button instead of the remove button
+        console.log("Not removed");
+        return;
+      }
+    }
+    removeCluster(id);
+  }
+
+  // check if the shared cluster has information, to avoid removing it, in the listClustersDM
   if (hasListClusters) {
     const inputs = document.querySelectorAll("div.form-group.row[clusteridparticipant='" + id + "'] input");
     const values = [];
@@ -889,6 +915,8 @@ async function onClickRemoveElement() {
 
   }
 
+
+
   $parent.slideUp(300, function () {
     $parent.remove();
 
@@ -944,6 +972,18 @@ function alertRemoveCluster() {
   });
 }
 
+function alertRemoveIndicatorIPI2_3() {
+  return new Promise(function (resolve, reject) {
+    let modal = $('.modal-indicator');
+    modal.show();
+
+    $('.close-modal-indicator').on('click', function () {
+      modal.hide();
+      reject(true);
+    });
+  });
+}
+
 function removeCluster(idCluster) {
   var spanText = $("#existCurrentCluster").text();
   if ($('.listClusters ul.list li').length == 1 && spanText == "false") { //existCurrentCluster