modification complète d'un pompier

include/class.pdo.php

@@ -102,7 +102,7 @@ class PdoBD
 				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;";
+				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 {

include/fct.inc.php

@@ -125,7 +125,9 @@ function estTableauEntiers($tabEntiers)
 	$ok = true;
 	foreach($tabEntiers as $unEntier)
 	{
-		if(!estEntierPositif($unEntier)){$ok=false;}
+		if(!estEntierPositif($unEntier)){
+			$ok=false;
+		}
 	}
 	return $ok;
 }

include/proceduresJava.js

@@ -358,11 +358,17 @@ $(document).on('click', '.click-garde', function () {
 $(document).on('click', '.btn-modif', function (e) {
 	e.preventDefault();
 
-	if ($('.infoPompier').attr('disabled') ==  'disabled') {
-		$('.infoPompier').attr('disabled', false);
+	if ($(this).attr('id') == 'zModifChef'){ //si le bouton modifier est celui du chef ou nom
+		element = $('.infoPompier-chef')
+	} else {
+		element = $('.infoPompier')
+	}
+
+	if (element.attr('disabled') ==  'disabled') {
+		element.attr('disabled', false);
 		$('.btn-valid-modif').css('display', 'block');
 	} else {
-		$('.infoPompier').attr('disabled', true);
+		element.attr('disabled', true);
 		$('.btn-valid-modif').css('display', 'none');
 	}
 })
@@ -385,7 +391,26 @@ $(document).on('click', '.btn-valid-modif', function (e) {
 			console.error("Erreur lors de la requête AJAX :", status, error);
 		}
 	});
-
-
-
 })
