diff options
Diffstat (limited to 'final/app/index.php')
| -rw-r--r-- | final/app/index.php | 55 |
1 files changed, 46 insertions, 9 deletions
diff --git a/final/app/index.php b/final/app/index.php index abdfca1..c01142b 100644 --- a/final/app/index.php +++ b/final/app/index.php @@ -50,6 +50,7 @@ generate_html_div_help(); { require_once('fonctions.inc.php'); $errmsg=mysql_generate_errmsg(); + echo " DEBUG : $errmsg\n"; } else { @@ -81,8 +82,6 @@ generate_html_div_help(); echo " <td class='$etat'>Annulée</td>\n"; break; } - - echo ' <td>'; generate_html_reunion_detail_button($idR); echo "</td>\n"; @@ -92,20 +91,58 @@ generate_html_div_help(); } - // Réunions fixées et passées - + // Réunion en préparation à moi, pas annulée + $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, NULL, R.estAnnulee' + . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Personne P' // Creneau C, + . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP) AND P.idP = '$idP'" + . ' AND R.estAnnulee=\'non\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND ISNULL(R.idC_Fixe)' + . ' ORDER BY R.idR ASC;'; + fill_array_liste_reunion($query); + //~ echo $query . "\n"; + + // Réunions fixées, à moi, pas annulée $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, UNIX_TIMESTAMP(C.dateHeure), R.estAnnulee' . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Creneau C,AWOR_Personne P' - . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP)" - . ' AND R.idL = L.idL AND P.idP = R.idP_Orga AND R.idC_Fixe = C.idC' + . " WHERE ((A.idP = '$idP' AND A.idL = L.idL) OR R.idP_Orga = '$idP') AND P.idP = '$idP'" + . ' AND R.estAnnulee=\'non\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND R.idC_Fixe = C.idC' . ' ORDER BY C.dateHeure DESC;'; fill_array_liste_reunion($query); + + // Réunion en annulée à moi + $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, NULL, R.estAnnulee' + . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Personne P' // Creneau C, + . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP) AND P.idP = '$idP'" + . ' AND R.estAnnulee=\'oui\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND ISNULL(R.idC_Fixe)' + . ' ORDER BY R.idR ASC;'; + fill_array_liste_reunion($query); + + echo "<tr class=\"empty\"><td></td><td></td><td></td><td></td><td></td></tr>\n"; - // Réunion en préparation + // Réunion en préparation pas à moi, pas annulée + $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, NULL, R.estAnnulee' + . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Personne P' // Creneau C, + . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP) AND P.idP <> '$idP'" + . ' AND R.estAnnulee=\'non\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND ISNULL(R.idC_Fixe)' + . ' ORDER BY R.idR ASC;'; + //~ echo $query . "\n"; + fill_array_liste_reunion($query); + + // Réunions fixées, pas à moi, pas annulée + $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, UNIX_TIMESTAMP(C.dateHeure), R.estAnnulee' + . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Creneau C,AWOR_Personne P' + . " WHERE ((A.idP = '$idP' AND A.idL = L.idL) OR R.idP_Orga = '$idP') AND P.idP <> '$idP'" + . ' AND R.estAnnulee=\'non\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND R.idC_Fixe = C.idC' + . ' ORDER BY C.dateHeure DESC;'; + fill_array_liste_reunion($query); + + // Réunion en annulée pas à moi $query = 'SELECT DISTINCT R.idR, R.objetR, P.nomP, P.prenomP, NULL, R.estAnnulee' . ' FROM AWOR_Liste L,AWOR_Reunion R,AWOR_Appartenir A,AWOR_Personne P' // Creneau C, - . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP)" - . ' AND R.idL = L.idL AND P.idP = R.idP_Orga AND ISNULL(R.idC_Fixe);'; + . " WHERE ((A.idP = $idP AND A.idL = L.idL) OR R.idP_Orga = $idP) AND P.idP <> '$idP'" + . ' AND R.estAnnulee=\'oui\' AND R.idL = L.idL AND P.idP = R.idP_Orga AND ISNULL(R.idC_Fixe)' + . ' ORDER BY R.idR ASC;'; + + //echo "DEBUG : $query\n"; fill_array_liste_reunion($query); |