Selaa lähdekoodia

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

TIBAL 5 vuotta sitten
vanhempi
sitoutus
dc9dab4374

+ 6 - 15
WebContent/abonnes.html

@@ -6,7 +6,7 @@
 
 <head>
 	<meta charset="UTF-8">
-  <title>Bienvenu à microfolie</title>
+  <title>Bienvenue à microfolie</title>
   <link rel="stylesheet" type="text/css" href="css/style.css">
   <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
   <link rel="stylesheet" href="css/style.css" type="bootstrap/css/bootstrap.min.css"  />
@@ -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="abonnes.html">nos Abonnés</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">
      

+ 5 - 14
WebContent/index.html

@@ -6,7 +6,7 @@
 
 <head>
 	<meta charset="UTF-8">
-  <title>Bienvenu à microfolie</title>
+  <title>Bienvenue à microfolie</title>
   <link rel="stylesheet" type="text/css" href="css/style.css">
   <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
   <link rel="stylesheet" href="css/style.css" type="bootstrap/css/bootstrap.min.css"  />
@@ -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,24 +29,15 @@
         <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>
 
-         <h4>Fréquentation des espaces de microfolies</h4>
+         <h4>Fréquentation des espaces de microfolie</h4>
 
       </header>
 

+ 89 - 87
WebContent/inscription.jsp

@@ -4,13 +4,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Inscription</title>
-  <script src="js/index.js" type="text/javascript"></script>
-    <script src="js/index.js" type="number/javascript"></script>
   <link rel="stylesheet" type="text/css" href="css/style.css">
   <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
   <link rel="stylesheet" href="css/style.css" type="bootstrap/css/bootstrap.min.css"  />
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
 
   
 </head>
@@ -22,97 +19,102 @@
         <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 -->
     <div class="main">
-
-    
+    	 <div class="menu">
+            <ul>
+              <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><!--end menu -->
         <div class="content">
-    
-
-     
-
-    </div><!-- end of main div -->
-    <br>
-  	<h1>Inscription à l'espace microfolies</h1>
-  
-<br>
-
-  <form>
-  <div class="form-group row">
-  <label  class="col-2 col-form-label">Nom* </label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label">Prénom*</label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label">Genre*</label>
-  <div class="col-3">
-<select class="form-control"  required>
-  	<option>Homme</option>
-    <option>Femmme</option>
-    <option>Autre</option>
-</select>  
-</div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label">Date de naissance*</label>
-  <div class="col-10">
-    <input class="form-control" type="date" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label">Ville*</label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label">Situation*</label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label class="col-2 col-form-label">Email*</label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label class="col-2 col-form-label" >Téléphone *</label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row">
-  <label  class="col-2 col-form-label" >Contact d'urgence* </label>
-  <div class="col-10">
-    <input class="form-control" type="text" required>
-  </div>
-</div>
-<div class="form-group row" type="text">
-  <label  class="col-2 col-form-label" >Pièce jointe</label>
-  <div class="col-10">
-    <input class="form-control" type="file" required>
-  </div>
-</div>
-  <button type="submit" class="btn btn-primary">Submit</button>
-</form>
-</body>
-</body>
-  <div class="clear"></div>
+        	<header>
+         		<h4>Inscription à l'espace microfolies</h4>
+      		</header>
+		      <main>
+					<form>
+					 	 <div class="form-group row">
+					  		<label  class="col-2 col-form-label">Nom* </label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+					  	</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label">Prénom*</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+						</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label">Genre*</label>
+					  		<div class="col-3">
+								<select class="form-control"  required>
+									<option value=""></option>
+								  	<option>Homme</option>
+								    <option>Femme</option>
+								    <option>Autre</option>
+								</select>  
+							</div>
+						</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label">Date de naissance*</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="date" required>
+					  		</div>
+						</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label">Ville*</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+						</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label">Situation*</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+						</div>
+						<div class="form-group row">
+						 	<label class="col-2 col-form-label">Email*</label>
+						  	<div class="col-10">
+						   		 <input class="form-control" type="text" required>
+						  	</div>
+						</div>
+						<div class="form-group row">
+					  		<label class="col-2 col-form-label" >Téléphone *</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+						</div>
+						<div class="form-group row">
+					  		<label  class="col-2 col-form-label" >Contact d'urgence* </label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="text" required>
+					  		</div>
+						</div>
+						<div class="form-group row" type="text">
+					  		<label  class="col-2 col-form-label" >Pièce jointe</label>
+					  		<div class="col-10">
+					    		<input class="form-control" type="file" />
+					  		</div>
+						</div>
+					  	<button type="submit" class="btn btn-primary">Valider</button>
+					</form>
+		      </main>
+    	</div><!-- end of content div -->
+    </div><!-- end of main div --> 
+	<br> 
+	<div class="clear"></div>
     <div class="footer"></div>
     </div>
+</body>
+  
 </html>
 
 

+ 7 - 13
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)',

+ 61 - 46
WebContent/scan/index.html

@@ -1,55 +1,70 @@
 <!DOCTYPE html>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
+  	<meta charset="UTF-8">
     <title>Instascan</title>
     <script type="text/javascript" src="https://rawgit.com/schmich/instascan-builds/master/instascan.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../css/style.css">
+  	<link rel="stylesheet" href="../css/style1.css" type="text/css"  /> 
+  	<link rel="stylesheet" href="../css/style.css" type="bootstrap/css/bootstrap.min.css"  />
   </head>
   <body>
-	<h1>Scanner QrCODE</h1>
-    <video id="preview"></video>
-    <script type="text/javascript">
-	    //Recupération du cookie espace
-		function getCookieVal(offset) {
-			let endstr = document.cookie.indexOf (";", offset);
-			if (endstr==-1)
-				endstr = document.cookie.length;
-			return unescape(document.cookie.substring(offset, endstr));
-		}
-	
-		function getCookie (name) {
-			let arg = name + "=";
-			let alen = arg.length;
-			let clen = document.cookie.length;
-			let i = 0;
-			while (i < clen) {
-				let j = i+alen;
-				if (document.cookie.substring(i, j) == arg)
-					return getCookieVal(j);
-				i = document.cookie.indexOf(" ",i)+1;
-				if (i == 0)
-					break;
-			}
-			return null;
-		}
-		
-    	let espace = getCookie("microfolies.lens.espace");
-    	console.log(espace);
+  	<div id="principal">
+    	<div class="header">
+    	</div><!-- end of header -->
     	
-  		//Scanner QRcode
-		let scanner = new Instascan.Scanner({ video: document.getElementById('preview') });
-		scanner.addListener('scan', function (content) {
-			espace ? console.log(content + "/" + espace) : console.log(content);
-		});
-		Instascan.Camera.getCameras().then(function (cameras) {
-			if (cameras.length > 0) {
-		    	scanner.start(cameras[0]);
-		    }
-			else {
-		    console.error('No cameras found.');
-		    }
-		}).catch(function (e) {
-		    console.error(e);
-		});
-    </script>
+    	<div class="main">
+        
+        	<div class="content">
+			    <h1>Accueil</h1>
+			    <video id="preview"></video>
+			    <script type="text/javascript">
+				    //Recupération du cookie espace
+					function getCookieVal(offset) {
+						let endstr = document.cookie.indexOf (";", offset);
+						if (endstr==-1)
+							endstr = document.cookie.length;
+						return unescape(document.cookie.substring(offset, endstr));
+					}
+				
+					function getCookie (name) {
+						let arg = name + "=";
+						let alen = arg.length;
+						let clen = document.cookie.length;
+						let i = 0;
+						while (i < clen) {
+							let j = i+alen;
+							if (document.cookie.substring(i, j) == arg)
+								return getCookieVal(j);
+							i = document.cookie.indexOf(" ",i)+1;
+							if (i == 0)
+								break;
+						}
+						return null;
+					}
+					
+			    	let espace = getCookie("microfolies.lens.espace");
+			    	console.log(espace);
+			    	
+			  		//Scanner QRcode
+					let scanner = new Instascan.Scanner({ video: document.getElementById('preview') });
+					scanner.addListener('scan', function (content) {
+						espace ? document.getElementById("resultScan").value = content + "/" + espace : document.getElementById("resultScan").value = content;
+					});
+					Instascan.Camera.getCameras().then(function (cameras) {
+						if (cameras.length > 0) {
+					    	scanner.start(cameras[0]);
+					    }
+						else {
+					    console.error('No cameras found.');
+					    }
+					}).catch(function (e) {
+					    console.error(e);
+					});
+			    </script>
+			    <textarea id="resultScan" read_only="true"></textarea>
+        	</div>
+        </div>
+	</div>
   </body>
 </html>

