Merge branch 'master' of http://gitlab.univ-artois.fr/ili-2019-2020/microfolielens

WebContent/abonnes.html

@@ -18,8 +18,8 @@
         <div class="navbar">
             <ul>
                 <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">nos Abonnés</a></li>
-                
+                <li><a href="abonnes.html">Nos abonnés</a></li>
+                <li><a href="inscription.jsp">Inscription</a></li>
             </ul>
         </div><!-- end navbar -->
     </div><!-- end of header -->
@@ -27,19 +27,10 @@
 
         <div class="menu">
             <ul>
-              <li><a href="index.php">Accueil</a></li>
+              <li><a href="index.html">Accueil</a></li>
               <li><a href="abonnes.html">nos Abonnés</a></li>
-              
+              <li><a href="inscription.jsp">Inscription</a></li>
             </ul>
-
-            <div class="login"> <br />
-            <img src="img/contact.png" alt="" />
-                <form action="cnx.php" method="post">
-                    <input value="Username" name="user" type="text" />
-                    <input value="password" name="pwd" type="password" /> <br />
-                    <input value="Login" name="sub" type="submit" />
-                </form>
-            </div>
         </div><!--end menu -->
         <div class="content">
      

WebContent/index.html

@@ -18,8 +18,8 @@
         <div class="navbar">
             <ul>
                 <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">nos Abonnés</a></li>
-                
+                <li><a href="abonnes.html">Nos abonnés</a></li>
+                <li><a href="inscription.jsp">Inscription</a></li>
                 
             </ul>
         </div><!-- end navbar -->
@@ -29,19 +29,10 @@
         <div class="menu">
             <ul>
               <li><a href="index.html">Accueil</a></li>
-               <li><a href="abonnes.html">Nos abonnées</a></li>
+               <li><a href="abonnes.html">Nos abonnés</a></li>
                <li><a href="inscription.jsp">Inscription</a></li>
                
             </ul>
-
-            <div class="login"> <br />
-            <img src="img/contact.png" alt="" />
-                <form action="cnx.php" method="post">
-                    <input value="Username" name="user" type="text" />
-                    <input value="password" name="pwd" type="password" /> <br />
-                    <input value="Login" name="sub" type="submit" />
-                </form>
-            </div>
         </div><!--end menu -->
         <div class="content">
      <header>

WebContent/inscription.jsp

@@ -22,8 +22,8 @@
         <div class="navbar">
             <ul>
                 <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">nos Abonnés</a></li>
-                
+                <li><a href="abonnes.html">Nos abonnés</a></li>
+                <li><a href="inscription.jsp">Inscription</a></li>
             </ul>
         </div>
     </div><!-- end of header -->

WebContent/js/mixChart.js

@@ -1,15 +1,11 @@
 var labels = [
-    "sunday",
-    "monday",
-    "tuesday",
-    "wednesday",
-    "thursday",
-    "friday",
-    "saturday"
+    "Mardi",
+    "Mercredi",
+    "Jeudi",
+    "Vendredi",
+    "Samedi"
 ];
 var frequentations = [
-    20,
-    14,
     12,
     15,
     18,
@@ -17,8 +13,6 @@ var frequentations = [
     22
 ];
 var moyennes = [
-    15,
-    17,
     17,
     19,
     18,
@@ -33,14 +27,14 @@ var mixChart = new Chart(mix, {
         datasets: [
             {
                 type: 'line',
-                label: "monthly average",
+                label: "Moyenne mensuelle",
                 data: moyennes,
                 borderColor: 'rgba(75, 192, 192, 1)',
                 backgroundColor: 'rgba(0, 0, 0, 0)',
                 yAxisID: 'frequentations',
             },
             {
-                label: "This week",
+                label: "Cette semaine",
                 data: frequentations,
                 borderColor: 'rgba(0, 0, 0, 0)',
                 backgroundColor: 'rgba(192, 75, 192, 0.5)',

WebContent/settings.html

@@ -19,8 +19,8 @@
         <div class="navbar">
             <ul>
                 <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">nos Abonnés</a></li>
-                
+                <li><a href="abonnes.html">Nos abonnés</a></li>
+                <li><a href="inscription.jsp">Inscription</a></li>
             </ul>
         </div><!-- end navbar -->
     </div><!-- end of header -->
@@ -31,7 +31,7 @@
      
 	      <main>         
 	         <div class="container">
-	            <h4 class="section-title">Nos espace:</h4>
+	            <h4 class="section-title">Nos espaces:</h4>
 	           <div>
 				<a href="http://localhost:8080/lens/configure?espace=accueil"><button type="button" class="btn btn-danger btn-lg espace" >Accueil</button></a>	 
 			   </div>

data/niveau.csv

@@ -0,0 +1,7 @@
+id,libelle
+1,Maternelle
+2,Elementaire
+3,College
+4,Lycee
+5,Universite
+6,Ecole d'ingenieur/Grande ecole

data/ville.csv

@@ -0,0 +1,51 @@
+id,libelle,codePostal
+1,Lille,59000
+2,Lens,62300
+3,Arras,62000
+4,Douai,59500
+5,Paris,75001
+6,Bethune,62400
+7,Valenciennes,59300
+8,Loison-sous-Lens,62218
+9,Marseille,13001
+10,Loos-en-Gohelle,62750
+11,Grenay,62160
+12,Noyelles-sous-Lens,62221
+13,Sallaumines,62430
+14,Avion,62210
+15,Lievin,62800
+16,Mericourt,62680
+17,Harnes,62440
+18,Fouquieres-les-Lens,62740
+19,Vendin-le-Vieil,62880
+20,Estevelles,62880
+21,Pont-a-Vendin,62880
+22,Bully-les-mines,62160
+23,Billy-Montigny,62420
+24,Angres,62143
+25,Annay,62880
+26,Carvin,62220
+27,Dunkerque,59140
+28,Calais,62100
+29,Henin-Beaumont,62110
+30,Bruay-la-Buissiere,62700
+31,Tourcoing,59200
+32,Roubaix,59100
+33,Villeneuve-d'Ascq,59650
+34,Marcq-en-Baroeul,59700
+35,Cambrai,59400
+36,Maubeuge,59600
+37,Lambersart,59130
+38,Armentieres,59280
+39,Hazebrouck,59190
+40,La Madeleine,59110
+41,Reims,51100
+42,Wattrelos,59150
+43,Bordeaux,33000
+44,Saint-Omer,62500
+45,Berck,62600
+46,Noeux-les-mines,62290
+
+
+
+