cookie

help-table.md

@@ -11,3 +11,5 @@ Tables :
 
 -gommetteAttribs (id, idEleve, idProf, idGommette, dateAttribution, raison)
 
+
+.\gradlew run
\ No newline at end of file

src/com/uca/StartServer.java

@@ -130,13 +130,12 @@ public class StartServer {
             }
         });
 
-        get("/eleves/gommettes",(req,res)->{
+        get("/eleves/:id",(req,res)->{
 
-            String id = req.queryParams("id");
+            String id = req.params("id");
             return EleveGommetteGUI.getEleveGommettes(Integer.parseInt(id));
         });
 
-
         post("/eleves/ajout", (req,res)->{
             String firstName = req.queryParams("firstName");
             String lastName = req.queryParams("lastName");
@@ -164,8 +163,7 @@ public class StartServer {
             System.out.println("deleted gommette");
             Core.GommetteAttrib.delete(Integer.parseInt(req.queryParams("id")));
 
-
-            res.redirect("/eleves");
+            res.redirect("/eleves/"+req.queryParams("idEleve"));
             return null;
         });
 
@@ -175,22 +173,19 @@ public class StartServer {
                 res.redirect("/login");
                 return null;
             }
+
             String raison      = req.queryParams("raison");
             int idGommette     = Integer.parseInt(req.queryParams("idGommette"));
             int idEleve        = Integer.parseInt(req.queryParams("idEleve"));
 
-            String url = req.url();
-            url = url.substring(0,  url.lastIndexOf('/'));
-            url = url+"s?id="+idEleve+"&id=";
-
             Core.GommetteAttrib.create(idEleve,connected.getId(),idGommette, new java.sql.Date(System.currentTimeMillis()), raison);
-            System.out.println("url: "+url);
-            res.redirect(url);
+            res.redirect("/eleves/"+req.queryParams("idEleve"));
             return null;
         });
 
         post("/eleves/delete", (req,res) ->{
             Core.Eleve.delete(Integer.parseInt(req.queryParams("id")));
+
             res.redirect("/eleves");
             return null;
         });
@@ -251,16 +246,20 @@ public class StartServer {
         post("/gommettes/update", (req,res)->{
 
             
-            String couleur = req.queryParams("couleur");
-            
-            Couleur c = Couleur.retrieve(couleur);
+            String  couleurStr = req.queryParams("couleur");
+            Couleur couleur = Couleur.retrieve(couleurStr);
         
-            String description = req.queryParams("description");
-            String nom = req.queryParams("nom");
             String id = req.queryParams("id_selection");
-            
+            String nom = req.queryParams("nom");
+            String description = req.queryParams("description");
 
-            Core.Gommette.update(Integer.parseInt(id),nom,c, description);
+            GommetteEntity gommette = Core.Gommette.getById(Integer.parseInt(id));
+            
+            gommette.setNom(nom.length() > 0 ? nom : gommette.getNom());
+            gommette.setCouleur(couleurStr != null ? couleur : gommette.getCouleur());
+            gommette.setDescription(description.length() > 0 ? description : gommette.getDescription());
+            
+            Core.Gommette.push(gommette);
             
             res.redirect("/gommettes");
             return null;

src/com/uca/core/Core.java

@@ -7,12 +7,12 @@ import java.util.*;
 
 public final class Core {
 
-    private Core(){ super(); }
+    private Core() { super(); }
 
     public static final UserCore     User  = UserCore.Instance;
     public static final EleveCore    Eleve = EleveCore.Instance;
     public static final ProfCore     Prof  = ProfCore.Instance;
 
-    public static final GommetteCore       Gommette = GommetteCore.Instance;
+    public static final GommetteCore       Gommette       = GommetteCore.Instance;
     public static final GommetteAttribCore GommetteAttrib = GommetteAttribCore.Instance;
 }

src/com/uca/core/GommetteCore.java

@@ -5,9 +5,11 @@ import com.uca.dao.*;
 import com.uca.entity.*;
 import java.util.*;
 
+
 public class GommetteCore extends _DefaultCore<GommetteEntity> {
 
     public static final GommetteCore Instance = new GommetteCore();
+
     private GommetteCore()
     {
         super(new GommetteDAO());
@@ -20,50 +22,4 @@ public class GommetteCore extends _DefaultCore<GommetteEntity> {
         entity.setDescription(description);
         return dao.create(entity);
     }
-
-    public void update(int id, String nom, Couleur couleur, String description) {
+}
\ No newline at end of file
-
-        GommetteEntity entity = new GommetteEntity();
-        GommetteEntity previous = dao.getById(id);
-
-        System.out.println(previous.getNom());
-
-        if (nom.length() > 0) 
-        {
-            entity.setNom(nom);
-        }
-        else
-        {
-            entity.setNom(previous.getNom());
-        }
-
-        
-        if (couleur != null)
-        {
-            entity.setCouleur(couleur);
-        }
-        else
-        {
-            Couleur prev_couleur = previous.getCouleur();
-            System.out.println(prev_couleur);
-            entity.setCouleur(previous.getCouleur());
-            
-        }
-
-        
-        if (description.length() > 0)
-        { 
-            entity.setDescription(description);
-        }
-        else
-        {
-            entity.setDescription(previous.getDescription());
-        }
-
-        
-
-        entity.setId(id);
-        dao.push(entity);
-
-    }
-}

src/com/uca/core/ProfCore.java

@@ -5,9 +5,11 @@ import com.uca.dao.*;
 import com.uca.entity.*;
 import java.util.*;
 
+
 public class ProfCore extends _DefaultCore<ProfEntity> {
 
     public static final ProfCore Instance = new ProfCore();
+
     private ProfCore()
     {
         super(new ProfDAO());
@@ -21,4 +23,16 @@ public class ProfCore extends _DefaultCore<ProfEntity> {
         entity.setPassword(password);
         return dao.create(entity);
     }
+
+    public ProfEntity getByLoginPair(String username, String password)
+    {
+        for(ProfEntity p : dao.getAll())
+        {
+            if(p.getUserName() == username && p.getPassword() == password)
+            {
+                return p;
+            }
+        }
+        return null;
+    }
 }

src/com/uca/core/UserCore.java

@@ -5,6 +5,7 @@ import com.uca.dao.*;
 import com.uca.entity.*;
 import java.util.*;
 
+
 public class UserCore extends _DefaultCore<UserEntity> {
 
     public static final UserCore Instance = new UserCore();

src/com/uca/dao/_Connector.java

@@ -12,11 +12,8 @@ import java.sql.SQLException;
 public class _Connector {
 
     private static String url = "jdbc:h2:~/test";
-
     private static String user = "sa";
-
     private static String passwd = "";
-
     private static Connection connect;
 
     public static Connection getInstance(){
@@ -29,6 +26,4 @@ public class _Connector {
         }
         return connect;
     }
-
-
+}
\ No newline at end of file
-}

src/com/uca/dao/_DefaultDAO.java

@@ -55,8 +55,7 @@ public abstract class _DefaultDAO<T extends Entity> extends _Generic<T> {
     {
         ArrayList<T> entities = new ArrayList<>();
         try {
-            PreparedStatement preparedStatement = this.connect
-                    .prepareStatement("SELECT * FROM "+getDefaultTableName()+" ORDER BY id ASC;");
+            PreparedStatement preparedStatement = this.connect.prepareStatement("SELECT * FROM "+getDefaultTableName()+" ORDER BY id ASC;");
             ResultSet resultSet = preparedStatement.executeQuery();
             
             while(true)
@@ -123,5 +122,4 @@ public abstract class _DefaultDAO<T extends Entity> extends _Generic<T> {
             e.printStackTrace();
         }
     }
-
-}
+}
\ No newline at end of file

src/com/uca/dao/_Initializer.java

@@ -68,10 +68,13 @@ public class _Initializer {
 
 
         EleveEntity bibi = Core.Eleve.create("Bibi","Johnson",new java.sql.Date(44938),"Zarbi");
+        EleveEntity bobo = Core.Eleve.create("Bobo","Bis",new java.sql.Date(10),"Pokemon");
 
         Core.GommetteAttrib.create(bibi.getId(), DEBUG_BORIS_ADMIN.getId(), sagePetit.getId(), new java.sql.Date(44938), "Aucune raison");
         Core.GommetteAttrib.create(bibi.getId(), toto.getId(), uniCorn.getId(), new java.sql.Date(44938), "Our Little Poney");
 
+        Core.GommetteAttrib.create(bobo.getId(), DEBUG_BORIS_ADMIN.getId(), uniCorn.getId(), new java.sql.Date(32), "Bravo bobo");
+
         
     }
 }

src/com/uca/gui/EleveGUI.java

@@ -14,6 +14,4 @@ public class EleveGUI
         input.put("eleves", Core.Eleve.getAll());
         return DefaultGUI.getDefaultGUI(input, "eleves.ftl");
     }
-
-    
 }

src/com/uca/gui/GommetteGUI.java

@@ -14,10 +14,6 @@ public class GommetteGUI
         Map<String, Object> input = new HashMap<>();
         input.put("gommettes", Core.Gommette.getAll());
 
-
-
         return DefaultGUI.getDefaultGUI(input, "gommettes.ftl");
     }
-
-    
 }

