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-15 10:39:48 +01:00
parent 3162d0eeb3
commit ad612c663c
4 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,8 +61,10 @@ public class GardeMySQL {
/* b) Maj de la collection lesVentil /* b) Maj de la collection lesVentil
*/ */
readAll(lesDispo, lesDates[0], lesDates[indiceDateFin]); readAll(lesDispo, lesDates[0], lesDates[indiceDateFin]);
//System.out.println("lesDispo : " + lesDispo); System.out.println("lesDispo : " + lesDispo);
return lesDispo; return lesDispo;
} }
public void readAll(ArrayList<Gardes> lesDispo, Calendar d1, Calendar d2) { public void readAll(ArrayList<Gardes> lesDispo, Calendar d1, Calendar d2) {
Pompier lePompier; Pompier lePompier;
@ -107,21 +109,21 @@ public class GardeMySQL {
/** /**
* Suppression de la garde passé en paramètre * Suppression de la garde passé en paramètre
* *
* @param v ventilation à supprimer * @param g ventilation à supprimer
* @return nb ligne a supprimer * @return nb ligne a supprimer
*/ */
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 idPompier=?" + "WHERE idPompier=?"
+ "AND periode=?" + " AND periode=?"
+ "AND jourGarde= ?;"; + " AND jourGarde= ?;";
try { try {
PreparedStatement prepStmt = theConnection.prepareStatement(sql); PreparedStatement prepStmt = theConnection.prepareStatement(sql);
prepStmt.setInt(1, g.getPompier().getId()); prepStmt.setInt(1, g.getPompier().getId());
prepStmt.setInt(2, g.getPeriode()); prepStmt.setInt(2, g.getPeriode());
prepStmt.setInt(3, g.getPeriode());
prepStmt.setDate(3, TrmtDate.getSQLDate(g.getJourGarde())); prepStmt.setDate(3, TrmtDate.getSQLDate(g.getJourGarde()));
nbMaj = prepStmt.executeUpdate(); nbMaj = prepStmt.executeUpdate();
} catch (SQLException ex) { } catch (SQLException ex) {
@ -140,16 +142,18 @@ public class GardeMySQL {
int idCree = -1; int idCree = -1;
String sql = "INSERT into gardes " String sql = "INSERT into gardes "
+ "(jourGarde, periode, idPompier, disponibilite, deGarde) " + "(jourGarde, periode, idPompier, disponibilite, deGarde) "
+ "VALUES (?, ?, ?,?,?)"; + "VALUES (?, ?, ?,?,?);";
try { try {
PreparedStatement prepStmt = null; // PreparedStatement prepStmt = null;
prepStmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); // prepStmt = theConnection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
PreparedStatement prepStmt = theConnection.prepareStatement(sql);
prepStmt.setDate(1, TrmtDate.getSQLDate(g.getJourGarde())); prepStmt.setDate(1, TrmtDate.getSQLDate(g.getJourGarde()));
prepStmt.setInt(2, g.getPeriode()); prepStmt.setInt(2, g.getPeriode());
prepStmt.setInt(3, g.getPompier().getId()); prepStmt.setInt(3, g.getPompier().getId());
prepStmt.setInt(4, g.getDisponibilite()); prepStmt.setInt(4, g.getDisponibilite());
prepStmt.setBoolean(5, g.isDeGarde());
System.out.println(prepStmt); System.out.println(prepStmt);
int nbLigne = prepStmt.executeUpdate(); int nbLigne = prepStmt.executeUpdate();
@ -180,18 +184,18 @@ public class GardeMySQL {
int nbMAJ = -1; int nbMAJ = -1;
String sql = "UPDATE gardes " String sql = "UPDATE gardes "
+ "SET disponibilite = ? " + "SET disponibilite = ?, deGarde = ? "
+ "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());
prepStmt.setInt(2, g.getPompier().getId()); prepStmt.setBoolean(2, g.isDeGarde());
prepStmt.setDate(3, TrmtDate.getSQLDate(g.getJourGarde())); prepStmt.setInt(3, g.getPompier().getId());
prepStmt.setInt(4, g.getPeriode()); prepStmt.setDate(4, TrmtDate.getSQLDate(g.getJourGarde()));
prepStmt.setInt(5, g.getPeriode());
System.out.println("update : " + prepStmt); System.out.println("update : " + prepStmt);
nbMAJ = prepStmt.executeUpdate(); nbMAJ = prepStmt.executeUpdate();
} catch (SQLException ex) { } catch (SQLException ex) {

33
src/java/bean/Gardes.java
View File

@ -18,13 +18,15 @@ public class Gardes {
Pompier pompier; Pompier pompier;
int disponibilite; int disponibilite;
boolean isInBDD; boolean isInBDD;
boolean deGarde;
public Gardes(Calendar jourGarde, int periode, Pompier pompier, int disponibilite, boolean isInBDD) { public Gardes(Calendar jourGarde, int periode, Pompier pompier, int disponibilite, boolean isInBDD, boolean deGarde) {
this.jourGarde = jourGarde; this.jourGarde = jourGarde;
this.periode = periode; this.periode = periode;
this.pompier = pompier; this.pompier = pompier;
this.disponibilite = disponibilite; this.disponibilite = disponibilite;
this.isInBDD = isInBDD; this.isInBDD = isInBDD;
this.deGarde = deGarde;
} }
public Gardes(Calendar jourGarde, int periode, Pompier pompier) { public Gardes(Calendar jourGarde, int periode, Pompier pompier) {
@ -32,7 +34,9 @@ public class Gardes {
this.periode = periode; this.periode = periode;
this.pompier = pompier; this.pompier = pompier;
} }
public Calendar getJourGarde() { public Calendar getJourGarde() {
return jourGarde; return jourGarde;
} }
@ -73,14 +77,23 @@ public class Gardes {
this.isInBDD = isInBDD; this.isInBDD = isInBDD;
} }
public boolean isDeGarde() {
return deGarde;
}
public void setDeGarde(boolean deGarde) {
this.deGarde = deGarde;
}
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 7; int hash = 5;
hash = 43 * hash + Objects.hashCode(this.jourGarde); hash = 37 * hash + Objects.hashCode(this.jourGarde);
hash = 43 * hash + this.periode; hash = 37 * hash + this.periode;
hash = 43 * hash + Objects.hashCode(this.pompier); hash = 37 * hash + Objects.hashCode(this.pompier);
hash = 43 * hash + this.disponibilite; hash = 37 * hash + this.disponibilite;
hash = 43 * hash + (this.isInBDD ? 1 : 0); hash = 37 * hash + (this.isInBDD ? 1 : 0);
hash = 37 * hash + (this.deGarde ? 1 : 0);
return hash; return hash;
} }
@ -105,6 +118,9 @@ public class Gardes {
if (this.isInBDD != other.isInBDD) { if (this.isInBDD != other.isInBDD) {
return false; return false;
} }
if (this.deGarde != other.deGarde) {
return false;
}
if (!Objects.equals(this.jourGarde, other.jourGarde)) { if (!Objects.equals(this.jourGarde, other.jourGarde)) {
return false; return false;
} }
@ -116,8 +132,9 @@ public class Gardes {
@Override @Override
public String toString() { public String toString() {
return "Gardes{" + "jourGarde=" + jourGarde + ", periode=" + periode + ", pompier=" + pompier + ", disponibilite=" + disponibilite + ", isInBDD=" + isInBDD + '}'; return "\nGardes{" + "jourGarde=" + jourGarde.getTime() + ", periode=" + periode + ", pompier=" + pompier + ", disponibilite=" + disponibilite + ", isInBDD=" + isInBDD + ", deGarde=" + deGarde + '}';
} }
} }

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

@ -18,24 +18,27 @@ import java.util.Map;
* @author clementine.desrucques * @author clementine.desrucques
*/ */
public class DispoForm { public class DispoForm {
HttpServletRequest request; HttpServletRequest request;
public void verifDispo(HttpServletRequest request){ public void verifDispo(HttpServletRequest request) {
HttpSession maS = request.getSession(); HttpSession maS = request.getSession();
ArrayList <Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit"); ArrayList<Gardes> lesG = (ArrayList<Gardes>) maS.getAttribute("lesVentilInit");
GardeMySQL vm = new GardeMySQL(); GardeMySQL vm = new GardeMySQL();
Map<String, String[]> map = request.getParameterMap(); Map<String, String[]> map = request.getParameterMap();
String[] lesNvVentil = map.get("lesActivites"); 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();
int newAct = Integer.parseInt(lesNvVentil[i]); int newAct = Integer.parseInt(lesNvVentil[i]);
if(oldAct != newAct){ if (oldAct != newAct) {
if(uneGarde.isIsInBDD()){ if (uneGarde.isIsInBDD()) {
if(newAct == 0){
if (newAct == 0) {
vm.delete(uneGarde); vm.delete(uneGarde);
uneGarde.setIsInBDD(false); uneGarde.setIsInBDD(false);
uneGarde.setDisponibilite(newAct);
} else { } else {
uneGarde.setDisponibilite(newAct); uneGarde.setDisponibilite(newAct);
vm.update(uneGarde); vm.update(uneGarde);
@ -45,6 +48,7 @@ public class DispoForm {
vm.create(uneGarde); vm.create(uneGarde);
uneGarde.setIsInBDD(true); uneGarde.setIsInBDD(true);
} }
} }
i++; i++;
} }

2
web/WEB-INF/feuilleGardes.jsp
View File

@ -55,6 +55,8 @@
<c:set var="activite" value='${uneVentil.getDisponibilite()}' scope="page"/> <c:set var="activite" value='${uneVentil.getDisponibilite()}' scope="page"/>
<td> <td>
<input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/> <input readonly type="text" value='${activite}' name="lesActivites"class="ztVentil ${sessionScope.lesCouleurs[activite]}"/>
<input type="checkbox" id="cbGarde"/>
</td> </td>
</c:forEach> </c:forEach>
</tr> </tr>