ajout pompier

controleurs/c_pompiers.php

@@ -65,8 +65,14 @@ switch ($action) {
 		break;
 	case 'validerAjouter':
 	case 'validerModifier': {
-		var_dump($_REQUEST);
+			//var_dump($_REQUEST);
-			$valeur = $_REQUEST['pId'];
+
+			if (!isset($pdo)) {
+				require_once ("../include/class.pdo.php");
+				$pdo = PdoBD::getPdoBD();
+			}
+
+			$pId = isset($_REQUEST['pId']) ? $_REQUEST['pId'] : $pdo->getLastId($_REQUEST['zCis']);
 			$nom = addslashes($_REQUEST['ztNom']);
 			$prenom = addslashes($_REQUEST['ztPrenom']);
 			$type = $_REQUEST['lstType'];
@@ -74,11 +80,13 @@ switch ($action) {
 			$statut = $_REQUEST['lstStatut'];
 			$cis = $_REQUEST['zCis'];
 			$mail = $_REQUEST['ztMail'];
+			// $login = strtolower($_REQUEST['ztPrenom'][0]) . strtoupper($_REQUEST['ztNom']);
 			$login = $_REQUEST['ztLogin'];
-			$mdp = md5($_REQUEST['ztMdp']);
+			$mdp = md5($login);
-			if ($_REQUEST['brMdp'] == 0 and $action === "validerModifier") {
+			//$mdp = md5($_REQUEST['ztMdp']);
-				$mdp = "*";
+			// if ($_REQUEST['brMdp'] == 0 and $action === "validerModifier") {
-			}
+			// 	$mdp = "*";
+			// }
 			$adresse = addslashes($_REQUEST['ztAdresse']);
 
 			if (strlen($_REQUEST['ztCodePostal']) > 1) {
@@ -88,7 +96,7 @@ switch ($action) {
 			}
 			$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);
@@ -97,10 +105,19 @@ switch ($action) {
 			}
 			$commentaire = addslashes($_REQUEST['ztObservation']);
 
-			if ($action === "validerAjouter") {
+			if (
-				$pdo->ajoutPompier($cis, $valeur, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
+				$action === "validerAjouter"
+				&& $pdo->verifDataAjoutPompier($nom, $prenom, $tel, $mail, $login) === true
+			) {
+				//$pdo->ajoutPompier($cis, $pId, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
+				echo(json_encode(array("success"=> "Ajout effectuée")));
+
 			} elseif ($action === "validerModifier") {
-				$pdo->majPompier($cis, $valeur, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
+				$pdo->majPompier($cis, $pId, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire);
+				echo(json_encode(array("success"=> "Modification effectuée")));
+
+			} else {
+				echo(json_encode(array("error"=> "Merci de remplir tous les champs")));
 			}
 			//header('location: index.php?choixTraitement=pompiers&action=voir&lstPompiers=' . $valeur);
 			break;

include/class.pdo.php

@@ -79,10 +79,10 @@ 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,
+			  $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
+				  '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";
+				  FROM  pompier";
-			*/
+				  */
 		$req = "SELECT 
 					pCis, 
 					pId as id,
@@ -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 {
@@ -122,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);
@@ -174,13 +174,26 @@ 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'
 		;";
 		$rs = PdoBD::$monPdo->exec($req);
 		if ($rs === false) {
@@ -205,12 +218,19 @@ class PdoBD
 	/**
 	 * ajoute une ligne dans la table pompier
 	 */
-	public function ajoutPompier($cis, $valeur, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire)
+	public function ajoutPompier($cis, $id, $nom, $prenom, $statut, $mail, $login, $mdp, $grade, $type, $adresse, $cp, $ville, $tel, $commentaire)
 	{
 		$req = "INSERT INTO pompier 
-				(pCis,pId,pNom,pPrenom,pStatut,pMail,pLogin,pMdp,pGrade,pType, pAdresse,pCp,pVille,pBip,pCommentaire,pDateEnreg,pDateModif) 
+				(pCis,pId,pNom,pPrenom,pStatut,pMail,pLogin,pMdp,pGrade,pType, pAdresse,pCp,pVille,pBip,pCommentaire, pNbGardes, pDateEnreg, pDateModif) 
 				VALUES 
-					(
+					(" . $cis . ", " . $id . ",
+					'" . $nom . "', '" . $prenom . "',
+					" . $statut . ", '" . $mail . "',
+					'" . $login . "', '" . $mdp . "',
+					" . $grade . ", " . $type . ",
+					'" . $adresse . "', " . $cp . ",
+					'" . $ville . "', '" . $tel . "',
+					'" . $commentaire . "',0 ,CURRENT_DATE, CURRENT_DATE
 					);";
 		$rs = PdoBD::$monPdo->exec($req);
 		if ($rs === false) {
@@ -340,8 +360,8 @@ class PdoBD
 			$lesDispos[$pompier][$laDate][$couleur] = $uneLigne['dCouleur'];
 		}
 		/*			echo "<PRE>";
-						  print_r($lesDispos);
+								print_r($lesDispos);
-						  echo "</PRE>";*/
+								echo "</PRE>";*/
 		return $lesDispos;
 	}
 
@@ -525,6 +545,32 @@ class PdoBD
 		return $lesLignes;
 	}
 
+	public function getLastId($pCis) : int
+	{
+		$req = "SELECT MAX(pId) + 1 as id FROM pompier WHERE pCis =" . $pCis . ";";
+		$rs = PdoBD::$monPdo->query($req);
+		if ($rs === false) {
+			afficherErreurSQL("Erreur de lma requete pour l'id ajouter", $req, PdoBD::$monPdo->errorInfo());
+		}
+		$id = $rs->fetch();
+		return $id["id"];
+	}
+
+	public function verifDataAjoutPompier(
+		string $nom,
+		string $prenom, 
+		string $tel, 
+		string $mail, 
+		string $login
+	) : bool {
+
+		if (empty($nom) || empty($prenom) || empty($tel) || empty($mail) || empty($login)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
 }
 
 ?>

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

@@ -195,7 +195,7 @@ function format_euro(valeur) {
 // ========================= affiche l'onglet choisi 
  function Affiche(ongletChoisi, nb)
 {	
-	for(i=1;i<nb+1;i++)
+	for(i = 1; i < nb+1; i++)
 	{
 		document.getElementById('onglet'+i).className = 'inactif onglet';
 		document.getElementById('contenuOnglet'+i).style.display = 'none';
@@ -203,9 +203,9 @@ function format_euro(valeur) {
 	document.getElementById('onglet'+ongletChoisi).className = 'actif onglet';
 	document.getElementById('contenuOnglet'+ongletChoisi).style.display = 'block';
 
-	document.getElementById('zOnglet').value=ongletChoisi;
+	document.getElementById('zOnglet').value = ongletChoisi;
 	document.getElementById('zNbOnglets').value=nb;
-	ongletActif=ongletChoisi;
+	ongletActif = ongletChoisi;
 }
 // ========================= transfert des données d'une liste à une autre
 function deplacer_elements(frm, origine, destination) { 
@@ -358,14 +358,28 @@ $(document).on('click', '.click-garde', function () {
 $(document).on('click', '.btn-modif', function (e) {
 	e.preventDefault();
 
-	$('.infoPompier').attr('disabled', false);
+	if ($(this).attr('id') == 'zModifChef'){ //si le bouton modifier est celui du chef ou nom
-	$('.btn-valid-modif').css('display', 'block');
+		element = $('.infoPompier-chef')
+	} else {
+		element = $('.infoPompier')
+	}
 
+	if (element.attr('disabled') ==  'disabled') {
+		element.attr('disabled', false);
+		$('.btn-valid-modif').css('display', 'block');
+	} else {
+		element.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
@@ -377,7 +391,48 @@ $(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('submit', '.dataPompierAjout', function (e) {
+	e.preventDefault();
+	$('#inputDisabled').attr('disabled', false);
+
+	data = $('.dataPompierAjout').serialize()
+	$('#inputDisabled').attr('disabled', true);
+
+	$.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);
+		},
+		success: function(result) {
+			$('.dataPompierAjout').trigger("reset");			;
+			$('.notif-ajout').html(result['success'])
+		} 
+	});
+});
+$(document).on('click', '.btAnnulerAjout', function (e) {
+	e.preventDefault();
+
+	window.location.href = "http://sdis29-1/index.php?choixTraitement=pompiers&action=voir&type=a";
+})
+$(document).ready(function(){
+	$('#newName, #newUsername').change(function() { 
+		newUserName = $('#newUsername').val()[0].toLowerCase();
+		if (newUserName == undefined) {
+			newUserName = '';
+		}
+		newName = $('#newName').val().toUpperCase();
+
+		$('#newLogin').val(newUserName+newName)
+	});
+});
+

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')"> 
@@ -54,13 +54,18 @@ if ($_SESSION['statut'] == 2) {?>
             <input type="image" id="zSuivant" title="suivant" src="images/goSuivant.gif" onclick="suivant('choixP','lstPompiers')">    
             <input type="image" id="zDernier" title="dernier" src="images/goDernier.gif" onclick="dernier('choixP','lstPompiers')">    
         <?php
-    } else {
+} else {
-        echo '
+    echo '
-            <input type="image" class="btn-modif" id="zModif" title="Modifier" src="images/modif.gif">';
+        <input type="image" class="btn-modif" id="zModif" title="Modifier" src="images/modif.gif">';
-    }?>
+}?>
     </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_entete.php

@@ -4,6 +4,7 @@
   <head>
     <title>SDIS29</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
     <link href="./styles/styles.css" rel="stylesheet" type="text/css" />
 	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <link rel="shortcut icon" type="image/x-icon" href="./images/favicon.ico" />
@@ -20,7 +21,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

@@ -1,62 +1,63 @@
-
 <!-- affichage du detail de la fiche pompier / Derniere modification le 18 septembre 2023 par Pascal Blain -->
 <!-- ------------------------------------------------ fenetre modale en CSS -->
 <style>
-.fModale {
+	.fModale {
-	position	: fixed;
+		position: fixed;
-	font-family	: Arial, Helvetica, sans-serif;
+		font-family: Arial, Helvetica, sans-serif;
-	top			: 0;
+		top: 0;
-	right		: 0;
+		right: 0;
-	bottom		: 0;
+		bottom: 0;
-	left		: 0;
+		left: 0;
-	background	: rgba(0,0,0,0.8);
+		background: rgba(0, 0, 0, 0.8);
-	z-index		: 99999;
+		z-index: 99999;
-	//display		: none;
+		//display		: none;
-	opacity		: 0;
+		opacity: 0;
-	-webkit-transition: opacity 400ms ease-in;
+		-webkit-transition: opacity 400ms ease-in;
-	-moz-transition: opacity 400ms ease-in;
+		-moz-transition: opacity 400ms ease-in;
-	transition	: opacity 400ms ease-in;
+		transition: opacity 400ms ease-in;
-	pointer-events: none;
+		pointer-events: none;
-}
+	}
 
-.fModale:target {
+	.fModale:target {
-	//display		: block;
+		//display		: block;
-	opacity		: 1;
+		opacity: 1;
-	pointer-events: auto;
+		pointer-events: auto;
-}
+	}
 
-.fModale > div {
+	.fModale>div {
-	width		: 200px;
+		width: 200px;
-	position	: relative;
+		position: relative;
-	margin		: 10% auto;
+		margin: 10% auto;
-	padding		: 5px 20px 13px 20px;
+		padding: 5px 20px 13px 20px;
-	border-radius: 10px;
+		border-radius: 10px;
-	background	: #fff;
+		background: #fff;
-	background	: -moz-linear-gradient(#fff, #999);
+		background: -moz-linear-gradient(#fff, #999);
-	background	: -webkit-linear-gradient(#fff, #999);
+		background: -webkit-linear-gradient(#fff, #999);
-	background	: -o-linear-gradient(#fff, #999);
+		background: -o-linear-gradient(#fff, #999);
-}
+	}
 
-.fermer {
+	.fermer {
-	background	: #606061;
+		background: #606061;
-	color		: #FFFFFF;
+		color: #FFFFFF;
-	line-height	: 25px;
+		line-height: 25px;
-	position	: absolute;
+		position: absolute;
-	right		: -12px;
+		right: -12px;
-	text-align	: center;
+		text-align: center;
-	top			: -10px;
+		top: -10px;
-	width		: 24px;
+		width: 24px;
-	text-decoration: none;
+		text-decoration: none;
-	font-weight	: bold;
+		font-weight: bold;
-	-webkit-border-radius: 12px;
+		-webkit-border-radius: 12px;
-	-moz-border-radius: 12px;
+		-moz-border-radius: 12px;
-	border-radius: 12px;
+		border-radius: 12px;
-	-moz-box-shadow: 1px 1px 3px #000;
+		-moz-box-shadow: 1px 1px 3px #000;
-	-webkit-box-shadow: 1px 1px 3px #000;
+		-webkit-box-shadow: 1px 1px 3px #000;
-	box-shadow	: 1px 1px 3px #000;
+		box-shadow: 1px 1px 3px #000;
-}
+	}
 
-.fermer:hover { background: #00d9ff; }
+	.fermer:hover {
+		background: #00d9ff;
+	}
 </style>
 <?php
 /*-----------------------------------------------------------------
@@ -86,95 +87,102 @@ echo ('
 echo ("
 		<div style='display: block;' class='unOnglet' id='contenuOnglet1'>
 			<fieldset><legend>X indique une garde</legend>"); ?>
-	<!-- div class="boite" style="margin: 0px 10px;" -->
+<!-- div class="boite" style="margin: 0px 10px;" -->
 
-		<form name="frmDispos" action="index.php?choixTraitement=pompiers&action=voir" method="post">	
+<form name="frmDispos" action="index.php?choixTraitement=pompiers&action=voir" method="post">
-			<input type="hidden" maxlength="2" name="zSemaine"	value='<?php echo $semaine;?>'>
+	<input type="hidden" maxlength="2" name="zSemaine" value='<?php echo $semaine; ?>'>
-			<input type="hidden" maxlength="2" name="zAnnee" 	value='<?php echo $annee;?>'>			
+	<input type="hidden" maxlength="2" name="zAnnee" value='<?php echo $annee; ?>'>
-		</form>			
+</form>
-		<table id="tableau" class="tableau">
+<table id="tableau" class="tableau">
-			<tbody>
+	<tbody>
-			<!-- PARTIE SELCTION SEMAINE  -->
+		<!-- PARTIE SELCTION SEMAINE  -->
-			<tr>
+		<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"
-			</tr>
+					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 -->
+		<!-- PARTIE AFFICHAGE DES JOURS -->
-			<tr>
+		<tr>
 			<?php
 			$nomJour = array('Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi', 'Dimanche');
-			for($jour = 0; $jour <= 6; $jour++) {
+			for ($jour = 0; $jour <= 6; $jour++) {
 				echo ('<th colspan="4">'
 					. $nomJour[$jour] . ' '
 					. date('d/m', strtotime('+' . $jour . ' day', $premierJour)) . '</th>'
 				);
 			}
 			?>
-			</tr>
+		</tr>
 
-			<!-- PARTIE AFFICHAGE DES TRANCHES DANS CHAQUE JOURS -->
+		<!-- PARTIE AFFICHAGE DES TRANCHES DANS CHAQUE JOURS -->
-			<tr>
+		<tr>
-				<?php
-				for($jour = 0; $jour <= 6; $jour++) {
-					for($tranche = 1; $tranche <= 4; $tranche++) {
-						echo '<th class="semaine" style="text-align : center;">' . $tranche . '</th>';
-					} 
-				}
-				?>
-			</tr>	
-			
-			<!-- PARTIE SELCTION DES DISPO -->
-			<tr>
 			<?php
-			foreach ($lesDispos as $uneLigne) { 	// $pdo->getDisposHebdo() return les dispo
+			for ($jour = 0; $jour <= 6; $jour++) {
-				for($jour = 0; $jour <= 6; $jour++) {
+				for ($tranche = 1; $tranche <= 4; $tranche++) {
+					echo '<th class="semaine" style="text-align : center;">' . $tranche . '</th>';
+				}
+			}
+			?>
+		</tr>
+
+		<!-- PARTIE SELCTION DES DISPO -->
+		<tr>
+			<?php
+			foreach ($lesDispos as $uneLigne) { // $pdo->getDisposHebdo() return les dispo
+				for ($jour = 0; $jour <= 6; $jour++) {
 					$leJour = date('Y-m-d', strtotime('+' . $jour . ' day', $premierJour));
 					$dateTab = date('d/m/Y', strtotime('+' . $jour . ' day', $premierJour));
-					for($tranche = 1; $tranche <= 4; $tranche++){	
+					for ($tranche = 1; $tranche <= 4; $tranche++) {
-							$couleur = 'c' . $tranche;
+						$couleur = 'c' . $tranche;
-							$garde = 'g' . $tranche;
+						$garde = 'g' . $tranche;
-							$dispo = 'd' . $tranche;
+						$dispo = 'd' . $tranche;
-							echo('
+						echo ('
 								<td style="height: 20px; background-color: ' . $uneLigne[$dateTab][$couleur] . ';" class="select-dispo" id="' . $leJour . '/' . $tranche . '">' . (($uneLigne[$dateTab][$garde] == 1) ? 'X' : '') . '</td>
 							');
 					}
 				}
 			}
 			?>
-			</tr>
+		</tr>
-			</tbody>
+	</tbody>
-		</table>
+</table>
-		<div id="fenetreDispo" class="fModale">
+<div id="fenetreDispo" class="fModale">
-			<div>
+	<div>
-			<a href="#" title="Fermer" class="fermer">X</a>
+		<a href="#" title="Fermer" class="fermer">X</a>
-			<h2>ma disponibilit&eacute;<br>pour le <label id="ztJour">&nbsp;</label></h2>
+		<h2>ma disponibilit&eacute;<br>pour le <label id="ztJour">&nbsp;</label></h2>
-			<form name="frmActivites"	action="index.php?choixTraitement=pompiers&action=majActivite" method="post">	
+		<form name="frmActivites" action="index.php?choixTraitement=pompiers&action=majActivite" method="post">
-				<input type="hidden"	name="zSemaine"		value='<?php echo $semaine;?>'>
+			<input type="hidden" name="zSemaine" value='<?php echo $semaine; ?>'>
-				<input type="hidden"	name="zAnnee" 		value='<?php echo $annee;?>'>			
+			<input type="hidden" name="zAnnee" value='<?php echo $annee; ?>'>
-				<input type="hidden"	name="ztLaDate"		value=''>
+			<input type="hidden" name="ztLaDate" value=''>
-				<input type="hidden"	name="ztLaTranche" 	value=''>
+			<input type="hidden" name="ztLaTranche" value=''>
-				<input type="hidden"	name="ztExDispo" 	value=''>
+			<input type="hidden" name="ztExDispo" value=''>
-				<br>
+			<br>
-				<?php
+			<?php
-				$i=0;
+			$i = 0;
-				foreach ($lesTypesDispos as $uneLigne)		
+			foreach ($lesTypesDispos as $uneLigne) {
-				{ 
+				if ($uneLigne["pIndice"] <> 3) {
-				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++;
 				}
-				?> 	
+				$i++;
-				<br>
+			}
-				<button onclick="document.forms['frmActivites'].submit()">Valider</button>
+			?>
-				<button href="#contenuOnglet1">Annuler</button>
+			<br>
-			</form>
+			<button onclick="document.forms['frmActivites'].submit()">Valider</button>
-			</div>
+			<button href="#contenuOnglet1">Annuler</button>
-		</div>
+		</form>
-	<!-- /div -->
+	</div>
+</div>
+<!-- /div -->
 <?php
 echo ("
 			</fieldset>
@@ -183,38 +191,44 @@ 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>";
-	echo ("<i>(".count($lesGardes)." gardes)</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) {
-	$dateGarde="premiere";
+		echo ("<th>" . $uneLigne['pLibelle'] . "</th>");
-	$colonne=1;
+	}
+	$dateGarde = "premiere";
+	$colonne = 1;
 	echo "</tr>";
 
-	foreach ($lesGardes as $uneLigne)		
+	foreach ($lesGardes as $uneLigne) {
-	{ 
+		if ($dateGarde != $uneLigne['wDate']) {
-		if ($dateGarde != $uneLigne['wDate'])
+			if ($dateGarde != "premiere") {
-		{
+				while ($colonne <= count($lesTranches)) {
-			if ($dateGarde !=  "premiere")
+					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>";
+				echo "</tr>
-				$colonne++;
-			}
-			echo "</tr>
 			";
 			}
-			echo "<tr><td class='controle' style='text-align : center;'>".$uneLigne['wDate']."</td>";
+			echo "<tr><td class='controle' style='text-align : center;'>" . $uneLigne['wDate'] . "</td>";
 			$dateGarde = $uneLigne['wDate'];
-			$colonne=1;
+			$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;
+		$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>");
 }
@@ -222,7 +236,7 @@ echo ("
 		</fieldset>
 		</div>");
 /*================================================================================================== COORDONNEES (3) */
- echo ("	
+echo ("	
 	 	<div style='display: none;' class='unOnglet' id='contenuOnglet3'> 
 			<form class='dataPompier' method='post'>
  			<table style='border: 0px solid white;'>
@@ -230,15 +244,15 @@ 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>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='adress' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pAdresse']."' 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>
+						<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> <input name='ztVille' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pVille']."' disabled></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> <input name='ztTel' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['pBip']."' disabled></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> <input name='ztMail' type='text' class='infoPompier infoPompier-chef' value='" . $lesInfosPompier['pMail']."' disabled></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>
-						<input name='pId' type='hidden' class='infoPompier' value='" . $lesInfosPompier['id']."' disabled>
+						<input name='pId' type='hidden' class='infoPompier' value='" . $lesInfosPompier['id'] . "' disabled>
 						<br />");
 echo ("			
 			</table>
@@ -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>Type</th> <td>
-						<tr><th>Grade</th>							<td> <input name='lstGrade' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wGrade'] . "' disabled></td> </tr>
+							<select name='lstType' class='infoPompier-chef' disabled>");
-						<tr><th>Statut</th>							<td> <input name='lstStatut' type='text' class='infoPompier-chef' value='" . $lesInfosPompier['wStatut'] . "' disabled></td> </tr>
+							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>.".$lesInfosPompier['pCommentaire']."</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;'>
-		<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']."'>";}
+						if ($action === "ajouter") {
-						else {echo $infosParam['pIndice'];}  
+							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 === "ajouter") {
-						if ($action==="modifier") 	{echo "<input class='controleLong' type='text' name='zLibelle' value='".$infosParam['pLibelle']."'>";$actif=null;}
+							echo "<input class='controle' type='text' name='zLibelle'>";
-						if ($action==="supprimer") 	{echo $infosParam['pLibelle'];$actif="disabled='disabled'";}  
+							$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

@@ -1,22 +1,22 @@
 <!-- v_unPompier.php / Derniere modification le 18 septembre 2023 par Pascal Blain -->
 <div id="contenu">
-<?php
+	<?php
-/**
+	/**
- * Boutons d'action a coté du nom
+	 * Boutons d'action a coté du nom
- * *lesInfosPompiers = pdo->getInfosPompier());
+	 * *lesInfosPompiers = pdo->getInfosPompier());
- */
+	 */
- 	if ($_REQUEST['action'] == "supprimer") {
+	if ($_REQUEST['action'] == "supprimer") {
-	 	echo '<h2>SUPPRESSION DU POMPIER '.$lesInfosPompier['nom'].' '.$lesInfosPompier['prenom'].'</h2>';
+		echo '<h2>SUPPRESSION DU POMPIER ' . $lesInfosPompier['nom'] . ' ' . $lesInfosPompier['prenom'] . '</h2>';
-	 	echo (
+		echo (
 			'<form name="frmA" action="index.php?choixTraitement=pompiers&action=validerSupprimer&type='
 			. $lesInfosPompier['pType']
 			. '&agent=' . $lesInfosPompier['id']
 			. '&caserne=' . $lesInfosPompier['pCis']
 			. '" method="post">');
 	}
- 	if ($_REQUEST['action'] == "modifier") {
+	if ($_REQUEST['action'] == "modifier") {
 		var_dump($lesInfosPompier);
-	 	echo ('
+		echo ('
 			<h2>MODIFICATION DU POMPIER '
 			. $lesInfosPompier['nom'] . ' '
 			. $lesInfosPompier['prenom'] . '</h2>'
@@ -29,21 +29,24 @@
 			. '" method="post">'
 		);
 	}
- 	if ($_REQUEST['action'] == "ajouter") {
+	if ($_REQUEST['action'] == "ajouter") {
 		echo "<h2>AJOUT D'UN NOUVEAU POMPIER</h2>";
-		echo '
+		
-			<form name="frmA" action="index.php?choixTraitement=pompiers&action=validerAjouter&type='
+		//action = index.php?choixTraitement=pompiers&action=validerAjouter&type=''
-			. $lesInfosPompier['pType'].'" method="post" onsubmit="return valider(this)">';
+		//onsubmit="return valider(this)">
-	}
+		echo('
-	echo ("	
+			<form class="dataPompierAjout" name="frmA" action="index.php?choixTraitement=pompiers&action=validerAjouter&type="
+			method="post" 
+		');
+		echo ("	
 		<table style='border: 0px solid white;'>
 		<tr>
 		<td style='border :0px;'>
 		<fieldset><legend>Coordonn&eacute;es</legend>
 		<table>
 	");
- 	if ($_REQUEST['action'] == "supprimer"){  //-------------------------------------------------------- cas suppression
+		if ($_REQUEST['action'] == "supprimer") { //-------------------------------------------------------- cas suppression
- 		echo ("	
+			echo ("	
 	 		<div style='display: none;' class='unOnglet' id='contenuOnglet3'> 
  			<table style='border: 0px solid white;'>
 			<tr>
@@ -51,37 +54,93 @@
 			</tr>
 			</table>
 	");
-}
+		}
-//------------------------------------------------------------------------------------ cas ajout ou modification
+		//------------------------------------------------------------------------------------ cas ajout ou modification
 	
-if ($_REQUEST['action'] == "modifier") {
+		if ($_REQUEST['action'] == "modifier") {
-	echo ("	<tr>
+			echo ("	<tr>
 			</tr>
 			</table>
 		");
-}
+		}
-if ($_REQUEST['action'] == "ajouter") { 
+		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>
+			//				<input name='pId'  class='infoPompier' value='" . $lesInfosPompier['id'] . "'  >
 
+			echo ("
+				<tr><th style='width:130px;'>Nom*</th>		<td style='width:130px;'><input name='ztNom' id='newName' type='text' class='infoPompier' required></td> </tr>
+				<tr><th>Pr&eacute;nom*</th>					<td> <input name='ztPrenom' id='newUsername' type='text' class='infoPompier infoPompier-chef' required></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' required></td> </tr>
+				<tr><th>Adresse &eacute;lectronique*</th>	<td> <input name='ztMail' type='text' class='infoPompier infoPompier-chef' required></td> </tr>
+				<tr><th>Nom de compte*</th>					<td><input name='ztLogin' id='newLogin' type='text' class='infoPompier infoPompier-chef' required></td></tr>
+				<tr><th style='width:130px;'>Code</th>		<td><input name='zCis' id='inputDisabled' 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>
+				<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 />");
-}		
-?>         
-            <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="zOk"			value="OK"> 
 
-                </td>
+			echo ("
-                </tr>
+						   </td> </tr>
-			</table>   
+					   </table>
-    </form>
+				   </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; '>
+					<p class='notif-ajout' style:'margin: 10px'></p>
+					<input type= 'image' class='btAnnulerAjout' alt='Annuler' src= 'images/Annuler.jpg'>
+					<input type= 'image' class='validerAjout' alt='Valider' src= 'images/Valider.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; witdh:130px; text-align:right;'>
+				<input type="hidden" name="zTypeAdm"
+					value="">
+					<? // if ($type=="adm") {echo ("true");} else {echo ("false");} ?>
+				<input type="hidden" name="zOk" value="OK">
+
+			</td>
+		</tr>
+	</table>
+	</form>