Skip to content

Commit

Permalink
Ajout de liens de navigation et d'explications en title.
Browse files Browse the repository at this point in the history
  • Loading branch information
crob27 committed Dec 28, 2017
1 parent 3e4d90d commit 41d3311
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
11 changes: 10 additions & 1 deletion eleves/visu_eleve.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,17 @@ function cherche_eleves(type) {
}

if(($_SESSION['statut']=='administrateur')||($_SESSION['statut']=='scolarite')) {
echo " | <a href='modify_eleve.php?eleve_login=".$ele_login."'>Gestion de l'élève</a>";
echo " | <a href='modify_eleve.php?eleve_login=".$ele_login."' title=\"Modifier les nom, prénom, date de naissance, régime,... de l'élève.\">Gestion de l'élève</a>";
}

echo "<input type='hidden' name='id_classe' value='$id_classe' />\n";

unset($id_classe);
}

// Bizarre : c'est masqué par le javascript de fin de page avant même la fin du chargement des onglets ???
//echo "<span id='spinner_chargement' style='margin-left:3em;' title=\"Veuillez patienter le temps du chargement des différents onglets...\"> <img src='../images/spinner.gif' class='icone16' alt='Patientez' /> Patientez...</span>";

echo "</p>\n";
echo "</div>\n";

Expand Down Expand Up @@ -3806,6 +3809,12 @@ function affiche_onglet_rel(id) {
}
window.focus();
/*
if(document.getElementById('spinner_chargement')) {
document.getElementById('spinner_chargement').style.display='none';
}
*/
</script>\n";

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/share-html.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -4450,7 +4450,7 @@ function retourne_tab_html_pointages_disc($login_ele) {
if(count($tab_totaux)>0) {
$ajout_lien='';
if(acces('/mod_discipline/extraire_pointages.php', $_SESSION['statut'])) {
$ajout_lien=" <a href='../mod_discipline/extraire_pointages.php?login_ele=".$login_ele."&id_classe=$id_classe'><img src='../images/icons/chercher.png' class='icone16' alt='Voir' /></a>";
$ajout_lien=" <a href='../mod_discipline/extraire_pointages.php?login_ele=".$login_ele."&id_classe=$id_classe' title=\"Extraire/afficher les $mod_disc_terme_menus_incidents pour cet élève.\"><img src='../images/icons/chercher.png' class='icone16' alt='Voir' /></a>";
}
$retour.="<p class='bold'>Pointage des ".$mod_disc_terme_menus_incidents."&nbsp;:".$ajout_lien."</p>
<table class='boireaus boireaus_alt' style='margin-left:1em;'>
Expand Down
16 changes: 12 additions & 4 deletions mod_discipline/extraire_pointages.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@
require_once("../lib/header.inc.php");
//**************** FIN EN-TETE *****************

$acces_visu_eleve=acces("/eleves/visu_eleve.php", $_SESSION['statut']);

$ajout_lien="";
if(acces_param_pointage_discipline()) {
$ajout_lien=" | <a href='param_pointages.php' onclick=\"return confirm_abandon (this, change, '$themessage')\">Paramétrer, définir les types de pointages</a>";
Expand Down Expand Up @@ -453,7 +455,8 @@
echo "<table class='boireaus boireaus_alt resizable sortable'>
<thead>
<tr>
<th class='text'>Élève</th>
<th class='text'>Élève</th>".($acces_visu_eleve ? "
<th class='nosort'></th>" : "")."
<th class='text'>Classe</th>
<th class='number'>Total</th>";

Expand All @@ -468,15 +471,16 @@
foreach($tab_eff as $login_ele => $eleve) {
echo "
<tr>
<td>".$eleve['nom']." ".$eleve['prenom']."</td>
<td>".$eleve['nom']." ".$eleve['prenom']."</td>".($acces_visu_eleve ? "
<td><a href='$gepiPath/eleves/visu_eleve.php?ele_login=".$login_ele."&onglet=discipline' title=\"Voir les incidents disciplinaires de l'élève dans le classeur élève.\"><img src='$gepiPath/images/icons/ele_onglets.png' class='icone16' alt='Visu' /></a></td>" : "")."
<td>".$tab_nom_classe[$eleve['id_classe']]."</td>
<td>".$eleve['total']."</td>";

for($loop=0;$loop<count($tab_type_pointage_discipline['indice']);$loop++) {
$valeur=0;
if(isset($eleve['type'][$tab_type_pointage_discipline['indice'][$loop]['id_type']])) {
$valeur=$eleve['type'][$tab_type_pointage_discipline['indice'][$loop]['id_type']];
$valeur="<a href='".$_SERVER['PHP_SELF']."?id_classe=".$eleve['id_classe']."&display_date_debut=$display_date_debut&display_date_fin=$display_date_fin&login_ele=$login_ele'>".$valeur."</a>";
$valeur="<a href='".$_SERVER['PHP_SELF']."?id_classe=".$eleve['id_classe']."&display_date_debut=$display_date_debut&display_date_fin=$display_date_fin&login_ele=$login_ele' title=\"Voir/extraire les $mod_disc_terme_menus_incidents de cet élève sur l'intervalle de dates choisi.\">".$valeur."</a>";
}
echo "
<td>".$valeur."</td>";
Expand Down Expand Up @@ -568,13 +572,17 @@
$chaine_liens_classes.=')';
}

if($acces_visu_eleve) {
$lien_visu_eleve=" <a href='$gepiPath/eleves/visu_eleve.php?ele_login=".$login_ele."&onglet=discipline' title=\"Voir les incidents disciplinaires de l'élève dans le classeur élève.\"><img src='$gepiPath/images/icons/ele_onglets.png' class='icone16' alt='Visu' /></a>";
}

echo "
<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\" style=\"width: 100%;\" name=\"formulaire_extraction\">
<fieldset class='fieldset_opacite50' style='margin-bottom:1em;'>
$champ_id_classe
<p class='bold'>
Élève&nbsp;: ".$eleve['nom'].' '.$eleve['prenom'].$chaine_liens_classes."
Élève&nbsp;: ".$eleve['nom'].' '.$eleve['prenom'].$chaine_liens_classes.$lien_visu_eleve."
<input type='hidden' name='login_ele' value='".$login_ele."' />
</p>
Expand Down

0 comments on commit 41d3311

Please sign in to comment.