From ddc56667b75c2867d64419ec6a54ea9de8a0db57 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 23 Oct 2015 13:08:33 +0200
Subject: [PATCH] Affichage "Tous les groupes"

---
 css/container.css                       |   6 +++
 css/font.css                            |   0
 css/layout.css                          |   1 +
 index.php                               |   6 ++-
 manager/groups.php                      |   3 +-
 manager/security.php                    |  11 ++--
 page/groups.php                         |  68 ++++++++++++++++--------
 src/close.svg                           |   0
 src/header/logout.svg                   |   0
 src/header/logout@hover.svg             |   0
 src/menu/userdata/visitor.svg           |   0
 src/userlistSample.json                 |   0
 test.php                                |  44 +++++++--------
 xdoc/Cahier Des Charges Fonctionnel.pdf | Bin
 14 files changed, 89 insertions(+), 50 deletions(-)
 mode change 100644 => 100755 css/font.css
 mode change 100644 => 100755 manager/groups.php
 mode change 100644 => 100755 src/close.svg
 mode change 100644 => 100755 src/header/logout.svg
 mode change 100644 => 100755 src/header/logout@hover.svg
 mode change 100644 => 100755 src/menu/userdata/visitor.svg
 mode change 100644 => 100755 src/userlistSample.json
 mode change 100644 => 100755 test.php
 mode change 100644 => 100755 xdoc/Cahier Des Charges Fonctionnel.pdf