src/com/uca/gui/ProfGUI.java

@@ -15,10 +15,18 @@ public class ProfGUI
         return DefaultGUI.getDefaultGUI(input, "profsRegular.ftl");
     }
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5ec4cf8bc3d664e61a91bbf24c5be8fd9b73c1fb
     public static String getWelcomePage(ProfEntity prof)
     { 
         Map<String, Object> input = new HashMap<>();
         input.put("prof",prof);
         return DefaultGUI.getDefaultGUI(input, "welcome.ftl");
     }
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5ec4cf8bc3d664e61a91bbf24c5be8fd9b73c1fb
 }

src/com/uca/gui/UserGUI.java

@@ -12,9 +12,5 @@ public class UserGUI
         Map<String, Object> input = new HashMap<>();
         input.put("users", Core.User.getAll());
         return DefaultGUI.getDefaultGUI(input, "users.ftl");
-    }
-
-    
+    }    
+}
\ No newline at end of file
-}
-
-

src/main/resources/static/style.css

+*
+{
+   font-size: 5em;
+}
\ No newline at end of file

src/main/resources/views/eleveGommettes.ftl

@@ -39,10 +39,12 @@
 
 </ul>
 
+<footer>
 <a href="/welcome">Accueil</a>
 <a href="/profs" >Liste des profs</a>
 <a href="/eleves" >Liste des eleves</a>
 <a href="/gommettes">Liste des gommettes</a>
