uap35-d/sdisM2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css
This commit is contained in:
clementine.desrucques
2021-12-14 09:51:00 +01:00
parent cac0c6423f
commit 332960f92d
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/bdd/GardeMySQL.java
View File

@@ -113,7 +113,7 @@ public class GardeMySQL {
public int delete(Gardes g) { public int delete(Gardes g) {
int nbMaj = -1; int nbMaj = -1;
String sql = "DELETE * FROM gardes " String sql = "DELETE * FROM gardes "
+ "WHERE idPompiere=?" + "WHERE idPompier=?"
+ "AND periode=?" + "AND periode=?"
+ "AND jourGarde= ?;"; + "AND jourGarde= ?;";
try { try {
@@ -139,8 +139,8 @@ public class GardeMySQL {
public int create(Gardes g) { public int create(Gardes g) {
int idCree = -1; int idCree = -1;
String sql = "INSERT into gardes " String sql = "INSERT into gardes "
+ "(jourGarde, periode, idPompier, disponibilite) " + "(jourGarde, periode, idPompier, disponibilite, deGarde) "
+ "VALUES (?, ?, ?,?)"; + "VALUES (?, ?, ?,?,?)";
try { try {
PreparedStatement prepStmt = null; PreparedStatement prepStmt = null;
@@ -179,11 +179,13 @@ public class GardeMySQL {
public int update(Gardes g) { public int update(Gardes g) {
int nbMAJ = -1; int nbMAJ = -1;
String sql = "UPDATE garde " String sql = "UPDATE gardes "
+ "SET disponibilite = ? " + "SET disponibilite = ? "
+ "WHERE idPompier = ? " + "WHERE idPompier = ? "
+ "AND jourGarde = ? " + "AND jourGarde = ? "
+ "AND periode = ?"; + "AND periode = ?"
+ "AND deGarde = ?"
;
try { try {
PreparedStatement prepStmt = theConnection.prepareStatement(sql); PreparedStatement prepStmt = theConnection.prepareStatement(sql);
prepStmt.setInt(1, g.getDisponibilite()); prepStmt.setInt(1, g.getDisponibilite());

2
src/java/form/DispoForm.java
View File

@@ -26,7 +26,7 @@ public class DispoForm {
GardeMySQL vm = new GardeMySQL(); GardeMySQL vm = new GardeMySQL();
Map<String, String[]> map = request.getParameterMap(); Map<String, String[]> map = request.getParameterMap();
String[] lesNvVentil = map.get("lesAct"); String[] lesNvVentil = map.get("lesActivites");
int i = 0; int i = 0;
for(Gardes uneGarde : lesG){ for(Gardes uneGarde : lesG){
int oldAct = uneGarde.getDisponibilite(); int oldAct = uneGarde.getDisponibilite();

10
web/WEB-INF/web.xml
View File

@@ -24,10 +24,7 @@
<servlet-name>GPServlet</servlet-name> <servlet-name>GPServlet</servlet-name>
<servlet-class>servlet.GPServlet</servlet-class> <servlet-class>servlet.GPServlet</servlet-class>
</servlet> </servlet>
<servlet>
<servlet-name>GardesServlet</servlet-name>
<servlet-class>servlet.GardesServlet</servlet-class>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AuthentifServlet</servlet-name> <servlet-name>AuthentifServlet</servlet-name>
<url-pattern>/authentification</url-pattern> <url-pattern>/authentification</url-pattern>
@@ -44,10 +41,7 @@
<servlet-name>GPServlet</servlet-name> <servlet-name>GPServlet</servlet-name>
<url-pattern>/PompierGarde</url-pattern> <url-pattern>/PompierGarde</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>GardesServlet</servlet-name>
<url-pattern>/gardes</url-pattern>
</servlet-mapping>
<session-config> <session-config>
<session-timeout> <session-timeout>
30 30