Skip to content
Snippets Groups Projects
Commit 7e01df24 authored by KenJoelTL's avatar KenJoelTL
Browse files

nettoyage fichier indexé

parent 0697f96c
Branches
Tags
1 merge request!99Remplacement de quelques scriptlet
Show whitespace changes
Inline Side-by-side
Showing
with 1879 additions and 2167 deletions
DefiLecture-JC/build.xml
+ 71
− 71
View file @ 7e01df24
DefiLecture-JC/build/web/META-INF/MANIFEST.MF deleted 100644 → 0
+ 0
− 2
View file @ 0697f96c
Manifest-Version: 1.0
DefiLecture-JC/build/web/META-INF/context.xml deleted 100644 → 0
+ 0
− 2
View file @ 0697f96c
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/DefiLecture-JC"/>
DefiLecture-JC/build/web/WEB-INF/web.xml deleted 100644 → 0
+ 0
− 50
View file @ 0697f96c
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
<context-param>
<param-name>piloteJDBC</param-name>
<param-value>com.mysql.jdbc.Driver</param-value>
</context-param>
<context-param>
<param-name>urlBd</param-name>
<param-value>jdbc:mysql://localhost/defilecture?useUnicode=true&amp;characterEncoding=UTF-8</param-value>
</context-param>
<context-param>
<param-name>adminName</param-name>
<param-value>admin</param-value>
</context-param>
<context-param>
<param-name>adminPassword</param-name>
<param-value>admin</param-value>
</context-param>
<context-param>
<param-name>userBD</param-name>
<param-value>root</param-value>
</context-param>
<context-param>
<param-name>passwordBD</param-name>
<param-value>root</param-value>
</context-param>
<context-param>
<description>Nombre de maximum de participant par équipe</description>
<param-name>nbParticipantMax</param-name>
<param-value>3</param-value>
</context-param>
<listener>
<listener-class>com.defiLecture.EcouteurApplication</listener-class>
</listener>
<servlet>
<servlet-name>CF</servlet-name>
<servlet-class>com.defiLecture.controleur.ControleurFrontal</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>CF</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
</web-app>
DefiLecture-JC/build/web/index.jsp deleted 100644 → 0
+ 0
− 175
View file @ 0697f96c
<%--
Document : index
Created on : 2017-10-14, 12:23:05
Author : Joel & Charles
--%>
<%@page import="com.defiLecture.modele.CompteDAO"%>
<%@page import="jdbc.Connexion"%>
<%@page import="jdbc.Config"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<c:if test="${ !empty sessionScope.connecte}">
<% CompteDAO dao = new CompteDAO(Connexion.startConnection(Config.DB_USER, Config.DB_PWD, Config.URL, Config.DRIVER));
pageContext.setAttribute("compteConnecte", dao.read(session.getAttribute("connecte").toString())); %>
</c:if>
<!DOCTYPE html>
<!-- Layout -->
<html>
<head>
<title>D&eacute;fi Lecture</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="./css/styles.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>
<body style="background-color: whitesmoke;">
<div class='container-fluid' style="margin-bottom: 50px" >
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href='*.do?tache=""'>D&eacute;fi-Lecture</a>
<!-- Apparait lorsque la fenêtre devient de la taille d'un téléphone mobile -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#optionsNavigation">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<!-- Options contenues dans le bouton à son activation -->
<div class="collapse navbar-collapse" id="optionsNavigation">
<ul class="nav navbar-nav">
<li class="active"><a href='*.do?tache=""'>Acceuil</a></li>
<c:if test="${ !empty sessionScope.connecte && sessionScope.role le 2 }">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Lectures
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="*.do?tache=afficherPageCreationLecture">Cr&eacute;er une lecture</a></li>
<li><a href="*.do?tache=afficherPageGestionLecture">Voir mes lectures</a></li>
</ul>
</li>
</c:if>
<li><a href="scoreboard.do?tache=afficherPageTableauScores">
<span class="glyphicon glyphicon-stats"></span>
Tableau des scores
</a>
</li>
<c:choose>
<c:when test="${ !empty sessionScope.connecte }">
<li><a href="*.do?tache=afficherPageProfil">Page de profil</a></li>
<c:choose>
<c:when test="${ (sessionScope.role eq 2) or (sessionScope.role eq 4) }">
<c:choose>
<c:when test="${compteConnecte.idEquipe gt -1}">
<li><a href="affichagePageEquipe.do?tache=afficherPageEquipe&idEquipe=${compteConnecte.idEquipe}">
Page d'&eacute;quipe</a>
</li>
<li><a href="joindreEquipe.do?tache=afficherPageListeDemandesEquipe&ordre=recu">
Acc&eacute;der aux demandes</a>
</li>
</c:when>
<c:otherwise>
<li><a href="creationEquipe.do?tache=afficherPageCreationEquipe">Cr&eacute;er une equipe</a></li>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${compteConnecte.idEquipe gt -1}">
<li><a href="affichagePageEquipe.do?tache=afficherPageEquipe&idEquipe=${compteConnecte.idEquipe}">
Page d'&eacutequipe</a>
</li>
</c:when>
<c:otherwise>
<li><a href="joindreEquipe.do?tache=afficherPageListeEquipes">Joindre une &eacute;quipe</a></li>
<li><a href="joindreEquipe.do?tache=afficherPageListeDemandesEquipe&ordre=envoyee">Acc&eacute;der aux demandes</a></li>
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<li style="background-color: #349737;">
<a href='*.do?tache=afficherPageInscription' style="color: #fff;" >
<span class="glyphicon glyphicon-education"></span> S'incrire</a>
</li>
</c:otherwise>
</c:choose>
<c:if test="${ !empty sessionScope.role }">
<c:if test="${ sessionScope.role eq 4 }">
<li class="active"><a href="*.do?tache=afficherPageGestionListeCompte">G&eacute;rer les comptes</a></li>
</c:if>
<c:if test="${ sessionScope.role ge 1 }">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">D&eacute;fis
<span class="caret"></span></a>
<ul class="dropdown-menu">
<c:if test="${ sessionScope.role ge 3 }">
<li><a href="*.do?tache=afficherPageCreationDefi">Cr&eacute;er un d&eacute;fi</a></li>
</c:if>
<li><a href="*.do?tache=afficherPageParticipationDefi">Voir les d&eacute;fis</a></li>
</ul>
</li>
</c:if>
</c:if>
</ul>
<ul class="nav navbar-nav navbar-right">
<c:choose>
<c:when test="${ empty sessionScope.connecte }">
<li><a href='*.do?tache=afficherPageConnexion'><span class="glyphicon glyphicon-log-in"></span> Se connecter</a></li>
</c:when>
<c:otherwise>
<li><a href='*.do?tache=effectuerDeconnexion'><span class="glyphicon glyphicon-log-in"></span> Se d&eacute;connecter</a></li>
</c:otherwise>
</c:choose>
</ul>
</div>
</div>
</nav>
</div>
<div class="container">
<c:choose>
<c:when test="${ !empty requestScope.vue }">
<c:set var="vue" value="/WEB-INF/vue/${requestScope.vue}"/>
<jsp:include page="${vue}" ></jsp:include>
</c:when>
<c:otherwise>
<jsp:include page="/WEB-INF/vue/accueil.jsp" ></jsp:include>
</c:otherwise>
</c:choose>
</div>
</body>
</html>
DefiLecture-JC/nbproject/build-impl.xml
+ 1454
− 1454
View file @ 7e01df24
DefiLecture-JC/nbproject/genfiles.properties
+ 8
− 8
View file @ 7e01df24
DefiLecture-JC/nbproject/private/private.properties deleted 100644 → 0
+ 0
− 24
View file @ 0697f96c
<<<<<<< HEAD
<<<<<<< HEAD
deploy.ant.properties.file=C:\\Users\\Charles\\AppData\\Roaming\\NetBeans\\8.2\\tomcat80.properties
file.reference.servlet-api.jar=E:\\Dossier d'\u00e9cole\\Mes Documents\\Session 6 [Automne 2017]\\Hypermedia II\\outils\\apache-tomcat-8.5.20\\lib\\servlet-api.jar
j2ee.server.home=E:/Dossier d'\u00e9cole/Mes Documents/Session 6 [Automne 2017]/Hypermedia II/outils/apache-tomcat-8.5.20
j2ee.server.instance=tomcat80:home=G:\\Dossier ecole\\1Automne2017\\Hypermedia II\\outils\\apache-tomcat-8.5.20
javac.debug=true
javadoc.preview=true
selected.browser=Chrome
user.properties.file=C:\\Users\\Charles\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
=======
deploy.ant.properties.file=C:\\Users\\Joel\\AppData\\Roaming\\NetBeans\\8.2\\tomcat80.properties
j2ee.server.home=F:/Dossier d'\u00e9cole/Mes Documents/Session 6 [Automne 2017]/Hypermedia II/outils/apache-tomcat-8.5.20
j2ee.server.instance=tomcat80:home=E:\\Dossier d'\u00e9cole\\Mes Documents\\Session 6 [Automne 2017]\\Hypermedia II\\outils\\apache-tomcat-8.5.20
selected.browser=Chrome
user.properties.file=C:\\Users\\Joel\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
>>>>>>> 3b5a36bf94f30510f497de86a53c4197eaa11ac0
=======
deploy.ant.properties.file=C:\\Users\\Joel\\AppData\\Roaming\\NetBeans\\8.2\\tomcat80.properties
j2ee.server.home=E:/Dossier d'\u00e9cole/Mes Documents/Session 6 [Automne 2017]/Hypermedia II/outils/apache-tomcat-8.5.20
j2ee.server.instance=tomcat80:home=E:\\Dossier d'\u00e9cole\\Mes Documents\\Session 6 [Automne 2017]\\Hypermedia II\\outils\\apache-tomcat-8.5.20
selected.browser=Chrome
user.properties.file=C:\\Users\\Joel\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
>>>>>>> masterAction
DefiLecture-JC/nbproject/private/private.xml deleted 100644 → 0
+ 0
− 11
View file @ 0697f96c
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/E:/Dossier%20d'école/Mes%20Documents/Session%206%20%5BAutomne%202017%5D/Hypermedia%20II/TP1/DefiLectureTp1/DefiLecture-JC/src/java/com/defiLecture/EcouteurApplication.java</file>
<file>file:/E:/Dossier%20d'école/Mes%20Documents/Session%206%20%5BAutomne%202017%5D/Hypermedia%20II/TP1/DefiLectureTp1/DefiLecture-JC/src/java/jdbc/Config.java</file>
<file>file:/E:/Dossier%20d'école/Mes%20Documents/Session%206%20%5BAutomne%202017%5D/Hypermedia%20II/TP1/DefiLectureTp1/DefiLecture-JC/src/java/jdbc/Connexion.java</file>
</group>
</open-files>
</project-private>
DefiLecture-JC/nbproject/project.properties
+ 103
− 106
View file @ 7e01df24
......@@ -46,9 +46,6 @@ j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7-web
<<<<<<< HEAD
=======
>>>>>>> 3b5a36bf94f30510f497de86a53c4197eaa11ac0
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.6.3.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/javax.el-api-3.0.0-javadoc.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl-1.2.2.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl-api-1.2.1.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/mysql-connector-java-5.1.44-bin.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.6.3.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/javax.el-api-3.0.0-javadoc.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl-1.2.2.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl-api-1.2.1.jar:${j2ee.server.home}/lib/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/mysql-connector-java-5.1.44-bin.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
j2ee.server.type=Tomcat
......
DefiLecture-JC/nbproject/project.xml
+ 44
− 44
View file @ 7e01df24
DefiLecture-JC/src/conf/MANIFEST.MF
+ 2
− 2
View file @ 7e01df24
DefiLecture-JC/src/java/jdbc/Connexion.java
+ 19
− 1
View file @ 7e01df24
......@@ -15,10 +15,13 @@ import java.sql.SQLException;
*/
public class Connexion {
private static Connection connection;
private Connection cnx;
private static String url;
private static String user;
private static String password;
public Connexion(){}
public static Connection getInstance() {
if (connection == null)
try {
......@@ -33,8 +36,23 @@ public class Connexion {
return connection;
}
public Connection getCnx(){
cnx = Connexion.getInstance();
return cnx;
}
public Connection getConnection(){
return Connexion.getInstance();
if (connection == null)
try {
if (user.equals(""))
connection = DriverManager.getConnection(url);
else
connection = DriverManager.getConnection(url,user,password);
} catch (SQLException e) {
e.printStackTrace();
}
return connection;
}
public static void reinit(){
......
DefiLecture-JC/web/WEB-INF/vue/pageParticipationDefi.jsp
+ 3
− 42
View file @ 7e01df24
......@@ -26,7 +26,7 @@
<%@page import="jdbc.Connexion"%>
<h2>Liste des défis</h2>
<% /*
<%
Connexion.reinit();
Connection cnx = Connexion.startConnection(Config.DB_USER,Config.DB_PWD,Config.URL,Config.DRIVER);
DefiDAO daoDefi = new DefiDAO(cnx);
......@@ -60,47 +60,8 @@ List<Defi> listeDefi;
%>
<jsp:useBean id="connexion" class="jdbc.Connexion"></jsp:useBean>
<jsp:useBean id="daoDefi" class="com.defiLecture.modele.DefiDAO">
<jsp:setProperty name="daoDefi" property="cnx" value="${connexion.connection}"></jsp:setProperty>
</jsp:useBean>
<jsp:useBean id="daoCompte" class="com.defiLecture.modele.CompteDAO">
<jsp:setProperty name="daoCompte" property="cnx" value="${connexion.connection}"></jsp:setProperty>
</jsp:useBean>
<c:set var="compte" scope="page" value="${dao.read(sessionScope.connecte)}"/>
<c:set var="role" scope="page" value="${compte.role}"/>
<c:choose>
<c:when test="${ role gt 3 }">
<c:set var="listeDefi" scope="page" value="${daoDefi.findHistorique()}"/>
</c:when>
<c:otherwise>
<c:set var="listeDefi" scope="page" value="${daoDefi.findAllByIdCompte(sessionScope.connecte)}"/>
</c:otherwise>
</c:choose>
<jsp:useBean id="daoInscriptionDefi" class="com.defiLecture.modele.InscriptionDefiDAO">
<jsp:setProperty name="daoInscriptionDefi" property="cnx" value="${connexion.connection}"></jsp:setProperty>
</jsp:useBean>
<c:set var="listeInscriptionDefi" scope="page" value="${daoInscriptionDefi.findAllByIdCompte(sessionScope.connecte)}"/>
<jsp:useBean id="listeReussi" class="java.util.ArrayList"></jsp:useBean>
<jsp:useBean id="listeEchoue" class="java.util.ArrayList"></jsp:useBean>
<c:forEach items="${listeInscriptionDefi}" var="i">
<c:choose>
<c:when test="${i.estReussi eq 1}">
${listeReussi.add(""+i.idDefi)}
</c:when>
<c:otherwise>
${listeEchoue.add(""+i.idDefi)}
</c:otherwise>
</c:choose>
</c:forEach>
<%/*
<%
for(InscriptionDefi i : listeInscriptionDefi){
if(i.getEstReussi() == 1)
listeReussi.add(""+i.getIdDefi());
......@@ -111,7 +72,7 @@ List<Defi> listeDefi;
pageContext.setAttribute("listeEchoue", listeEchoue);
//Création de la liste d'historique des défis
Connection cnx = Connexion.startConnection(Config.DB_USER,Config.DB_PWD,Config.URL,Config.DRIVER);*/
//Connection cnx = Connexion.startConnection(Config.DB_USER,Config.DB_PWD,Config.URL,Config.DRIVER);
%>
<table class="table">
<thead>
......
DefiLecture-JC/web/index.jsp
+ 175
− 175
View file @ 7e01df24
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment