Réorganisation des servlets

Naoufal-ELALLOUCH · Dec 13, 2015 · 89f8db9 · 89f8db9
1 parent 06ed45a
commit 89f8db9
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 45 deletions.
diff --git a/src/main/java/fr/enseirb/t3/it340/App.java b/src/main/java/fr/enseirb/t3/it340/App.java
@@ -2,8 +2,13 @@
 import static spark.Spark.*;
 
 import fr.enseirb.t3.it340.servlets.VisualisationAccueil;
+import fr.enseirb.t3.it340.servlets.atelier.*;
 import fr.enseirb.t3.it340.servlets.ateliers.*;
 import fr.enseirb.t3.it340.servlets.authentification.*;
+import fr.enseirb.t3.it340.servlets.creneau.CreerCreneau;
+import fr.enseirb.t3.it340.servlets.creneau.EditerCreneau;
+import fr.enseirb.t3.it340.servlets.creneau.VisualisationEditerCreneau;
+import fr.enseirb.t3.it340.servlets.creneaux.VisualisationCreneaux;
 import freemarker.template.Configuration;
 import spark.template.freemarker.FreeMarkerEngine;
 
@@ -23,30 +28,41 @@ public static void main(String[] args) throws SQLException, ClassNotFoundExcepti
 		// Gestion des urls
 		get("/", new VisualisationAccueil(), engine);
 
-		// Authentification
+		// Inscription
 		get("/inscription", new VisualisationInscription(), engine);
 		post("/inscription", new Inscription());
 
+		// Authentification
 		get("/authentification", new VisualisationAuthentification(), engine);
 		post("/authentification", new Authentification());
 
+		// Déconnexion
 		get("/deconnexion", new Deconnexion());
 
+		// Ateliers
 		get("/ateliers", new VisualisationAteliers(), engine);
 		get("/ateliers/:idLabo", new VisualisationAteliersLabo(), engine);
-		get("/atelier/:idAtelier", new VisualisationAtelier(), engine);
-
 		get("/laboratoire/ateliers", new VisualisationAteliersMonLabo(), engine);
 
+		// Atelier
+		get("/atelier/:idAtelier", new VisualisationAtelier(), engine);
+
+		// Atelier - création
 		get("/laboratoire/atelier/creer", new VisualisationCreerAtelier(), engine);
 		post("/laboratoire/atelier/creer", new CreerAtelier());
 
+		// Atelier - modification
 		get("/laboratoire/atelier/:idAtelier/modifier", new VisualisationEditerAtelier(), engine);
 		post("/laboratoire/atelier/:idAtelier/modifier", new EditerAtelier());
 
+		// Atelier - suppression
+		get("/laboratoire/atelier/:idAtelier/supprimer", new SupprimerAtelier());
+
+		// Créneau - ajout
 		get("atelier/:idAtelier/creneaux", new VisualisationCreneaux(), engine);
 		post("atelier/:idAtelier/creneaux", new CreerCreneau());
 
+		// Créneau - modification
 		get("/atelier/:idAtelier/creneaux/:idCreneau", new VisualisationEditerCreneau(), engine);
 		post("/atelier/:idAtelier/creneaux/:idCreneau", new EditerCreneau());
 

