epnadmin-fr
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Epnadmin-fr] CVS: epnadmin reservations.php,1.16,1.17

From: Loïc Dayot
Subject: [Epnadmin-fr] CVS: epnadmin reservations.php,1.16,1.17
Date: Thu, 22 May 2003 17:19:44 -0400 
Update of /cvsroot/epnadmin/epnadmin
In directory subversions:/tmp/cvs-serv32651/epnadmin

Modified Files:
        reservations.php 
Log Message:
Correction à propos du choix de l'usage lors de lréservation d'un poste en 
individuel.



Index: reservations.php
===================================================================
RCS file: /cvsroot/epnadmin/epnadmin/reservations.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** reservations.php    13 May 2003 21:17:06 -0000      1.16
--- reservations.php    22 May 2003 21:19:40 -0000      1.17
***************
*** 43,50 ****
  
  echo "<html><head><title>$sreservation - epnadmin</title>
!   <meta http-equiv=\"Content-Type\" content=\"text/html; 
charset=iso-8859-1\">";
  
  $titr = $stitrereservation;
! $datemaj="25 février 2003";
  define("COULEUR", COULEUR_UTILISATIONS);
  require("entete.inc.php");
--- 43,51 ----
  
  echo "<html><head><title>$sreservation - epnadmin</title>
!   <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">
!   </head>";
  
  $titr = $stitrereservation;
! $datemaj="18 mai 2003";
  define("COULEUR", COULEUR_UTILISATIONS);
  require("entete.inc.php");
***************
*** 317,321 ****
  
    $req = "SELECT * FROM usages";
!   if ($listeusagesimpossibles=$mat->usages != "")
      $req.=" WHERE id NOT IN ($listeusagesimpossibles)";
    $req.=" ORDER BY nom";
--- 318,322 ----
  
    $req = "SELECT * FROM usages";
!   if (($listeusagesimpossibles=$mat->usages) > "")
      $req.=" WHERE id NOT IN ($listeusagesimpossibles)";
    $req.=" ORDER BY nom";
***************
*** 350,353 ****
--- 351,363 ----
     }
  
+   // Si on est structure, laisser le choix de prendre des crédits ou non
+   if ($is_ident=="structure")
+   {
+     echo "<tr><td>$sresagratuit</td>
+             <td><input type=radio name=\"gratuit\" value=\"non\" 
checked>$snon</option>
+                 <input type=radio name=\"gratuit\" 
value=\"oui\">$soui</option></td>
+         </tr>";
+   }
+ 
    echo "<tr><td colspan='2' align='center'><input type=\"submit\" 
name=\"Ajouter\"
          value=\"$sresaconfresa\"></td></tr>
***************
*** 429,433 ****
     else
     {    // on a toutes les informations
- 
        // debug("vérification du nombre d'heures réservables");
        $req1 = "SELECT SEC_TO_TIME(SUM(TIME_TO_SEC(fin)-TIME_TO_SEC(debut))) 
AS nb FROM utilisation_postes
--- 439,442 ----
***************
*** 476,484 ****
  
           // debug("mise à jour du crédit");
!          $duree = h2min($finv) - h2min($debutv);
!          if (($reste=resteCredit($id_usager, "acces_individuel", 
"-".$duree))<=0)
!             echo "<p>$sresarappelticket</p>\n";
!          else
!           printf($sresamoinscredit, datetoheure(min2h($duree)), 
datetoHeure(min2h($reste)));
        } // if on peut continuer
     } // if $mes;
--- 485,496 ----
  
           // debug("mise à jour du crédit");
!         if ($gratuit!="oui")
!         {
!           $duree = h2min($finv) - h2min($debutv);
!           if (($reste=resteCredit($id_usager, "acces_individuel", 
"-".$duree))<=0)
!               echo "<p>$sresarappelticket</p>\n";
!           else
!             printf($sresamoinscredit, datetoheure(min2h($duree)), 
datetoHeure(min2h($reste)));
!         } // $gratuit
        } // if on peut continuer
     } // if $mes;
reply via email to
[Prev in Thread] Current Thread [Next in Thread]