+
+
+/**
+ * Ajout d'un pompier
+ */
+$(document).on('click', '.validerAjout', function (e) {
+	e.preventDefault();
+
+	console.log('toto');
+
+	data = $('.dataPompierAjout').serialize()
+	$.ajax({
+		url: "/controleurs/c_pompiers.php?action=validerAjouter", 
+		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

@@ -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" class="btn-modif" id="zModif" title="Modifier" src="images/modif.gif">
+        <input type="image" class="btn-modif" id="zModifChef" 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')"> 
@@ -60,7 +60,12 @@ if ($_SESSION['statut'] == 2) {?>
 }?>
     </div>
     
-    <input type="hidden" name="action" value="<?php if($_REQUEST['action']=="liste") {echo "voir";} else {echo $_REQUEST['action'];}?>">
+    <input type="hidden" name="action" value="<?php 
+        if($_REQUEST['action'] == "liste") {
+            echo "voir";
+        } else {
+            echo $_REQUEST['action'];
+        }?>">
     <input type="hidden" name="type" value="<?= isset($_REQUEST['type']) ? $_REQUEST['type'] : '';?>">
     <input type="hidden" name="zType" value="*">
     <input type="hidden" name="zIndice" value="*">

vues/v_fichePompier.php

@@ -1,4 +1,3 @@
-
 <!-- affichage du detail de la fiche pompier / Derniere modification le 18 septembre 2023 par Pascal Blain -->
 <!-- ------------------------------------------------ fenetre modale en CSS -->
 <style>
@@ -56,7 +55,9 @@
 		box-shadow: 1px 1px 3px #000;
 	}
 
-.fermer:hover { background: #00d9ff; }
+	.fermer:hover {
+		background: #00d9ff;
+	}
 </style>
 <?php
 /*-----------------------------------------------------------------
@@ -96,11 +97,18 @@ echo ("
 	<tbody>
 		<!-- PARTIE SELCTION SEMAINE  -->
 		<tr>
-				<th><input id="sPrecedente" name="gauche" title="semaine précédente" src="images/gauche.gif" onclick="autreSemaine('<?php echo date('W',strtotime("-7 days",$premierJour))."', '".date('Y',strtotime("-7 days",$premierJour))?>')" onmouseover="document.gauche.src='images/gauche_.gif'" onmouseout="document.gauche.src='images/gauche.gif'"type="image"></th>
+			<th><input id="sPrecedente" name="gauche" title="semaine précédente" src="images/gauche.gif"
+					onclick="autreSemaine('<?php echo date('W', strtotime("-7 days", $premierJour)) . "', '" . date('Y', strtotime("-7 days", $premierJour)) ?>')"
+					onmouseover="document.gauche.src='images/gauche_.gif'"
+					onmouseout="document.gauche.src='images/gauche.gif'" type="image"></th>
 
-				<th colspan="26"><b><big>Semaine <?php echo $semaine." : du lundi ".date('d/m/Y',$premierJour)." au dimanche ".date('d/m/Y',strtotime("6 days",$premierJour))."</big></b></th>";?>
+			<th colspan="26"><b><big>Semaine
+						<?php echo $semaine . " : du lundi " . date('d/m/Y', $premierJour) . " au dimanche " . date('d/m/Y', strtotime("6 days", $premierJour)) . "</big></b></th>"; ?>
 
-				<th><input id="sSuivante" name="droite" title="semaine suivante" src="images/droite.gif" onclick="autreSemaine('<?php echo date('W',strtotime("+7 day",$premierJour))."', '".date('Y',strtotime("+7 day",$premierJour));?>')" onmouseover="document.droite.src='images/droite_.gif'" onmouseout="document.droite.src='images/droite.gif'"type="image"></th>
+			<th><input id="sSuivante" name="droite" title="semaine suivante" src="images/droite.gif"
+					onclick="autreSemaine('<?php echo date('W', strtotime("+7 day", $premierJour)) . "', '" . date('Y', strtotime("+7 day", $premierJour)); ?>')"
+					onmouseover="document.droite.src='images/droite_.gif'"
+					onmouseout="document.droite.src='images/droite.gif'" type="image"></th>
 		</tr>
 
 		<!-- PARTIE AFFICHAGE DES JOURS -->
@@ -161,10 +169,10 @@ echo ("
 			<br>
 			<?php
 			$i = 0;
-				foreach ($lesTypesDispos as $uneLigne)		
-				{ 
+			foreach ($lesTypesDispos as $uneLigne) {
 				if ($uneLigne["pIndice"] <> 3) {
-				echo '<input type="radio" name="brDispo" id="brDispo'.$i.'" value="'.$uneLigne["pIndice"].'"/><label for="brDispo'.$i.'">'.$uneLigne["pLibelle"].'</label><br>';}
+					echo '<input type="radio" name="brDispo" id="brDispo' . $i . '" value="' . $uneLigne["pIndice"] . '"/><label for="brDispo' . $i . '">' . $uneLigne["pLibelle"] . '</label><br>';
+				}
 				$i++;
 			}
 			?>
@@ -183,22 +191,22 @@ echo ("
 echo ("
 		<div style='display: none;' class='unOnglet' id='contenuOnglet2'>
 		<fieldset><legend>Gardes r&eacute;alis&eacute;es ");
-	if (count($lesGardes)==0) {echo "<i>(aucune garde enregistrée)</i></legend>";} else					
-{
+if (count($lesGardes) == 0) {
+	echo "<i>(aucune garde enregistrée)</i></legend>";
+} else {
 	echo ("<i>(" . count($lesGardes) . " gardes)</i></legend>
 			<table style='border: 0px solid white;'>
 				<tr><th class='controleLong'>Date de la garde</th>");
-	foreach ($lesTranches as $uneLigne)	{ echo ("<th>".$uneLigne['pLibelle']."</th>");}
+	foreach ($lesTranches as $uneLigne) {
+		echo ("<th>" . $uneLigne['pLibelle'] . "</th>");
+	}
 	$dateGarde = "premiere";
 	$colonne = 1;
 	echo "</tr>";
 
-	foreach ($lesGardes as $uneLigne)		
-	{ 
-		if ($dateGarde != $uneLigne['wDate'])
-		{
-			if ($dateGarde !=  "premiere")
-			{
+	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++;
@@ -210,11 +218,17 @@ echo ("
 			$dateGarde = $uneLigne['wDate'];
 			$colonne = 1;
 		}
-		while ($colonne<$uneLigne['aTranche']) {echo "<td class='controle' style='text-align : center;'>&nbsp;</td>"; $colonne++;}
+		while ($colonne < $uneLigne['aTranche']) {
+			echo "<td class='controle' style='text-align : center;'>&nbsp;</td>";
+			$colonne++;
+		}
 		echo ("<td class='controle' style='text-align : center;background-color : lime;'>&nbsp;</td>");
 		$colonne = $uneLigne['aTranche'] + 1;
 	}
-	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>";
 	echo ("</table>");
 }
@@ -230,7 +244,7 @@ echo ("
 				<td style='border :0px;'>
 				<fieldset><legend>Coordonn&eacute;es</legend>
 					<table>
-						<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 style='width:130px;'>Nom</th>		<td style='width:130px;'><input name='ztNom' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['nom'] . "' disabled></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> <input name='ztAdresse' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pAdresse'] . "' disabled></td> </tr>
 						<tr><th>Code postal</th>					<td> <input name='ztCodePostal' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pCp'] . "' disabled></td> </tr>
@@ -256,9 +270,45 @@ echo ("
 				</fieldset>
 				<fieldset><legend>Fonction</legend> 
 					<table>
-						<tr><th>Type</th>							<td> <input name='lstType' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wType'] . "' disabled></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> <input name='lstStatut' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wStatut'] . "' disabled></td> </tr>
+						<tr><th>Type</th> <td>
+							<select name='lstType' class='infoPompier-chef' disabled>");
+							foreach ($pdo->getParametre('typePer') as $key => $value) {
+								if ($lesInfosPompier['wType'] == $value['pLibelle']) {
+									echo ("<option value=" . $value['pIndice'] . " selected> " . $value['pLibelle'] . "</option>");
+								} else {
+									echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+								}
+							}
+
+
+							echo ("</td> </tr>
+
+							<tr><th>Grade</th> <td>
+							<select name='lstGrade' class='infoPompier-chef' disabled>");
+							foreach ($pdo->getParametre('grade') as $key => $value) {
+								if ($lesInfosPompier['wGrade'] == $value['pLibelle']) {
+									echo ("<option value=" . $value['pIndice'] . " selected> " . $value['pLibelle'] . "</option>");
+								} else {
+									echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+								}
+							}
+
+
+							echo ("</td> </tr>
+
+						<tr><th>Statut</th> <td> 
+						<select name='lstStatut' class='infoPompier-chef' disabled>");
+						foreach ($pdo->getParametre('statAgt') as $key => $value) {
+							if ($lesInfosPompier['wStatut'] == $value['pLibelle']) {
+								echo ("<option value=" . $value['pIndice'] . " selected> " . $value['pLibelle'] . "</option>");
+							} else {
+								echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+							}
+						}
+
+
+						echo ("</td> </tr>
+						</td> </tr>
 					</table>
 				</fieldset></td>
 			</tr>
@@ -267,15 +317,15 @@ echo ("
 			<fieldset><legend>Observations</legend>
 			<table style='border: 0px solid white;'>
 				<tr> 
-					 <td> <input name='ztObservation' type='text' class='infoPompier' value='" . $lesInfosPompier['pCommentaire'] . "' disabled></td></td>
+					 <td> <input name='ztObservation' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pCommentaire'] . "' disabled></td></td>
 				</tr>
 			</table>
 			</fieldset>
 			</form>
-		</div>
 			<input type='image' class='btn-valid-modif' id='validModif' title='Modifier' src='images/valider.jpg' style='display:none; margin: 0 auto;'>
-		");
 
+		</div>
+		");
 /*================================================================================================== Onglet X */
 echo ("
 		<div style='display: none;' class='unOnglet' id='contenuOngletX'>

vues/v_unParam.php

@@ -19,13 +19,23 @@
 <?php
 echo ("			<table>
                         <tr> <th>Indice</th>			<td>");
-						if ($action==="ajouter") {echo "<input class='controle' type='text' name='valeur' value='".$infosParam['pIndice']."'>";}
-						else {echo $infosParam['pIndice'];}  
+						if ($action === "ajouter") {
+							echo "<input class='controle' type='text' name='valeur' value='" . $infosParam['pIndice'] . "'>";
+						} else {
+							echo $infosParam['pIndice'];
+						}  
 echo ("				</td> </tr>
                         <tr> <th>Valeur</th>			<td>");
-						if ($action==="ajouter") 		{echo "<input class='controle' type='text' name='zLibelle'>";$actif=null;}
-						if ($action==="modifier") 	{echo "<input class='controleLong' type='text' name='zLibelle' value='".$infosParam['pLibelle']."'>";$actif=null;}
-						if ($action==="supprimer") 	{echo $infosParam['pLibelle'];$actif="disabled='disabled'";}  
+						if ($action === "ajouter") {
+							echo "<input class='controle' type='text' name='zLibelle'>";
+							$actif = null;
+						} else if ($action === "modifier") {
+							echo "<input class='controleLong' type='text' name='zLibelle' value='" . $infosParam['pLibelle'] . "'>";
+							$actif = null;
+						} else if ($action === "supprimer") {
+							echo $infosParam['pLibelle'];
+							$actif = "disabled='disabled'";
+						}  
 echo ("				</td> </tr>");
 						echo ("
 	  					<tr> <th>Plancher</th>			<td><input class='controle' type='text' name='zPlancher' value='".$infosParam['pPlancher']."'></td> </tr>						
@@ -39,7 +49,7 @@ echo ("
             </table>
         </div>
 
-        <p align="right">
+        <p style='margin: 0 auto;'>
             <input type="hidden" 	name="zOk" value="OK">
             <input type="image" 	name="btValider" alt="Valider" src="images/valider.jpg"  	onclick="this.form.submit();">
             <input type="image" 	name="btAnnuler" alt="Annuler" src="images/annuler.jpg" 	onclick="annuler('frmParam');">

vues/v_unPompier.php

@@ -31,10 +31,13 @@
 	}
 	if ($_REQUEST['action'] == "ajouter") {
 		echo "<h2>AJOUT D'UN NOUVEAU POMPIER</h2>";
-		echo '
-			<form name="frmA" action="index.php?choixTraitement=pompiers&action=validerAjouter&type='
-			. $lesInfosPompier['pType'].'" method="post" onsubmit="return valider(this)">';
-	}
+		
+		//action = index.php?choixTraitement=pompiers&action=validerAjouter&type=''
+		//onsubmit="return valider(this)">
+		echo('
+			<form class="dataPompierAjout" name="frmA" action="index.php?choixTraitement=pompiers&action=validerAjouter&type="
+			method="post" 
+		');
 		echo ("	
 		<table style='border: 0px solid white;'>
 		<tr>
@@ -61,24 +64,78 @@ if ($_REQUEST['action'] == "modifier") {
 		");
 		}
 		if ($_REQUEST['action'] == "ajouter") {
-	echo ("	<tr><th style='width:130px;'>Nom</th> <td style='width:130px;'><input id='ztNom' type='text' name='ztNom'></td> </tr>
 
+			echo ("
+				<tr><th style='width:130px;'>Nom</th>		<td style='width:130px;'><input name='ztNom' type='text' class='infoPompier'    ></td> </tr>
+				<tr><th>Pr&eacute;nom</th>					<td> <input name='ztPrenom' type='text' class='infoPompier infoPompier-chef'  ></td> </tr>
+				<tr><th>Adresse</th>						<td> <input name='ztAdresse' type='text' class='infoPompier infoPompier-chef'  ></td> </tr>
+				<tr><th>Code postal</th>					<td> <input name='ztCodePostal' type='text' class='infoPompier infoPompier-chef'  ></td> </tr>
+				<tr><th>Ville</th>							<td> <input name='ztVille' type='text' class='infoPompier infoPompier-chef'   ></td> </tr>
+				<tr><th>T&eacute;l&eacute;phone</th>		<td> <input name='ztTel' type='text' class='infoPompier-chef'  ></td> </tr>
+				<tr><th>Adresse &eacute;lectronique</th>	<td> <input name='ztMail' type='text' class='infoPompier infoPompier-chef'  ></td> </tr>
+				<tr><th>Nom de compte</th>					<td><input name='ztMail' type='text' class='infoPompier infoPompier-chef'  ></td></tr>
+				<input name='pId' type='hidden' class='infoPompier' value='" . $lesInfosPompier['id'] . "'  >
+				<tr><th style='width:130px;'>Code</th>		<td><input name='zCis' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['pCis'] . "'  ></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>
+				<tr><th>Groupement</th>						<td>" . $lesInfosPompier['cGroupement'] . "</td> </tr>
+
+				<tr><th>Type</th> <td>
+				<select name='lstType' class='infoPompier-chef'>");
+			foreach ($pdo->getParametre('typePer') as $key => $value) {
+				echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+			}
+			echo ("</td> </tr>
+				<tr><th>Grade</th> <td>
+				<select name='lstGrade' class='infoPompier-chef'>");
+			foreach ($pdo->getParametre('grade') as $key => $value) {
+				echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+			}
+
+
+			echo ("</td> </tr>
+
+			<tr><th>Statut</th> <td> 
+			<select name='lstStatut' class='infoPompier-chef'>");
+			foreach ($pdo->getParametre('statAgt') as $key => $value) {
+				echo ("<option value=" . $value['pIndice'] . "> " . $value['pLibelle'] . "</option>");
+			}
+
+
+			echo ("</td> </tr>
 			<br />");
+
+			echo ("
+						   </td> </tr>
+					   </table>
+				   </fieldset></td>
+			   </tr>
+			   </table>
+			   
+			   <fieldset><legend>Observations</legend>
+			   <table style='border: 0px solid white;'>
+				   <tr> 
+						<td> <input name='ztObservation' type='text' class='infoPompier' value='" . $lesInfosPompier['pCommentaire'] . "'  ></td></td>
+				   </tr>
+			   </table>
+			   </fieldset>
+			   	<div style='text-align:center; '>
+					<input type= 'image' class='validerAjout' alt='Valider' src= 'images/Valider.jpg'>
+					<input type= 'image' class='btAnnulerAjout' alt='Annuler' src= 'images/Annuler.jpg'>
+				</div>
+			   </form>
+		   </div>
+		   <input type='image' class='btn-valid-modif' id='validModif' title='Modifier' src='images/valider.jpg' style='display:none; margin: 0 auto;'>
+		   ");
+		}
 	}
 	?>
 	<table style='border: 0px solid white; '>
 		<tr>
-                <td style='border: 0px solid white;'>
-                	<fieldset><legend>Observations</legend>
-                 	<textarea name='ztObs' cols='70' rows='1'></textarea>					
-					</fieldset>					
-				</td>
-				<td>
-				<input type="image" 	name="btValider" 	alt="Valider" 	src="images/valider.jpg" value="OK" >
-				<input type="image"		name="btAnnuler" 	alt="Annuler" 	src="images/annuler.jpg" value="nonOK" 	onclick="annuler('frmA');">
-				</td>
 			<td style='border: 0px solid white; witdh:130px; text-align:right;'>
-                	<input type="hidden" 	name="zTypeAdm"		value="<?php// if ($type=="adm") {echo ("true");} else {echo ("false");} ?>">  
+				<input type="hidden" name="zTypeAdm"
+					value="<? php // if ($type=="adm") {echo ("true");} else {echo ("false");} ?>">
 				<input type="hidden" name="zOk" value="OK">
 
 			</td>