pierre.renaudot/sdis29-1
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sauvegarde 05/10/2023

Browse Source
This commit is contained in:
pierre renaudot
2023-10-05 08:54:15 +02:00
parent 9aa3a1dbf4
commit 438ab2f077
6 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/class.pdo.php
View File

@@ -202,7 +202,7 @@ class PdoBD
public function getInfosGardes($pompier)
{
$req = "SELECT aPompier, DATE_FORMAT(aDateGarde,'%d/%m/%Y') as wDate, aTranche, pLibelle as tLibelle
FROM activite INNER JOIN parametre ON pType='tranche' AND aTranche=pIndice
FROM activite INNER JOIN parametre ON pType = 'tranche' AND aTranche = pIndice
WHERE aCis=" . $_SESSION['cis'];
if ($pompier <> "*") {
$req .= " AND aPompier=" . $pompier;
@@ -232,9 +232,11 @@ class PdoBD
$fin = date('Y/m/d', strtotime("6 days", $premierJour));
$req = "SELECT pId, pNom, pPrenom, DATE_FORMAT(aDateGarde,'%d/%m/%Y') as wDate, aTranche, aDisponibilite, aGarde, d.pValeur as dCouleur
FROM (activite INNER JOIN parametre t ON t.pType='tranche'AND aTranche=t.pIndice
INNER JOIN parametre d ON d.pType='dispo' AND aDisponibilite=d.pIndice)
RIGHT OUTER JOIN pompier ON aCis=pCis AND aPompier=pId
FROM (activite
INNER JOIN parametre t ON t.pType='tranche'AND aTranche=t.pIndice
INNER JOIN parametre d ON d.pType='dispo' AND aDisponibilite=d.pIndice
)
RIGHT OUTER JOIN pompier ON aCis = pCis AND aPompier=pId
WHERE aCis=" . $_SESSION['cis'];
if ($pompier <> "*") {