Permalink
Browse files

Merge remote branch 'joss/developpement'

  • Loading branch information...
2 parents 56f359f + 890a569 commit eb7d43c2e058c18a9af03b1996744438c3087735 @crob27 crob27 committed Apr 24, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -825,13 +825,13 @@
echo '<th>';
echo ("<select name=\"filter_manqement_obligation\" onchange='submit()'>");
echo "<option value=''";
-if (isFiltreRechercheParam('filter_manqement_obligation') && getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "checked='checked'";}
+if (!isFiltreRechercheParam('filter_manqement_obligation')) {echo "selected='selected'";}
echo "></option>\n";
echo "<option value='y' ";
-if (getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "selected'";}
+if (getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "selected='selected'";}
echo ">oui</option>\n";
echo "<option value='n' ";
-if (getFiltreRechercheParam('filter_manqement_obligation') == 'n') {echo "selected'";}
+if (getFiltreRechercheParam('filter_manqement_obligation') == 'n') {echo "selected='selected'";}
echo ">non</option>\n";
echo "</select>";
echo '<br/>Manquement obligation présence';
@@ -470,13 +470,13 @@
echo '<th>';
echo ("<select name=\"filter_manqement_obligation\" onchange='submit()'>");
echo "<option value=''";
-if (isFiltreRechercheParam('filter_manqement_obligation') && getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "checked='checked'";}
+if (!isFiltreRechercheParam('filter_manqement_obligation')) {echo "selected='selected'";}
echo "></option>\n";
echo "<option value='y' ";
-if (getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "selected'";}
+if (getFiltreRechercheParam('filter_manqement_obligation') == 'y') {echo "selected='selected'";}
echo ">oui</option>\n";
echo "<option value='n' ";
-if (getFiltreRechercheParam('filter_manqement_obligation') == 'n') {echo "selected'";}
+if (getFiltreRechercheParam('filter_manqement_obligation') == 'n') {echo "selected='selected'";}
echo ">non</option>\n";
echo "</select>";
echo '<br/>Manquement obligation scolaire (bulletin)';
@@ -44,7 +44,8 @@
|| $url_end=='bilan_individuel.php'
|| $url_end=='totaux_du_jour.php'
|| $url_end=='statistiques.php'
- || $url_end=='stat_justifications.php') {echo "class='current' ";}
+ || $url_end=='stat_justifications.php'
+ || $url_end=='liste_eleves.php') {echo "class='current' ";}
echo "title='Bilans'>Bilans</a></li>\n";
echo "<li><a href='saisir_groupe.php' ";
@@ -64,7 +65,7 @@
echo "<li><a href='liste_saisies_selection_traitement.php' ";
if($url_end=='liste_saisies_selection_traitement.php') {echo "class='current' style='background-color:#cae7cb; border-bottom:2px solid #cae7cb;' ";}
else {echo "style='background-color:#e6f8e7;' ";}
- echo "title='Liste des saisies'>Liste des saisies</a></li>\n";
+ echo "title='Liste des saisies'>Liste saisies</a></li>\n";
echo "<li><a href='visu_saisie.php' ";
if($url_end=='visu_saisie.php' || $url_end=='enregistrement_modif_saisie.php') {echo "class='current' style='background-color:#cae7cb; border-bottom:2px solid #cae7cb;' ";}
@@ -77,7 +78,7 @@
echo "<li><a href='liste_traitements.php' ";
if($url_end=='liste_traitements.php') {echo "class='current' style='background-color:#ebedb5; border-bottom:2px solid #ebedb5;' ";}
else {echo "style='background-color:#f9f9de;' ";}
- echo "title='Traitement'>Liste des traitements</a></li>\n";
+ echo "title='Traitement'>Liste traitements</a></li>\n";
echo "<li><a href='visu_traitement.php' ";
if($url_end=='visu_traitement.php' || $url_end=='enregistrement_modif_traitement.php') {
@@ -89,7 +90,7 @@
echo "<li><a href='liste_notifications.php' ";
if($url_end=='liste_notifications.php') {echo "class='current' style='background-color:#c7e3ec; border-bottom:2px solid #c7e3ec;' ";}
else {echo "style='background-color:#ecf6f8;' ";}
- echo "title='Notifications'>Liste des notifications</a></li>\n";
+ echo "title='Notifications'>Liste notifications</a></li>\n";
echo "<li><a href='visu_notification.php' ";
if($url_end=='visu_notification.php' || $url_end=='enregistrement_modif_notification.php' || $url_end=='generer_notification.php') {
@@ -39,40 +39,44 @@
echo "<li><a href='tableau_des_appels.php' ";
if($onglet_abs=='tableau_des_appels.php') {echo "class='current' ";}
- echo "title='Tableau des appels'>Tableau des appels</a></li>\n";
+ echo "title='Tableau des appels'>Tableau appels</a></li>\n";
echo "<li><a href='absences_du_jour.php' ";
if($onglet_abs=='absences_du_jour.php') {echo "class='current' ";}
- echo "title='Absences du jour'>Absences du jour</a></li>\n";
+ echo "title='Absences du jour'>Absences jour</a></li>\n";
echo "<li><a href='bilan_du_jour.php' ";
if($onglet_abs=='bilan_du_jour.php') {echo "class='current' ";}
- echo "title='Bilan du jour'>Bilan du jour</a></li>\n";
+ echo "title='Bilan du jour'>Bilan jour</a></li>\n";
echo "<li><a href='totaux_du_jour.php' ";
if($onglet_abs=='totaux_du_jour.php') {echo "class='current' ";}
- echo "title='Totaux du jour'>Totaux du jour</a></li>\n";
+ echo "title='Totaux du jour'>Totaux jour</a></li>\n";
echo "<li><a href='extraction_saisies.php' ";
if($onglet_abs=='extraction_saisies.php') {echo "class='current' ";}
- echo "title='Extraction des saisies'>Extraction des saisies</a></li>\n";
+ echo "title='Extraction des saisies'>Ext. saisies</a></li>\n";
echo "<li><a href='extraction_demi-journees.php' ";
if($onglet_abs=='extraction_demi-journees.php') {echo "class='current' ";}
- echo "title='Extraction des saisies'>Extraction des demi-journées</a></li>\n";
+ echo "title='Extraction des saisies'>Ext. demi-journées</a></li>\n";
echo "<li><a href='bilan_individuel.php' ";
if($onglet_abs=='bilan_individuel.php') {echo "class='current' ";}
echo "title='Bilan individuel'>Bilan individuel</a></li>\n";
echo "<li><a href='statistiques.php' ";
if($onglet_abs=='statistiques.php') {echo "class='current' ";}
- echo 'title="Taux d\'absentéisme">Taux d\'absentéisme</a></li>';
+ echo 'title="Taux d\'absentéisme">Taux d\'absent.</a></li>';
echo "<li><a href='stat_justifications.php' ";
if($onglet_abs=='stat_justifications.php') {echo "class='current' ";}
- echo "title='Statistiques des justifications'>Justifications</a></li>\n";
+ echo "title='Statistiques des justifications'>Justif.</a></li>\n";
+
+ echo "<li><a href='liste_eleves.php' ";
+ if($onglet_abs=='liste_eleves.php') {echo "class='current' ";}
+ echo "title='Liste des élèves'>Liste élèves</a></li>\n";
echo "</ul>\n";
@@ -713,6 +713,7 @@ function traite_requete($requete = "") {
$tab_req[] = "INSERT INTO droits VALUES ('/mod_abs2/generer_notifications_par_lot.php','F', 'F', 'V', 'V', 'F', 'F', 'F', 'F', 'Génération groupée des courriers', '');";
$tab_req[] = "INSERT INTO droits VALUES ('/mod_abs2/bilan_parent.php', 'F', 'F', 'F', 'F', 'F', 'V', 'F', 'F', 'Affichage parents des absences de leurs enfants', '');";
$tab_req[] = "INSERT INTO droits VALUES ('/mod_abs2/stat_justifications.php', 'F', 'F', 'V', 'V', 'F', 'F', 'F', 'F', 'Statistiques des justifications des absences', '');";
+$tab_req[] = "INSERT INTO droits VALUES ('/mod_abs2/liste_eleves.php', 'F', 'F', 'V', 'V', 'F', 'F', 'F', 'F', 'Liste des élèves avec les filtes absence', '');";
$tab_req[] = "INSERT INTO droits VALUES ('/saisie/validation_corrections.php', 'F', 'F', 'F', 'V', 'F', 'F', 'V', 'F', 'Validation des corrections proposées par des professeurs après la cloture d une période', '');";
$tab_req[] = "INSERT INTO droits VALUES ('/gestion/param_ordre_item.php', 'V', 'F', 'F', 'F', 'F', 'F', 'F', 'F', 'Modifier l ordre des items dans les menus', '');";

0 comments on commit eb7d43c

Please sign in to comment.