From 3f693d9c53fae9697f10c9878e360a4d998374a8 Mon Sep 17 00:00:00 2001
From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com>
Date: Fri, 4 Dec 2020 00:17:21 +0100
Subject: [PATCH 1/6] menu

---
 css/menu.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/css/menu.css b/css/menu.css
index 7cd4bc5..aaa4ca6 100644
--- a/css/menu.css
+++ b/css/menu.css
@@ -65,11 +65,6 @@ a
     transition: width 0.2s;
 }
 
-.underLineHover:hover
-{
-
-}
-
 .underLineHover:hover:after
 {
     width: 100%;

From 10b3fd0bc180ebfe278bbce797f9a77cf2e13dfc Mon Sep 17 00:00:00 2001
From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com>
Date: Fri, 4 Dec 2020 00:20:06 +0100
Subject: [PATCH 2/6] modif menu

---
 css/menu.css |  2 +-
 menu.html    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/css/menu.css b/css/menu.css
index aaa4ca6..8d0c51d 100644
--- a/css/menu.css
+++ b/css/menu.css
@@ -26,7 +26,7 @@
 	padding: 13px 17px;
 }
 
-a
+aMenu
 {
 	color: white;
 	text-decoration: none;
diff --git a/menu.html b/menu.html
index 983da4b..5744fbf 100644
--- a/menu.html
+++ b/menu.html
@@ -12,10 +12,10 @@
         <div id="blockSign">
             <ul id="lineSign">
                 <li class="colonneSign">
-                    <a class="underLineHover">Connexion</a>
+                    <a class="aMenu underLineHover">Connexion</a>
                 </li>
                 <li class="colonneSign">
-                    <a class="underLineHover">Inscription</a>
+                    <a class="aMenu underLineHover">Inscription</a>
                 </li>
             </ul>
         </div>
@@ -23,13 +23,13 @@
         <nav id="blockMenu">
             <ul id="lineMenu">
                 <li class="colonneMenu animationButtonMenu underLineHover">
-                    <a>Acceuil</a>
+                    <a class="aMenu">Acceuil</a>
                 </li>
                 <li class="colonneMenu animationButtonMenu underLineHover">
-                    <a>Profil</a>
+                    <a class="aMenu">Profil</a>
                 </li>
                 <li class="colonneMenu animationButtonMenu underLineHover">
-                    <a>Météo</a>
+                    <a class="aMenu">Météo</a>
                 </li>
             </ul>
         </nav>

From fdab241a5c55b1a271b9c107c14ad9ee1e9b0c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Marro?= <marrosebastien@protonmail.com>
Date: Fri, 4 Dec 2020 00:35:47 +0100
Subject: [PATCH 3/6] update formulaire

---
 formulaire.html | 90 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/formulaire.html b/formulaire.html
index 803b29d..2f4012c 100644
--- a/formulaire.html
+++ b/formulaire.html
@@ -8,13 +8,13 @@
 
         <fieldset>
             <legend>Nom et Prénom</legend>
-            <input type="text" name="formulaire[nom]" placeholder="Nom">
-            <input type="text" name="formulaire[prenom]" placeholder="Prénom">
+            <input type="text" name="formulaire[nom]" placeholder="Nom" required>
+            <input type="text" name="formulaire[prenom]" placeholder="Prénom" required>
         </fieldset>
 
         <fieldset>
             <legend>Lieu et période</legend>
-            <select name="spot" id="spot" placeholder="Spot">
+            <select name="spot" id="spot" placeholder="Spot" required>
                 <option value="ville1">Ville 1</option>
                 <option value="ville2">Ville 2</option>
                 <option value="ville3">Ville 3</option>
@@ -36,10 +36,94 @@
 
         <fieldset>
             <legend>Produits utilisés</legend>
+            
             <input type="checkbox" name="creme_solaire" id="creme_solaire" /> 
+            <label for="creme_solaire">Crème solaire</label>
+
+            <input type="checkbox" name="parfum" id="parfum" /> 
+            <label for="parfum">Parfum/Déodorant</label>
+
+            <input type="checkbox" name="creme_hydratante" id="creme_hydratante" /> 
+            <label for="creme_hydratante">Crème hydratante</label>
+            
+            <input type="checkbox" name="maquillage" id="maquillage" /> 
+            <label for="maquillage">Maquillage</label>
+
+            <input type="checkbox" name="cigarettes" id="cigarettes" /> 
+            <label for="cigarettes">Cigarettes</label>
+
+            <input type="checkbox" name="engrais" id="engrais" /> 
+            <label for="engrais">Engrais/Pesticides</label>
+            
+            <input type="checkbox" name="peinture" id="peinture" /> 
+            <label for="peinture">Peinture</label>
+
+            <input type="checkbox" name="autres_produits" id="autres_produits" /> 
+            <label for="autres_produits">Autres</label>
+
+        </fieldset>
+
+
+        <fieldset>
+            <legend>Fréquentation</legend>
+            
+            <label for="baigneurs">Nombre de baigneurs</label>
+            <input type="number" name="nb_baigneurs" id="baigneurs" value=0 min=0 max=100/>
+            
+            <label for="baigneurs">Nombre de pratiquants d'activités nautiques</label>
+            <input type="number" name="pratiquant" id="pratiquant" value=0 min=0 max=100/> 
+            
+            <label for="baigneurs">Bâteaux de pêche</label>
+            <input type="number" name="bateau_peche" id="bateau_peche" value=0 min=0 max=100/> 
+            
+            <label for="baigneurs">Bâteaux de loisir</label>
+            <input type="number" name="bateau_loisir" id="bateau_loisir" value=0 min=0 max=100/> 
+            
+            <label for="baigneurs">Bâteaux à voile</label>
+            <input type="number" name="bateau_voile" id="bateau_voile" value=0 min=0 max=100/> 
             
         </fieldset>
 
+        <fieldset>
+            <legend>Pollution</legend>
+            
+            <input type="checkbox" name="microplastique" id="microplastique" /> 
+            <label for="quantite_microplastique">Microplastique</label>
+            <select name="quantite_microplastique" id="quantite_microplastique" >
+                <option value="un_peu">Un peu</option>
+                <option value="moyen">Moyen</option>
+                <option value="beaucoup">Beaucoup</option>
+            </select>
+
+            <input type="checkbox" name="dechets" id="dechets" /> 
+            <label for="dechets_select">Gros déchets plastiques</label>
+            <select name="dechets_select" id="dechets_select" >
+                <option value="un_peu">Un peu</option>
+                <option value="moyen">Moyen</option>
+                <option value="beaucoup">Beaucoup</option>
+            </select>
+
+
+            <input type="checkbox" name="petrole" id="petrole" /> 
+            <label for="petrole_select">Pétrole</label>
+            <select name="petrole_select" id="petrole_select">
+                <option value="un_peu">Un peu</option>
+                <option value="moyen">Moyen</option>
+                <option value="beaucoup">Beaucoup</option>
+            </select>
+
+
+            <input type="checkbox" name="autres_pollution" id="autres_pollution" /> 
+            <label for="autres_select">Autres (Velo, toilettes...)</label>
+            <select name="autres_select" id="autres_select">
+                <option value="un_peu">Un peu</option>
+                <option value="moyen">Moyen</option>
+                <option value="beaucoup">Beaucoup</option>
+            </select>
+            
+        </fieldset>
+
+
         <input type="submit" value="Envoyer" />
     </form>
 </html>
\ No newline at end of file

From 86506b11de5d6f6661a95616aec584845e5f0584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Marro?= <marrosebastien@protonmail.com>
Date: Fri, 4 Dec 2020 01:14:51 +0100
Subject: [PATCH 4/6] update formulaire

---
 css/formulaire.css | 24 ++++++++++++++++++++++++
 formulaire.html    | 23 ++++++++++++++---------
 2 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 css/formulaire.css

diff --git a/css/formulaire.css b/css/formulaire.css
new file mode 100644
index 0000000..08bccea
--- /dev/null
+++ b/css/formulaire.css
@@ -0,0 +1,24 @@
+h1 {
+    text-align: center;
+}
+
+legend {
+    margin: 0 auto;
+    margin-top: 3%;
+}
+
+fieldset{
+    margin: 0 auto;
+    width: 70%;
+}
+
+form {
+    text-align: center;
+}
+
+input[type="submit"]{
+    font-size: 15px;
+    padding: 5px;
+}
+
+
diff --git a/formulaire.html b/formulaire.html
index 2f4012c..20c8347 100644
--- a/formulaire.html
+++ b/formulaire.html
@@ -2,17 +2,20 @@
 <html>
     <header>
         <meta charset="UTF-8"/>
+        <link rel="stylesheet" href="css/formulaire.css" />
     </header>
+
+    <body>
     <form method="post" action="./traitement.php" name="formulaire">
         <h1>Session de surf</h1>
 
-        <fieldset>
+        <fieldset id="name_fieldset">
             <legend>Nom et Prénom</legend>
             <input type="text" name="formulaire[nom]" placeholder="Nom" required>
             <input type="text" name="formulaire[prenom]" placeholder="Prénom" required>
         </fieldset>
 
-        <fieldset>
+        <fieldset id="localisation_fieldset">
             <legend>Lieu et période</legend>
             <select name="spot" id="spot" placeholder="Spot" required>
                 <option value="ville1">Ville 1</option>
@@ -34,7 +37,7 @@
 
         </fieldset>
 
-        <fieldset>
+        <fieldset id="product_fieldset">
             <legend>Produits utilisés</legend>
             
             <input type="checkbox" name="creme_solaire" id="creme_solaire" /> 
@@ -64,7 +67,7 @@
         </fieldset>
 
 
-        <fieldset>
+        <fieldset id="population_fieldset">
             <legend>Fréquentation</legend>
             
             <label for="baigneurs">Nombre de baigneurs</label>
@@ -84,38 +87,39 @@
             
         </fieldset>
 
-        <fieldset>
+        <fieldset id="pollution_fieldset">
             <legend>Pollution</legend>
             
-            <input type="checkbox" name="microplastique" id="microplastique" /> 
             <label for="quantite_microplastique">Microplastique</label>
             <select name="quantite_microplastique" id="quantite_microplastique" >
+                <option value="Aucun">Aucun</option>
                 <option value="un_peu">Un peu</option>
                 <option value="moyen">Moyen</option>
                 <option value="beaucoup">Beaucoup</option>
             </select>
 
-            <input type="checkbox" name="dechets" id="dechets" /> 
+            
             <label for="dechets_select">Gros déchets plastiques</label>
             <select name="dechets_select" id="dechets_select" >
+                <option value="Aucun">Aucun</option>
                 <option value="un_peu">Un peu</option>
                 <option value="moyen">Moyen</option>
                 <option value="beaucoup">Beaucoup</option>
             </select>
 
 
-            <input type="checkbox" name="petrole" id="petrole" /> 
             <label for="petrole_select">Pétrole</label>
             <select name="petrole_select" id="petrole_select">
+                <option value="Aucun">Aucun</option>
                 <option value="un_peu">Un peu</option>
                 <option value="moyen">Moyen</option>
                 <option value="beaucoup">Beaucoup</option>
             </select>
 
 
-            <input type="checkbox" name="autres_pollution" id="autres_pollution" /> 
             <label for="autres_select">Autres (Velo, toilettes...)</label>
             <select name="autres_select" id="autres_select">
+                <option value="Aucun">Aucun</option>
                 <option value="un_peu">Un peu</option>
                 <option value="moyen">Moyen</option>
                 <option value="beaucoup">Beaucoup</option>
@@ -126,4 +130,5 @@
 
         <input type="submit" value="Envoyer" />
     </form>
+    </body>
 </html>
\ No newline at end of file

From 293402a19174741fea05ec6b2a4d6aaf98e5e86a Mon Sep 17 00:00:00 2001
From: unknown <lisa.deslandes@etu.unice.fr>
Date: Fri, 4 Dec 2020 01:22:13 +0100
Subject: [PATCH 5/6] Ajout classes PHP

---
 php/MeteoSpot.php   | 10 ++++++++++
 php/MeteoVille.php  |  9 +++++++++
 php/Spot.php        | 11 +++++++++++
 php/Utilisateur.php | 13 +++++++++++++
 php/Ville.php       | 11 +++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 php/MeteoSpot.php
 create mode 100644 php/MeteoVille.php
 create mode 100644 php/Spot.php
 create mode 100644 php/Utilisateur.php
 create mode 100644 php/Ville.php

diff --git a/php/MeteoSpot.php b/php/MeteoSpot.php
new file mode 100644
index 0000000..367015b
--- /dev/null
+++ b/php/MeteoSpot.php
@@ -0,0 +1,10 @@
+<?php
+
+
+class MeteoSpot
+{
+    private int $id;
+    private int $houle;
+    private int $maree;
+    private int $vent;
+}
\ No newline at end of file
diff --git a/php/MeteoVille.php b/php/MeteoVille.php
new file mode 100644
index 0000000..e2d616f
--- /dev/null
+++ b/php/MeteoVille.php
@@ -0,0 +1,9 @@
+<?php
+
+
+class MeteoVille
+{
+    private int $id;
+    private int $temperature;
+    private int $vent;
+}
\ No newline at end of file
diff --git a/php/Spot.php b/php/Spot.php
new file mode 100644
index 0000000..df31f67
--- /dev/null
+++ b/php/Spot.php
@@ -0,0 +1,11 @@
+<?php
+
+
+class spot
+{
+    private int $id;
+    private string $nom;
+    private Ville $ville;
+    private Meteo $meteo;
+    private Pollution $pollution;
+}
\ No newline at end of file
diff --git a/php/Utilisateur.php b/php/Utilisateur.php
new file mode 100644
index 0000000..388aa62
--- /dev/null
+++ b/php/Utilisateur.php
@@ -0,0 +1,13 @@
+<?php
+
+
+class Utilisateur
+{
+    private int $id;
+    private string $nom;
+    private string $prenom;
+    private string $pseudo;
+    private string $mail;
+    private string $password;
+
+}
\ No newline at end of file
diff --git a/php/Ville.php b/php/Ville.php
new file mode 100644
index 0000000..a441a24
--- /dev/null
+++ b/php/Ville.php
@@ -0,0 +1,11 @@
+<?php
+
+
+class Ville
+{
+    private int $id;
+    private string $nom;
+    private string $codePostal;
+    private int $temperature;
+    private MeteoVille $meteo;
+}
\ No newline at end of file

From b0c773248f66ba7f03fdd3640b2806cf622d6b5a Mon Sep 17 00:00:00 2001
From: unknown <lisa.deslandes@etu.unice.fr>
Date: Fri, 4 Dec 2020 01:31:37 +0100
Subject: [PATCH 6/6] Ajout classes PHP

---
 php/Hystorique.php | 10 ++++++++++
 php/Joueur.php     |  9 +++++++++
 php/Pointage.php   | 14 ++++++++++++++
 php/Pollution.php  |  9 +++++++++
 php/Produits.php   | 16 ++++++++++++++++
 php/Spot.php       |  4 ++--
 6 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 php/Hystorique.php
 create mode 100644 php/Joueur.php
 create mode 100644 php/Pointage.php
 create mode 100644 php/Pollution.php
 create mode 100644 php/Produits.php

diff --git a/php/Hystorique.php b/php/Hystorique.php
new file mode 100644
index 0000000..d657622
--- /dev/null
+++ b/php/Hystorique.php
@@ -0,0 +1,10 @@
+<?php
+
+
+class Hystorique
+{
+    private int $id;
+    private Utilisateur $utilisateur;
+    private Spot $spot;
+    private Pointage $pointage;
+}
\ No newline at end of file
diff --git a/php/Joueur.php b/php/Joueur.php
new file mode 100644
index 0000000..2ec093d
--- /dev/null
+++ b/php/Joueur.php
@@ -0,0 +1,9 @@
+<?php
+
+
+class Joueur
+{
+    private int $id;
+    private bool $estVivant;
+    private bool $estImposteur;
+}
\ No newline at end of file
diff --git a/php/Pointage.php b/php/Pointage.php
new file mode 100644
index 0000000..0f903fe
--- /dev/null
+++ b/php/Pointage.php
@@ -0,0 +1,14 @@
+<?php
+
+
+class Pointage
+{
+    private int $id;
+    private int $nbBaigneur;
+    private int $nbPratiquant;
+    private int $bateauPeche;
+    private int $bateauLoisir;
+    private int $bateauVoile;
+    private Produits $produit;
+    private int $niveauDechet;
+}
\ No newline at end of file
diff --git a/php/Pollution.php b/php/Pollution.php
new file mode 100644
index 0000000..0c38aa5
--- /dev/null
+++ b/php/Pollution.php
@@ -0,0 +1,9 @@
+<?php
+
+
+class Pollution
+{
+    private int $id;
+    private int $niveauPollution;
+    private string $description;
+}
\ No newline at end of file
diff --git a/php/Produits.php b/php/Produits.php
new file mode 100644
index 0000000..f236321
--- /dev/null
+++ b/php/Produits.php
@@ -0,0 +1,16 @@
+<?php
+
+
+class Produits
+{
+    private int $id;
+    private bool $estCremeSolaire;
+    private bool $estCremeParfum;
+    private bool $estCremeHydratante;
+    private bool $estMaquillage;
+    private bool $estEssence;
+    private bool $estCigarette;
+    private bool $estEngrais;
+    private bool $estPeinture;
+    private string $autreProduit;
+}
\ No newline at end of file
diff --git a/php/Spot.php b/php/Spot.php
index df31f67..1653f8f 100644
--- a/php/Spot.php
+++ b/php/Spot.php
@@ -1,11 +1,11 @@
 <?php
 
 
-class spot
+class Spot
 {
     private int $id;
     private string $nom;
     private Ville $ville;
-    private Meteo $meteo;
+    private MeteoSpot $meteo;
     private Pollution $pollution;
 }
\ No newline at end of file