diff --git a/...it340/servlets/ateliers/CreerAtelier.java → .../it340/servlets/atelier/CreerAtelier.java b/...it340/servlets/ateliers/CreerAtelier.java → .../it340/servlets/atelier/CreerAtelier.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.atelier;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddUtilisateur;
@@ -30,6 +30,7 @@ public Void handle(Request request, Response response) throws Exception {
 
 		BddAtelier.ajoutAtelier(idLabo, titre, themes, zone, adresse, orateurs, partenaires, cible, remarques);
 
+		// TODO redirect to ajout creneaux
 		response.redirect("/laboratoire/ateliers");
 
 		return null;

diff --git a/...t340/servlets/ateliers/EditerAtelier.java → ...it340/servlets/atelier/EditerAtelier.java b/...t340/servlets/ateliers/EditerAtelier.java → ...it340/servlets/atelier/EditerAtelier.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.atelier;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddLabo;

diff --git a/src/main/java/fr/enseirb/t3/it340/servlets/atelier/SupprimerAtelier.java b/src/main/java/fr/enseirb/t3/it340/servlets/atelier/SupprimerAtelier.java
@@ -0,0 +1,48 @@
+package fr.enseirb.t3.it340.servlets.atelier;
+
+import fr.enseirb.t3.it340.bdd.BddAtelier;
+import fr.enseirb.t3.it340.bdd.BddCreneau;
+import fr.enseirb.t3.it340.modeles.Atelier;
+import fr.enseirb.t3.it340.servlets.authentification.Authentification;
+import spark.ModelAndView;
+import spark.Request;
+import spark.Response;
+import spark.Route;
+
+public class SupprimerAtelier implements Route {
+	public String handle(Request request, Response response) throws Exception {
+
+		// On regarde si l'utilisateur a accès
+		ModelAndView modelAndView = Authentification.checkLabo(request, response);
+		if (modelAndView != null)
+			return null;
+
+		// On vérifie si l'atelier appartient bien au labo
+		Atelier atelier = null;
+
+		try {
+			int idAtelier = Integer.parseInt(request.params("idAtelier"));
+			atelier = BddAtelier.getAtelierById(idAtelier);
+		} catch (NumberFormatException e) {
+			response.redirect("/laboratoire/ateliers");
+		}
+
+		if (atelier == null) {
+			response.redirect("/laboratoire/ateliers");
+			return "";
+		} else {
+
+			// On vérifie que l'atelier appartient bien au labo
+			int idLaboFromAtelier = atelier.getIdLabo();
+			int idLabo = request.session().attribute("labo");
+
+			if (idLabo != idLaboFromAtelier) {
+				return "";
+			} else {
+				// TODO
+			}
+		}
+
+		return "";
+	}
+}
diff --git a/...rvlets/ateliers/VisualisationAtelier.java → ...ervlets/atelier/VisualisationAtelier.java b/...rvlets/ateliers/VisualisationAtelier.java → ...ervlets/atelier/VisualisationAtelier.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.atelier;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.modeles.Atelier;

diff --git a/...s/ateliers/VisualisationCreerAtelier.java → ...ts/atelier/VisualisationCreerAtelier.java b/...s/ateliers/VisualisationCreerAtelier.java → ...ts/atelier/VisualisationCreerAtelier.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.atelier;
 
 import fr.enseirb.t3.it340.servlets.authentification.Authentification;
 import spark.*;

diff --git a/.../ateliers/VisualisationEditerAtelier.java → ...s/atelier/VisualisationEditerAtelier.java b/.../ateliers/VisualisationEditerAtelier.java → ...s/atelier/VisualisationEditerAtelier.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.atelier;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddLabo;

diff --git a/src/main/java/fr/enseirb/t3/it340/servlets/authentification/Inscription.java b/src/main/java/fr/enseirb/t3/it340/servlets/authentification/Inscription.java
@@ -31,6 +31,8 @@ public Void handle(Request request, Response response) throws Exception {
 		else
 			BddEnseignant.ajout(idUtilisateur, nom, prenom);
 
+		response.redirect("/");
+
 		return null;
 	}
 }
diff --git a/...it340/servlets/ateliers/CreerCreneau.java → .../it340/servlets/creneau/CreerCreneau.java b/...it340/servlets/ateliers/CreerCreneau.java → .../it340/servlets/creneau/CreerCreneau.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.creneau;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddCreneau;

diff --git a/...t340/servlets/ateliers/EditerCreneau.java → ...it340/servlets/creneau/EditerCreneau.java b/...t340/servlets/ateliers/EditerCreneau.java → ...it340/servlets/creneau/EditerCreneau.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.creneau;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddCreneau;