+</footer>
 
 </body>
 </html>

src/main/resources/views/eleves.ftl

@@ -6,18 +6,12 @@
     <h1> Liste des élèves: </h1>
     <#list eleves as eleve>
 
-        <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance}) </li>
+        <li><a href="eleves/${eleve.id}">${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${eleve.dateNaissance})</a> </li>
 
         <form action="eleves/delete" method="post">
             <input  type="hidden" name="id" value="${eleve.id}">
             <button type="submit" name="id">Supprimer</button>
         </form>
-
-        <form action="eleves/gommettes" method="get">
-            <input  type="hidden" name="id" value="${eleve.id}">
-            <button type="submit" name="id">Lister Gommettes</button>
-        </form>
-
     </#list>
 
 </ul>
@@ -71,6 +65,12 @@
 </select>
     
 
+<footer>
+<a href="/welcome">Accueil</a>
+<a href="/profs" >Liste des profs</a>
+<a href="/eleves" >Liste des eleves</a>
+<a href="/gommettes">Liste des gommettes</a>
+</footer>
 
 </body>
 

src/main/resources/views/gommettes.ftl

@@ -3,8 +3,10 @@
 <body xmlns="http://www.w3.org/1999/html">
 
 <ul>
+    <h1> Liste des gommettes: </h1>
+
     <#list gommettes as gommette>
-        <li>${gommette.id} - ${gommette.strCouleur} - ${gommette.nom} : ${gommette.description} </li>
+        <li>${gommette.id} - ${gommette.couleur.format(gommette.nom)} : ${gommette.description} </li>
     </#list>
 </ul>
 
@@ -79,6 +81,13 @@
         <option value="${gommette.id}">${gommette.id}</option>
     </#list>
 </select>
+
+<footer>
+<a href="/welcome">Accueil</a>
+<a href="/profs" >Liste des profs</a>
+<a href="/eleves" >Liste des eleves</a>
+<a href="/gommettes">Liste des gommettes</a>
+</footer>
     
 </body>