From 5c2fe69f4e0845b660fc4555ccbb03b25118f6a1 Mon Sep 17 00:00:00 2001
From: Antoine Duquenoy <duquenoyantoine.study@gmail.com>
Date: Thu, 28 Feb 2019 21:30:29 +0100
Subject: [PATCH] Suppression d'une expérimentation depuis l'interface web

---
 PFE06/src/main/java/com/PFE/ServerManager/MainController.java | 11 +++++++++++
 PFE06/src/main/java/com/PFE/ServerManager/Team.java           |  6 ++++++
 PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java |  2 ++
 PFE06/src/main/resources/static/js/update.js                  | 35 ++++++++++++++++++++++++++++++++---
 PFE06/src/main/resources/templates/update.html                |  1 +
 5 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java
index c50f8aa..c301729 100644
--- a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java
+++ b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java
@@ -1,5 +1,6 @@
 package com.PFE.ServerManager;
 
+import org.omg.CORBA.SystemException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
@@ -440,4 +441,14 @@ public class MainController {
         yaml.dump(data, writer);
     }
 
+    @PostMapping(path="/deleteupdate")
+    public ResponseEntity deleteUpdate(@RequestParam String majname){
+        Update update_c = updateRepository.findByUpdate(majname);
+        Team t = teamRepository.findByUpdatesContaining(update_c);
+        t.removeUpdate(update_c);
+        teamRepository.save(t);
+        updateRepository.deleteById(update_c.getUpdateId());
+        return new ResponseEntity<String>(HttpStatus.OK);
+    }
+
 }
\ No newline at end of file
diff --git a/PFE06/src/main/java/com/PFE/ServerManager/Team.java b/PFE06/src/main/java/com/PFE/ServerManager/Team.java
index 04fb29b..33cd92c 100644
--- a/PFE06/src/main/java/com/PFE/ServerManager/Team.java
+++ b/PFE06/src/main/java/com/PFE/ServerManager/Team.java
@@ -58,6 +58,12 @@ public class Team {
         }
     }
 
+    public void removeUpdate(Update u) {
+        if(u != null) {
+            updates.remove(u);
+        }
+    }
+
     public void setUpdates(Set<Update> updates) {
         this.updates = updates;
     }
diff --git a/PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java b/PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java
index f68043d..e935140 100644
--- a/PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java
+++ b/PFE06/src/main/java/com/PFE/ServerManager/TeamRepository.java
@@ -13,6 +13,8 @@ public interface TeamRepository extends JpaRepository<Team, Integer> {
 
     Team findByCustomersContaining(Customer customer);
 
+    Team findByUpdatesContaining(Update update);
+
     @Override
     List<Team> findAll();
 }
diff --git a/PFE06/src/main/resources/static/js/update.js b/PFE06/src/main/resources/static/js/update.js
index 2b5ef18..4e64182 100644
--- a/PFE06/src/main/resources/static/js/update.js
+++ b/PFE06/src/main/resources/static/js/update.js
@@ -34,6 +34,38 @@ $(document).ready(function() {
         }
     })
 
+    var delMaj = document.getElementById("del_maj");
+
+    delMaj.addEventListener('click', function() {
+        var modalContent = document.getElementById("modal-content");
+        var modalTitle = document.getElementById("modal-title");
+        var majNameSelect = document.getElementById("maj_name").value;
+        if(majNameSelect !== "" && majNameSelect !== "--") {
+            var request = new XMLHttpRequest();
+            request.open("POST", "/deleteupdate");
+            var formData = new FormData();
+            formData.append("majname", majNameSelect);
+
+            request.onreadystatechange = function() {
+                if(this.readyState === XMLHttpRequest.DONE && this.status === 200) {
+                    var modalButton = document.getElementById("modal-button");
+                    modalButton.addEventListener('click', function() {
+                        location.reload();
+                    })
+                    modalTitle.innerHTML = "Félicitations";
+                    modalContent.innerHTML = "La mise à jour a bien été supprimée";
+                    $("#warningFilesNumber").modal();
+                }
+            }
+            request.send(formData);
+        }
+        else {
+            modalTitle.innerHTML = "Attention !";
+            modalContent.innerHTML = "Veuillez choisir le nom d'une mise à jour";
+            $("#warningFilesNumber").modal();
+        }
+    })
+
     /********** Tableau **********/
 
       var tableNodes = $('#nodes-table').DataTable( {
@@ -180,8 +212,5 @@ $(document).ready(function() {
       document.getElementById("save_maj").addEventListener('click', function() {
           sendInfoMaj('savemaj');
       });
-      document.getElementById("run_maj").addEventListener('click', function() {
-          sendInfoMaj('runmaj');
-      });
 
 } );
diff --git a/PFE06/src/main/resources/templates/update.html b/PFE06/src/main/resources/templates/update.html
index e0b2cbf..1a74470 100644
--- a/PFE06/src/main/resources/templates/update.html
+++ b/PFE06/src/main/resources/templates/update.html
@@ -115,6 +115,7 @@
                 <option th:each="update : ${customerMaj}" th:value="${update.getUpdate()}" th:utext="${update.getUpdate()}"/>
             </select>
             <button id="start_maj" type="submit" class="btn btn-primary" style="margin-top:20px;">Lancer la mise à jour</button>
+            <button id="del_maj" type="submit" class="btn btn-primary" style="margin-top:20px;">Supprimer la mise à jour</button>
         </div>
         <h1 style="margin-bottom:50px; margin-top:50px; border-bottom:1px solid #CCC; padding-bottom:20px;">Créer une mise à jour</h1>
 
--
libgit2 0.21.2