diff --git a/.../ateliers/VisualisationEditerCreneau.java → ...s/creneau/VisualisationEditerCreneau.java b/.../ateliers/VisualisationEditerCreneau.java → ...s/creneau/VisualisationEditerCreneau.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.creneau;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.bdd.BddLabo;

diff --git a/...vlets/ateliers/VisualisationCreneaux.java → ...vlets/creneaux/VisualisationCreneaux.java b/...vlets/ateliers/VisualisationCreneaux.java → ...vlets/creneaux/VisualisationCreneaux.java
@@ -1,4 +1,4 @@
-package fr.enseirb.t3.it340.servlets.ateliers;
+package fr.enseirb.t3.it340.servlets.creneaux;
 
 import fr.enseirb.t3.it340.bdd.BddAtelier;
 import fr.enseirb.t3.it340.modeles.Atelier;

diff --git a/src/main/resources/templates/editer-atelier.ftl b/src/main/resources/templates/editer-atelier.ftl
@@ -64,39 +64,41 @@
 	                    </div>
 	                </div>
 
-                    <div class="form-group">
-                        <label for="remarques">Liste des créneaux</label>
-	                    <a class="btn btn-mini btn-default" href="/atelier/${atelier.idAtelier}/creneaux" alt="Ajouter">Ajouter un créneau</a>
-	                    <table class="table table-hover">
-	                        <thead>
-	                        <tr>
-	                            <th>Jour</th>
-	                            <th>Heure</th>
-	                            <th>Capacité</th>
-								<th>Action</th>
-	                        </tr>
-	                        </thead>
-	                        <tbody>
-								<#list creneaux as c>
-	                            <tr>
-	                                <td>${c.date?date}</td>
-	                                <td>${c.date?string["HH:mm"]}</td>
-	                                <td>${c.capacite}</td>
-                                    <td>
-                                        <a class="btn btn-mini btn-primary" href="/atelier/${idAtelier}/creneaux/${c.idCreneau}" alt="Modifier">
-                                            <i class="icon-edit icon-white"></i>
-                                            Modifier
-                                        </a>
-                                        <a class="btn btn-mini btn-danger" href="/atelier/${idAtelier}/creneaux/${c.idCreneau}/supprimer" alt="Supprimer">
-                                            <i class="icon-remove icon-white"></i>
-                                            Supprimer
-                                        </a>
-                                    </td>
-	                            </tr>
-								</#list>
-	                        </tbody>
-	                    </table>
-                    </div>
+					<#if creneaux??>
+	                    <div class="form-group">
+	                        <label for="remarques">Liste des créneaux</label>
+		                    <a class="btn btn-mini btn-default" href="/atelier/${atelier.idAtelier}/creneaux" alt="Ajouter">Ajouter un créneau</a>
+		                    <table class="table table-hover">
+		                        <thead>
+		                        <tr>
+		                            <th>Jour</th>
+		                            <th>Heure</th>
+		                            <th>Capacité</th>
+									<th>Action</th>
+		                        </tr>
+		                        </thead>
+		                        <tbody>
+									<#list creneaux as c>
+		                            <tr>
+		                                <td>${c.date?date}</td>
+		                                <td>${c.date?string["HH:mm"]}</td>
+		                                <td>${c.capacite}</td>
+	                                    <td>
+	                                        <a class="btn btn-mini btn-primary" href="/atelier/${idAtelier}/creneaux/${c.idCreneau}" alt="Modifier">
+	                                            <i class="icon-edit icon-white"></i>
+	                                            Modifier
+	                                        </a>
+	                                        <a class="btn btn-mini btn-danger" href="/atelier/${idAtelier}/creneaux/${c.idCreneau}/supprimer" alt="Supprimer">
+	                                            <i class="icon-remove icon-white"></i>
+	                                            Supprimer
+	                                        </a>
+	                                    </td>
+		                            </tr>
+									</#list>
+		                        </tbody>
+		                    </table>
+	                    </div>
+					</#if>
 
 
 	                <input type="submit" name="submit" id="submit" value="Valider" class="btn btn-info pull-left">