+ 0 - 66
WebContent/settings.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-	<meta charset="UTF-8">
-  <title>Bienvenu à microfolie</title>
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-  <link rel="stylesheet" type="text/css" href="css/settings.css">
-  <link rel="stylesheet" type="text/css" href="css/bootstrap/css/bootstrap.css">
-  <link rel="stylesheet" href="css/style1.css" type="text/css"  /> 
-</head>
-
-<body>
-<div id="principal">
-    <div class="header">
-        <div class="navbar">
-            <ul>
-                <li><a href="index.html">Accueil</a></li>
-                <li><a href="abonnes.html">nos Abonnés</a></li>
-                
-            </ul>
-        </div><!-- end navbar -->
-    </div><!-- end of header -->
-    <div class="main">
-
-       
-        <div class="content">
-     
-	      <main>         
-	         <div class="container">
-	            <h4 class="section-title">Nos espace:</h4>
-	           <div>
-	           	<button type="button" class="btn btn-danger btn-lg espace" onclick="lauchRequest('Accueil');">Accueil</button>
-	           </div>	           
-	         </div>	
-	      </main>
-    	</div><!-- end of main div -->
-    <div class="clear"></div>
-    <div class="footer"></div><!-- end footer div -->
-</div><!-- end of pricipal div -->
-
- 	  <script src="js/Chart.min.js" type="text/javascript"></script>
-      <script src="js/index.js" type="text/javascript"></script>
-      <script src="js/chart.js" type="text/javascript"></script>
-      <script src="js/bootstrap/js/bootstrap.js" type="text/javascript"></script>
-      
-      <script>
-      	function lauchRequest(espace){
-      		console.log(espace);
-      		const xmlhttp = new XMLHttpRequest();
-     	    // Get JSON File
-     	    xmlhttp.onreadystatechange = function() {
-     	       if (this.status == 200) {
-     	          console.log(this.responseText);
-     	       }
-     	    };
-     	    xmlhttp.open("GET", "http://localhost:8080/lens/configure?espace="+espace, true);
-     	    xmlhttp.send();
-      	}
-      </script>
-</body>
-
-</html>

+ 58 - 0
WebContent/settings/index.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+	<meta charset="UTF-8">
+  <title>Bienvenue à microfolie</title>
+  <link rel="stylesheet" type="text/css" href="../css/style.css">
+  <link rel="stylesheet" type="text/css" href="../css/settings.css">
+  <link rel="stylesheet" type="text/css" href="../css/bootstrap/css/bootstrap.css">
+  <link rel="stylesheet" href="../css/style1.css" type="text/css"  /> 
+</head>
+
+<body>
+<div id="principal">
+    <div class="header">
+        <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="inscription.jsp">Inscription</a></li>
+            </ul>
+        </div><!-- end navbar -->
+    </div><!-- end of header -->
+    <div class="main">
+
+       
+        <div class="content">
+     
+	      <main>         
+	         <div class="container">
+	            <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>
+			   <div>
+				<a href="http://localhost:8080/lens/configure?espace=imprimante3D"><button type="button" class="btn btn-danger btn-lg espace" >Imprimante 3D</button></a>	 
+			   </div>	           
+	         </div>	
+	      </main>
+    	</div><!-- end of main div -->
+    <div class="clear"></div>
+    <div class="footer"></div><!-- end footer div -->
+</div><!-- end of pricipal div -->
+
+ 	  <script src="js/Chart.min.js" type="text/javascript"></script>
+      <script src="js/index.js" type="text/javascript"></script>
+      <script src="js/chart.js" type="text/javascript"></script>
+      <script src="js/bootstrap/js/bootstrap.js" type="text/javascript"></script>
+      
+      <script>
+      	
+      </script>
+</body>
+
+</html>

+ 7 - 0
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

+ 51 - 0
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
+
+
+
+

+ 0 - 1
src/servlets/Configure.java

@@ -35,7 +35,6 @@ public class Configure extends HttpServlet {
 			throws ServletException, IOException {
 
 		String mySpace = request.getParameter("espace");
-		System.out.println(mySpace);
 		String page;
 
 		/**