diff --git a/css/container.css b/css/container.css
index 2f84544..d0cdf69 100755
--- a/css/container.css
+++ b/css/container.css
@@ -23,6 +23,12 @@
 
 /* STYLE "BASIC" DES TABLEAUX */
 table.basic{
+	/* position */
+	float: left;
+	margin: 1em;
+	
+
+
 	/* border */
 	border-radius: 5px;
 	border-spacing: 0; 
diff --git a/css/font.css b/css/font.css
old mode 100644
new mode 100755
diff --git a/css/layout.css b/css/layout.css
index a23a697..4a41fc0 100755
--- a/css/layout.css
+++ b/css/layout.css
@@ -287,6 +287,7 @@ body{
 
 
 /* quand on a la souris sur le bouton */
+#AUTH input[type=button]:focus,
 #AUTH input[type=button]:hover{
 	background-color: #3dcc70;
 	color: #fff;
diff --git a/index.php b/index.php
index b23d0b4..b9dae9a 100755
--- a/index.php
+++ b/index.php
@@ -1,4 +1,8 @@
-<?php require('manager/security.php'); session_init();
+<?php define('__ROOT__', dirname(__FILE__) );
+require_once __ROOT__.'/manager/security.php';
+
+
+
 
 $LOGIN_postAreSet   = isset($_POST['username']) && isset($_POST['password']);                           // variables POST existent
 $LOGIN_postStrings  = $LOGIN_postAreSet && is_string($_POST['username']) && is_string($_POST['password']);    // sont toutes 2 des strings
diff --git a/manager/groups.php b/manager/groups.php
old mode 100644
new mode 100755
index df6bc43..736812f
--- a/manager/groups.php
+++ b/manager/groups.php
@@ -1,5 +1,6 @@
-<?php require('manager/security.php'); session_init();
+<?php require_once __ROOT__.'/manager/security.php';
 
+	
     /***********************************************************
 	*                                                          *
 	*                 MANAGER DES UTILISATEURS                 *
diff --git a/manager/security.php b/manager/security.php
index f84a7ca..6d2e37c 100755
--- a/manager/security.php
+++ b/manager/security.php
@@ -1,5 +1,4 @@
-<?php
-
+<?php 
 
 	/***********************************************************
 	*                                                          *
@@ -68,6 +67,13 @@
 			$_SESSION['username']    = null; // on les initialise à NULL
 			$_SESSION['permissions'] = null;
 		}
+	}session_init();
+
+
+	function debug(){
+		ini_set('display_errors',1);
+		ini_set('display_startup_errors',1);
+		error_reporting(-1);
 	}
 
 
@@ -75,5 +81,4 @@
 
 
 
-
 ?> 
\ No newline at end of file
diff --git a/page/groups.php b/page/groups.php
index d6374ad..e01a495 100755
--- a/page/groups.php
+++ b/page/groups.php
@@ -1,4 +1,6 @@
-<?php require('../manager/security.php'); session_init();
+<?php define('__ROOT__', dirname(dirname(__FILE__)) );
+require_once __ROOT__.'/manager/security.php'; session_init();
+// debug();
 
 /****************************************
 *                                       *
@@ -12,40 +14,60 @@
 * [4] Répartir les élèves  (admin)
 *
 *****************************************/
-	
+
 ?>
 
-<section name='all' title='tous les groupes'>
+
+
+<section name='allgroup' title='tous les groupes'>
 	<?php if( $_SESSION['username'] != null ){ // si connecté
 
-		// on lit la liste d'utilisateurs
-		$userlistFile = file_get_contents('../src/userlistSample.json');
 
-		$userlist = JSON_decode($userlistFile);
+		include __ROOT__.'/manager/groups.php';
+		
+		$request = new stdClass();
+		$answer  = new stdClass();
+
+		$request->level_1 = 'grouplist';
+
+		groups_switch_level_1($request, $answer);
+
+		foreach($answer->grouplist as $group){ // pour chaque groupe
+
+			if( count($group->userlist) > 0 ){ // s'il y a des utilisateurs
+
+				echo "<table class='basic'>";
+
+				echo '<thead>';
+					echo '<tr>';
+						echo '<th colspan=5>Groupe '.$group->nom.'</th>';
+					echo '</tr><tr>';
+						echo '<th>Pseudo</th>';
+						echo '<th>Prénom</th>';
+						echo '<th>Nom</th>';
+						echo '<th>email</th>';
+						echo '<th>droits</th>';
+					echo '</tr>';
+				echo '</thead>';
 
 
-		echo "<table class='basic'>";
 
-			// TITRES
-			echo '<thead><tr>';
-			foreach($userlist[0] as $key=>$value)
-				echo '<th>'.$key.'</th>';
-			echo '</tr></thead>';
+				echo '<tbody>';
+					// pour chaque utilisateur
+					foreach($group->userlist as $user){
+						echo '<tr>';
+							foreach($user as $key=>$value)
+								echo '<td>'.$value.'</td>';
+						echo '</tr>';
+					}
 
+				echo '</tbody>';
 
-			// CONTENU
-			echo '<tbody>';
-			foreach($userlist as $eleve){
-				echo '<tr>';
+				echo '</table>';
 
-				foreach($eleve as $value)
-					echo '<td>'.$value.'</td>';
-
-				echo '</tr>';
 			}
-			echo '</tbody>';
-			
-		echo '</table>';
+		}
+
 		
 	} ?>
 	</section>
diff --git a/src/close.svg b/src/close.svg
old mode 100644
new mode 100755
diff --git a/src/header/logout.svg b/src/header/logout.svg
old mode 100644
new mode 100755
diff --git a/src/header/logout@hover.svg b/src/header/logout@hover.svg
old mode 100644
new mode 100755
diff --git a/src/menu/userdata/visitor.svg b/src/menu/userdata/visitor.svg
old mode 100644
new mode 100755
diff --git a/src/userlistSample.json b/src/userlistSample.json
old mode 100644
new mode 100755
diff --git a/test.php b/test.php
old mode 100644
new mode 100755
index 24d2719..cbad36f
--- a/test.php
+++ b/test.php
@@ -1,4 +1,4 @@
-<?php 
+<?php define('__ROOT__', dirname(__FILE__) );
 
 
 	/*** CRÉATION D'UTILISATEUR ***/
@@ -9,10 +9,10 @@
 	// $answer  = new stdClass();
 
 	// $request->level_1 = 'create';
-	// $request->username = 'mrd1609a';
-	// $request->prenom = 'adrien';
-	// $request->nom = 'ligou marques';
-	// $request->email = 'adrien.marques-ligou@etu.iut-tlse3.fr';
+	// $request->username = 'fvg1856a';
+	// $request->prenom = 'guillaume';
+	// $request->nom = 'fauvet';
+	// $request->email = 'guillaume.fauvet@etu.iut-tlse3.fr';
 	// $request->password = ' Test_Password _';
 	// $request->droits = 'student';
 
@@ -70,15 +70,15 @@
 
 
 	/*** AJOUT D'UN UTILISATEUR À UN GROUPE ***/
-	
-	// require('manager/groups.php');
+
+	// require __ROOT__.'/manager/groups.php';
 
 	// $request = new stdClass();
 	// $answer  = new stdClass();
 
 	// $request->level_1 = 'add';
-	// $request->utilisateur = 'mrd1609a'; // utilisateur.username
-	// $request->groupe = 'E';             // groupe.nom
+	// $request->utilisateur = 'fvg1856a'; // utilisateur.username
+	// $request->groupe = 'A';             // groupe.nom
 
 
 	// groups_switch_level_1($request, $answer);
@@ -134,25 +134,25 @@
 
 	/*** AFFICHER LES MEMBRES DE TOUS LES GROUPES ***/
 	
-	require('manager/groups.php');
+	// require('manager/groups.php');
 
-	$request = new stdClass();
-	$answer  = new stdClass();
+	// $request = new stdClass();
+	// $answer  = new stdClass();
 
-	$request->level_1 = 'grouplist';
+	// $request->level_1 = 'grouplist';
 
-	groups_switch_level_1($request, $answer);
+	// groups_switch_level_1($request, $answer);
 
-	var_dump( $answer );
-	echo '<br><br><br><br>';
+	// var_dump( $answer );
+	// echo '<br><br><br><br>';
 
-	foreach($answer->grouplist as $group)
-		foreach($group as $userlist)
-			foreach($userlist as $user)
-				foreach($user as $key=>$value)
-					echo $key.' = '.$value.'<br>';
+	// foreach($answer->grouplist as $group)
+	// 	foreach($group as $userlist)
+	// 		foreach($userlist as $user)
+	// 			foreach($user as $key=>$value)
+	// 				echo $key.' = '.$value.'<br>';
 
-	echo "<br><br><br><br><br><br><br>It works !";
+	// echo "<br><br><br><br><br><br><br>It works !";
 
 
 
diff --git a/xdoc/Cahier Des Charges Fonctionnel.pdf b/xdoc/Cahier Des Charges Fonctionnel.pdf
old mode 100644
new mode 100755