From d33f25ab24d0a0de97f2e64fdc1392f159318682 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 2 Nov 2015 13:52:16 +0100
Subject: [PATCH] Correction design tableaux

---
 css/global.css       | 5 +++--
 css/header.css       | 2 +-
 manager/database.php | 4 ++--
 page/_JS/groups.js   | 3 ---
 page/career.php      | 1 +
 page/groups.php      | 4 ++--
 page/modules.php     | 5 ++++-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/css/global.css b/css/global.css
index 987343c..63a71c2 100755
--- a/css/global.css
+++ b/css/global.css
@@ -31,7 +31,7 @@
 table.basic{
 	/* position */
 	width: 100%;
-	margin-bottom: 1em;
+	margin-bottom: 0;
 
 	/* border */
 	border-radius: 5px;
@@ -39,6 +39,8 @@ table.basic{
 	/*box-shadow: 0 0 4px #e3e3e3;*/
 }
 
+table.basic.margin{ margin-bottom: 1em; }
+
 table.basic tr td,
 table.basic tr th,
 #DRAGNDROP td,
@@ -92,7 +94,6 @@ table.basic:nth-child(4n+3) tr:hover td{ background-color: rgba(45, 204, 112, 1)
 
 
 
-
 /******************/
 /*** PARAGRAPHS ***/
 /******************/
diff --git a/css/header.css b/css/header.css
index 6cf854c..5804783 100755
--- a/css/header.css
+++ b/css/header.css
@@ -30,7 +30,7 @@
 	background: transparent url(../src/header/notifbar/member.svg) center center no-repeat;
 	background-size: 40% auto;
 
-	cursor: default;
+	cursor: pointer;
 }
 
 
diff --git a/manager/database.php b/manager/database.php
index 5511964..930d3e1 100755
--- a/manager/database.php
+++ b/manager/database.php
@@ -722,7 +722,7 @@ class DataBase{
 
 
 		// si on a l'UID utilisateur & l'UID UE => on récupère les notes
-		$getUEList = $this->pdo->prepare("SELECT note.intitule, note.valeur, note.base ".
+		$getUEList = $this->pdo->prepare("SELECT m.nom as module, note.intitule, note.valeur, note.base ".
 			"FROM note, appartenance as app, programme as prog, semestre as s, module as m  ".
 			"WHERE note.id_appartenance = app.id_appartenance ".
 			"AND   note.id_programme = prog.id_programme ".
@@ -732,7 +732,7 @@ class DataBase{
 			"AND   prog.id_ue = :UEUID ".
 			"AND   app.id_etudiant = :etudiantUID ".
 			"AND   s.id_semestre = :semestreUID ".
-			"ORDER BY note.valeur, note.base ASC");
+			"ORDER BY m.nom, note.valeur, note.base ASC");
 		$getUEList->execute(array(
 			':UEUID'       => $UEUID,
 			':etudiantUID' => $etudiantUID,
diff --git a/page/_JS/groups.js b/page/_JS/groups.js
index 8bf386c..b002066 100755
--- a/page/_JS/groups.js
+++ b/page/_JS/groups.js
@@ -69,10 +69,7 @@ if( document.querySelector('#CONTAINER section[name=movestudents]') != null ){ /
 				input.parentNode.removeChild( input ); // on supprime le membre de l'ancien groupe
 
 				var tableauDestination = output.parentNode.parentNode.parentNode.children[1]; // <tbody> destination
-
-				var VoirPlus = tableauDestination.removeChild( tableauDestination.lastChild ); // on supprime le "Voir plus"
 				tableauDestination.appendChild( input );                                  // on ajoute le membre au nouveau groupe
-				tableauDestination.appendChild( VoirPlus );                                    // on remet le "Voir plus"
 
 				// selectSection( document.querySelector('#MENU span[data-link=groups]') );
 			}
diff --git a/page/career.php b/page/career.php
index 61b7064..91ee2fd 100755
--- a/page/career.php
+++ b/page/career.php
@@ -104,6 +104,7 @@ if( $_SESSION['identifiant'] != null && $_SESSION['droits'] == 'student' ){ // s
 					echo '<tbody>';
 						foreach($UE['notes'] as $note){
 							echo '<tr>';
+								echo '<td>'.$note['module'].'</td>';
 								echo '<td>'.$note['intitule'].'</td>';
 								echo '<td>'.$note['valeur'].'/'.$note['base'].'</td>';
 							echo '</tr>';
diff --git a/page/groups.php b/page/groups.php
index 05002ad..2ed9d57 100755
--- a/page/groups.php
+++ b/page/groups.php
@@ -46,7 +46,7 @@ require_once __ROOT__.'/manager/groups.php';
 
 				if( count($group->userlist) > 0 ){ // s'il y a des utilisateurs
 
-					echo "<table class='basic'>";
+					echo "<table class='basic margin'>";
 
 						echo '<tbody>';
 						
@@ -202,7 +202,7 @@ if( $_SESSION['identifiant'] != null && $_SESSION['droits'] == 'admin' ){ // si
 									echo "<td>".$user['identifiant'].'</td>';
 									echo '<td>'.$user['prenom'].'</td>';
 									echo '<td>'.$user['nom'].'</td>';
-									echo '<td>Groupe <strong><span>'.$group->nom.'</span></strong></td>';
+									echo '<td><strong><span>'.$group->nom.'</span></strong></td>';
 								echo '</tr>';
 							}
 
diff --git a/page/modules.php b/page/modules.php
index e9f73d6..4a03403 100755
--- a/page/modules.php
+++ b/page/modules.php
@@ -45,7 +45,10 @@ if( $_SESSION['identifiant'] != null && $_SESSION['droits'] == 'student' ){ // s
 						echo '</tr>';
 					echo '</thead>';
 					echo '<tbody>';
-						echo '<tr><td>'.$module['libelle'].'</td></tr>';
+						echo '<tr>';
+							echo '<td>'.$module['nom'].'</td>';
+							echo '<td>'.$module['libelle'].'</td>';
+						echo '</tr>';
 					echo '</tbody>';
 				echo '</table>';
 			}