Modification du pompier

controleurs/c_infoPompier.php

@@ -0,0 +1,3 @@
+<?php
+
+$pdo

controleurs/c_pompiers.php

@@ -10,8 +10,7 @@
 //*****************************************'
 $action = $_REQUEST['action'];
 switch ($action) {
-case 'voir':
+	case 'voir': {
-	{
 			$formulaire = "choixP"; //Donne le focus dans le form
 			$champ = "lstPompiers";
 			include("vues/v_entete.php");
@@ -47,8 +46,7 @@ case 'voir':
 	//----------------------------------------- FORMULAIRE DE SAISIE
 	case 'ajouter':
 	case 'modifier':
-case 'supprimer':
+	case 'supprimer': {
-	{ 
 			$formulaire = "frmA";
 			$champ = "ztNom";
 			include("vues/v_entete.php");
@@ -61,17 +59,20 @@ case 'supprimer':
 			break;
 		}
 	//----------------------------------------- VALIDATION	
-case 'validerAjouter':
-case 'validerModifier':	
 	case 'validerSupprimer':
-	{
+		$valeur = $_REQUEST['pId'];
-		$valeur	= $_REQUEST['agent'];		
-		if ($_REQUEST['zOk'] == "OK") 
-		{
-			if ($action === "validerSupprimer") {
 		$pdo->supprimePompier($valeur);
+		break;
+	case 'validerAjouter':
+	case 'validerModifier': {
+			var_dump($_REQUEST);
+
+			if (!isset($pdo)) {
+				require_once ("../include/class.pdo.php");
+				$pdo = PdoBD::getPdoBD();
 			}
-			else {
+
+			$pId = $_REQUEST['pId'];
 			$nom = addslashes($_REQUEST['ztNom']);
 			$prenom = addslashes($_REQUEST['ztPrenom']);
 			$type = $_REQUEST['lstType'];
@@ -79,60 +80,48 @@ case 'validerSupprimer':
 			$statut = $_REQUEST['lstStatut'];
 			$cis = $_REQUEST['zCis'];
 			$mail = $_REQUEST['ztMail'];
-				$login		= $_REQUEST['ztLogin'];
+			$login = strtolower($_REQUEST['ztPrenom'][0]) . strtoupper($_REQUEST['ztNom']);
-				$mdp		= md5($_REQUEST['ztMdp']);	if($_REQUEST['brMdp']==0 AND $action==="validerModifier") {$mdp="*";}
+			$mdp = md5($login);
+			//$mdp = md5($_REQUEST['ztMdp']);
+			// if ($_REQUEST['brMdp'] == 0 and $action === "validerModifier") {
+			// 	$mdp = "*";
+			// }
 			$adresse = addslashes($_REQUEST['ztAdresse']);
 
-				if (strlen($_REQUEST['ztCP']) > 1) {
+			if (strlen($_REQUEST['ztCodePostal']) > 1) {
-					$cp	= $_REQUEST['ztCP'];
+				$cp = $_REQUEST['ztCodePostal'];
 			} else {
 				$cp = "Null";
 			}
 			$ville = addslashes($_REQUEST['ztVille']);
 
-				if (strlen($_REQUEST['ztTel'])>1) {
+			if (strlen($_REQUEST['ztTel']) > 0) {
 				$tel = str_replace(" ", "", $_REQUEST['ztTel']);
 				$tel = str_replace(".", "", $tel);
 				$tel = str_replace("/", "", $tel);
 			} else {
 				$tel = "Null";
 			}
-				$commentaire = addslashes ($_REQUEST['ztObs']);
+			$commentaire = addslashes($_REQUEST['ztObservation']);
 
 			if ($action === "validerAjouter") {
-					$pdo->ajoutPompier($cis, $valeur,$nom,$prenom,$statut,$mail,$login,$mdp,$grade,$type,$adresse,$cp,$ville,$tel,$commentaire);
+				$pdo->ajoutPompier($cis, $pId, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
-					$sujet = "nouveau compte";
+			} elseif ($action === "validerModifier") {
-					$msg = "Bonjour " . $prenom . " " . $nom . ", \r\nLe Castel vient de créer un compte pour vous  ...\r\n";
+				$pdo->majPompier($cis, $pId, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
-				} else {
-					$pdo->majPompier($cis, $valeur,$nom,$prenom,$statut,$mail,$login,$mdp,$grade,$type,$adresse,$cp,$ville,$tel,$commentaire);
-					$sujet = "nouveau mot de passe";
-					$msg = "Bonjour " . $prenom . " " . $nom . ", \r\nLe Castel vient de modifier votre mot de passe  ...\r\n";
 			}
-				$entete	= "From: Pascal Blain <pascal-blain@wanadoo.fr>\r\n";
+			//header('location: index.php?choixTraitement=pompiers&action=voir&lstPompiers=' . $valeur);
-				$entete	.= "Mime-Version: 1.0\r\n";
-				$entete	.= "Content-type: text/html; charset=utf-8\r\n";
-				$entete	.= "\r\n";
-				$msg .= "Statut : " . $statut."\r\n";
-				$msg .= "Identifiant : " . $login."\r\n";
-				$msg .= "Mot de passe : " . $_REQUEST['ztMdp'] . "\r\n";
-				//$pdo->envoyerMail($mail, $sujet, $msg, $entete);
-				}
-		}
-		header ('location: index.php?choixTraitement=pompiers&action=voir&lstPompiers=' . $valeur);
 			break;
 		}
 
 	//----------------------------------------- 
-case 'majActivite':
+	case 'majActivite': {
-	{
 			$pdo->majActivite($_REQUEST["ztLaDate"], $_REQUEST["ztLaTranche"], $_REQUEST["ztExDispo"], $_REQUEST["brDispo"]);
 			header('location: index.php?choixTraitement=pompiers&action=voir&zSemaine=' . $_REQUEST["zSemaine"] . '&zAnnee=' . $_REQUEST["zAnnee"]);
 			break;
 		}
 
 	//----------------------------------------- 
-default :
+	default: {
-	{
 			echo 'erreur d\'aiguillage !' . $action;
 			break;
 		}

include/class.pdo.php

@@ -78,9 +78,31 @@ class PdoBD
 	 */
 	public function getInfosPompier($login, $mdp)
 	{
+		/*
 			  $req = "SELECT pCis, pId as id, pNom as nom, pPrenom as prenom, pStatut, pMail, pLogin, pMdp, pGrade, pAdresse, pCp, pVille, pBip, pCommentaire,
 				  'la caserne' as cNom, 'adresse' as cAdresse, 'telephone' as cTel, 'le groupement' as cGroupement, 'le grade' as wGrade, 'le statut' as wStatut, 'le type' as wType
 				  FROM  pompier";
+				  */
+		$req = "SELECT 
+					pCis, 
+					pId as id,
+					pNom as nom,
+					pPrenom as prenom,
+					pStatut, pMail,
+					pLogin, pMdp,
+					pAdresse,
+					pCp, pVille,
+					pBip, pCommentaire,
+					a.pLibelle AS wType,
+					b.pLibelle AS wGrade,
+					c.pLibelle AS wStatut,
+					cNom, cAdresse, 
+					cTel, cGroupement
+				FROM pompier 
+				INNER JOIN caserne ON pompier.pCis = caserne.cId
+				INNER JOIN parametre AS a ON a.pType = 'typePer' AND pompier.pType = a.pIndice
+				INNER JOIN parametre AS b ON b.pType = 'grade' AND pompier.pGrade = b.pIndice
+				INNER JOIN parametre AS c ON c.pType = 'statAgt' AND pompier.pStatut = c.pIndice;";
 		if ($login === "*") {
 			$req .= " WHERE pCis=" . $_SESSION['cis'] . " AND pId = $mdp";
 		} else {
@@ -100,7 +122,7 @@ class PdoBD
 	 */
 	public function majActivite($cis, $idUser, $jour, $tranche, $newDispo)
 	{
-		$existedTranche = 'SELECT aDisponibilite FROM `activite`
+		$existedTranche = 'SELECT aDisponibilite FROM  activite 
 					WHERE aCis = ' . $cis . ' AND aDateGarde = "' . $jour . '" AND aTranche = ' . $tranche . ' AND aPompier = ' . $idUser . ';';
 		$rs = PdoBD::$monPdo->query($existedTranche);
 		var_dump($rs);
@@ -152,14 +174,29 @@ class PdoBD
 	/**
 	 * Met à jour une ligne de la table pompier 
 	 */
-	public function majPompier($cis, $valeur, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire)
+	public function majPompier($cis, $pId, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire)
 	{
+		$grade = 7;
+		$type = 2;
+		$statut = 2;
+		date_default_timezone_set('Europe/Paris');
+		$dateUpdate = date('y-m-d h:i:s');
+
+
 		$req = "
-		
+			UPDATE pompier  
-		
+			SET  pCis ='$cis', pId ='$pId',
-		
+			pNom ='$nom', pPrenom ='$prenom',
-		
+			pStatut ='$statut', pType ='$type',
+			pMail ='$mail', pLogin ='$login',
+			pMdp ='$mdp', pAdresse ='$adresse',
+			pCp ='$cp', pVille ='$ville',
+			pBip ='$tel', pGrade ='$grade',
+			pCommentaire ='$commentaire', pDateModif ='$dateUpdate' 
+			WHERE pCis='$cis' AND pId = '$pId'
 		;";
+		var_dump($req);
+		die;
 		$rs = PdoBD::$monPdo->exec($req);
 		if ($rs === false) {
 			afficherErreurSQL("Probleme lors de la mise à jour du pompier dans la base de données.", $req, PdoBD::$monPdo->errorInfo());

include/proceduresJava.js

@@ -351,3 +351,41 @@ $(document).on('click', '.click-garde', function () {
 		});
 	}
 })
+
+/**
+ * Modifier 
+ */
+$(document).on('click', '.btn-modif', function (e) {
+	e.preventDefault();
+
+	if ($('.infoPompier').attr('disabled') ==  'disabled') {
+		$('.infoPompier').attr('disabled', false);
+		$('.btn-valid-modif').css('display', 'block');
+	} else {
+		$('.infoPompier').attr('disabled', true);
+		$('.btn-valid-modif').css('display', 'none');
+	}
+})
+$(document).on('click', '.btn-valid-modif', function (e) {
+	e.preventDefault();
+
+	$('.infoPompier-chef').attr('disabled', false);
+	data = $('.dataPompier').serialize()
+	$('.infoPompier-chef').attr('disabled', true);
+	$('.infoPompier').attr('disabled', true);
+	$('.btn-valid-modif').css('display', 'none');
+
+	$.ajax({
+		url: "/controleurs/c_pompiers.php?action=validerModifier", // URL de l'API ou de la ressource
+		method: "POST", // Méthode HTTP (GET, POST, etc.)
+		dataType: "json", // Type de données attendu
+		data : data,
+		error: function(xhr, status, error) {
+			// Gérer les erreurs de la requête AJAX
+			console.error("Erreur lors de la requête AJAX :", status, error);
+		}
+	});
+
+
+
+})

vues/v_choixPompier.php

@@ -12,7 +12,7 @@ if ($_SESSION['statut'] == 1) {
     $choix = $_SESSION['idUtilisateur'];
 } else {
     echo '
-        <select name="lstPompiers" STYLE="width:350px;" onchange="submit();">';
+        <select name="lstPompiers" STYLE="width:auto;" onchange="submit();">';
 
     if (!isset($_REQUEST['lstPompiers'])) {
         $choix = $_SESSION['idUtilisateur'];
@@ -44,7 +44,7 @@ echo ('
 if ($_SESSION['statut'] == 2) {?>
 
         <input type="image" id="zNouveau" title="Ajouter" src="images/ajout.gif" onclick="faire('choixP', 'ajouter')">
-        <input type="image" id="zModif" title="Modifier" src="images/modif.gif" onclick="faire('choixP', 'modifier')">
+        <input type="image" class="btn-modif" id="zModif" title="Modifier" src="images/modif.gif">
         <input type="image" id="zSupprime" title="Supprimer" src="images/supprimer.gif" onclick="faire('choixP', 'supprimer')">&nbsp;&nbsp;
         <input type="image" id="zPremier" title="premier" src="images/goPremier.gif" onclick="premier('choixP','lstPompiers')">    
         <input type="image" id="zPrecedent" title="précédent" src="images/goPrecedent.gif" onclick="precedent('choixP','lstPompiers')"> 
@@ -56,7 +56,7 @@ if ($_SESSION['statut'] == 2) {?>
         <?php
     } else {
         echo '
-            <input type="image" id="zModif" title="Modifier" src="images/modif.gif" onclick="faire(\'choixP\', \'modifier\')">';
+            <input type="image" class="btn-modif" id="zModif" title="Modifier" src="images/modif.gif">';
     }?>
     </div>
     

vues/v_entete.php

@@ -20,7 +20,7 @@
 		$champ = $_REQUEST['zChamp'];
 	}
 ?>	
-  <body onload="donner_focus('<?= $formulaire . ',' . $champ;?>');">
+  <body >
     <div id="page">
 		<div id="entete">
 	        <img src="./images/logo.png" id="logo" alt="SDIS29" title="SDIS 29" />

vues/v_fichePompier.php

@@ -192,13 +192,17 @@ echo ("
 	$dateGarde="premiere";
 	$colonne=1;
 	echo "</tr>";
+	
 	foreach ($lesGardes as $uneLigne)		
 	{ 
 		if ($dateGarde != $uneLigne['wDate'])
 		{
 			if ($dateGarde !=  "premiere")
 			{
-			while ($colonne<=count($lesTranches)) {echo "<td class='controle' style='text-align : center;'>&nbsp;</td>"; $colonne++;}
+			while ($colonne <= count($lesTranches)) {
+				echo "<td class='controle' style='text-align : center;'>&nbsp;</td>";
+				$colonne++;
+			}
 			echo "</tr>
 			";			
 			}
@@ -220,28 +224,30 @@ echo ("
 /*================================================================================================== COORDONNEES (3) */
  echo ("	
 	 	<div style='display: none;' class='unOnglet' id='contenuOnglet3'> 
+			<form class='dataPompier' method='post'>
  			<table style='border: 0px solid white;'>
 			<tr>
 				<td style='border :0px;'>
 				<fieldset><legend>Coordonn&eacute;es</legend>
 					<table>
-						<tr><th style='width:130px;'>Nom</th>		<td style='width:130px;'>".$lesInfosPompier['nom']."</td> </tr>
+						<tr><th style='width:130px;'>Nom</th>		<td style='width:130px;'><input name='ztNom' type='text' class='infoPompier' value='".$lesInfosPompier['nom']."' disabled></td> </tr>
-						<tr><th>Pr&eacute;nom</th>					<td>".$lesInfosPompier['prenom']."</td> </tr>
+						<tr><th>Pr&eacute;nom</th>					<td> <input name='ztPrenom' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['prenom']."' disabled></td> </tr>
-						<tr><th>Adresse</th>						<td>".$lesInfosPompier['pAdresse']."</td> </tr>
+						<tr><th>Adresse</th>						<td> <input name='ztAdresse' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pAdresse']."' disabled></td> </tr>
-						<tr><th>Code postal</th>					<td>".$lesInfosPompier['pCp']."</td> </tr>
+						<tr><th>Code postal</th>					<td> <input name='ztCodePostal' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pCp']."' disabled></td> </tr>
-						<tr><th>Ville</th>							<td>".$lesInfosPompier['pVille']."</td> </tr>
+						<tr><th>Ville</th>							<td> <input name='ztVille' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pVille']."' disabled></td> </tr>
-						<tr><th>T&eacute;l&eacute;phone</th>		<td>".$lesInfosPompier['pBip']."</td> </tr>
+						<tr><th>T&eacute;l&eacute;phone</th>		<td> <input name='ztTel' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['pBip']."' disabled></td> </tr>
-						<tr><th>Adresse &eacute;lectronique</th>	<td>".$lesInfosPompier['pMail']."</td> </tr>
+						<tr><th>Adresse &eacute;lectronique</th>	<td> <input name='ztMail' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pMail']."' disabled></td> </tr>
 						<tr><th>Nom de compte</th>					<td>" . $lesInfosPompier['pLogin'] . "</td></tr>
-						<tr><th>&nbsp;</th>							<td>&nbsp;</td> </tr>
+						<input name='pId' type='hidden' class='infoPompier' value='" . $lesInfosPompier['id']."' disabled>
 						<br />");
-echo ("			</table>
+echo ("			
+			</table>
 				</fieldset>
 				</td>	
 				<td style='border :0px;'>
 				<fieldset><legend>Centre d'Incendie et de Secours</legend> 
 					<table>
-						<tr><th style='width:130px;'>Code</th>		<td>".$lesInfosPompier['pCis']."</td> </tr>
+						<tr><th style='width:130px;'>Code</th>		<td><input name='zCis' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['pCis'] . "' disabled></td> </tr>
 						<tr><th>Nom</th>							<td>" . $lesInfosPompier['cNom'] . "</td> </tr>
 						<tr><th>Adresse</th>						<td>" . $lesInfosPompier['cAdresse'] . "</td> </tr>
 						<tr><th>T&eacute;l&eacute;phone</th>		<td>" . $lesInfosPompier['cTel'] . "</td> </tr>
@@ -250,9 +256,10 @@ echo ("			</table>
 				</fieldset>
 				<fieldset><legend>Fonction</legend> 
 					<table>
-						<tr><th>Type</th>							<td>".$lesInfosPompier['wType']."</td> </tr>
+						<tr><th>Type</th>							<td> <input name='lstType' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wType'] . "' disabled></td> </tr>
-						<tr><th>Grade</th>							<td>".$lesInfosPompier['wGrade']."</td> </tr>
+						<tr><th>Grade</th>							<td> <input name='lstGrade' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wGrade'] . "' disabled></td> </tr>
-						<tr><th>Statut</th>							<td>".$lesInfosPompier['wStatut']."</td> </tr>					</table>
+						<tr><th>Statut</th>							<td> <input name='lstStatut' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wStatut'] . "' disabled></td> </tr>
+					</table>
 				</fieldset></td>
 			</tr>
 			</table>
@@ -260,11 +267,14 @@ echo ("			</table>
 			<fieldset><legend>Observations</legend>
 			<table style='border: 0px solid white;'>
 				<tr> 
-					 <td>.".$lesInfosPompier['pCommentaire']."</td>
+					 <td> <input name='ztObservation' type='text' class='infoPompier' value='" . $lesInfosPompier['pCommentaire'] . "' disabled></td></td>
 				</tr>
 			</table>
 			</fieldset>
-		</div>");
+			</form>
+		</div>
+		<input type='image' class='btn-valid-modif' id='validModif' title='Modifier' src='images/valider.jpg' style='display:none; margin: 0 auto;'>
+		");
 
 /*================================================================================================== Onglet X */
 echo ("

vues/v_unPompier.php

@@ -23,7 +23,7 @@
 		); 	
 		echo ('
 			<form name="frmA" action="index.php?choixTraitement=pompiers&action=validerModifier&type=' 
-			. $lesInfosPompier['pType'] . '&agent='
+			. $lesInfosPompier['wType'] . '&agent='
 			. $lesInfosPompier['id']
 			. '&caserne=' . $lesInfosPompier['pCis']
 			. '" method="post">'