[svn r10194] update for the reporting

main/mySpace/coaches.php

@@ -16,6 +16,11 @@ $nameTools= get_lang('Tutors');
 
 api_block_anonymous_users();
 $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+
+if(isset($_GET["id_student"])){
+	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+}
+
 Display :: display_header($nameTools);
 
 api_display_tool_title($nameTools);
@@ -252,7 +257,7 @@ if(mysql_num_rows($resultCoachs)>0){
 		$a_data[$i_id_coach]["firstname"]=$s_firstname;
 		$a_data[$i_id_coach]["connection_time"]=$s_connection_time;
 			
-		echo '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td>'.$s_connection_time.'</td><td><a href="cours.php?type=coach&user_id='.$i_id_coach.'">-></a></td><td><a href="myStudents.php?type=coach&user_id='.$i_id_coach.'">-></a></td></tr>';
+		echo '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td>'.$s_connection_time.'</td><td><a href="cours.php?type=coach&user_id='.$i_id_coach.'">-></a></td><td><a href="student.php?type=coach&user_id='.$i_id_coach.'">-></a></td></tr>';
 		
 	}
 	

main/mySpace/cours.php

@@ -21,8 +21,12 @@
  	 $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
  }
  
+ if(isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"]=="student"){
+ 	 $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+ }
+ 
  if(isset($_GET["user_id"]) && $_GET["user_id"]!="" && !isset($_GET["type"])){
- 	 $interbreadcrumb[] = array ("url" => "cours.php", "name" => get_lang('Teachers'));
+ 	 $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
  }
  
  Display :: display_header($nameTools);
@@ -117,6 +121,8 @@ $tbl_session_course_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE
  ===============================================================================  
  */
 	
+	$a_courses=array();
+	$a_coursesRelUser=array();
 	
 	if(isset($_GET["id_session"]) && $_GET["id_session"]!=""){
 		
@@ -150,7 +156,17 @@ $tbl_session_course_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE
  			$sqlCourse="SELECT title,code " .
 	 					"FROM $tbl_course as course, $tbl_session_course_user as srcu " .
 	 					"WHERE course.code=srcu.course_code AND srcu.id_user='$i_user_id'";
+	 					
+	 		$sqlCourseRelUser="SELECT title,code " .
+	 					"FROM $tbl_course as course, $tbl_user_course as src " .
+	 					"WHERE course.code=src.course_code AND src.user_id='$i_user_id' AND src.status='5'";
 
+			$resultCourseRelUser = api_sql_query($sqlCourseRelUser);
+		
+			$a_coursesRelUser = api_store_result($resultCourseRelUser);
+			
+			
+			
  		}
  		
  		//It's a teacher
@@ -160,12 +176,15 @@ $tbl_session_course_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE
 							WHERE course.code=cru.course_code AND cru.user_id='$i_user_id' AND cru.status='1'
 							ORDER BY title ASC
 						  ";
+
  		}
  		
  		$resultCourses = api_sql_query($sqlCourse);
 		
 		$a_courses = api_store_result($resultCourses);
- 		
+		
+		$a_courses=array_merge($a_courses,$a_coursesRelUser);
+
  	}
  	if(!isset($_GET["user_id"]) && !isset($_GET["id_session"])){
  		

main/mySpace/myStudents.php

@@ -115,6 +115,30 @@ function exportCsv($a_infosUser,$tableTitle,$a_header,$a_dataLearnpath,$a_dataEx
 	return $message;
 }
 
+
+function calculHours($seconds)
+{
+	
+  //combien d'heures ?
+  $hours = floor($seconds / 3600);
+
+  //combien de minutes ?
+  $min = floor(($seconds - ($hours * 3600)) / 60);
+  if ($min < 10)
+    $min = "0".$min;
+
+  //combien de secondes
+  $sec = $seconds - ($hours * 3600) - ($min * 60);
+  if ($sec < 10)
+    $sec = "0".$sec;
+        
+  //echo $hours."h".$min."m".$sec."s";
+
+	return $hours."h".$min."m".$sec."s" ;
+
+}
+
+
 /*
  *===============================================================================
  *	MAIN CODE
@@ -223,7 +247,7 @@ if(!empty($_GET['student']))
 								}
 							?>
 						
-						<td class="none">
+						<td class="none" width="60%">
 							<table>
 								<tr>
 									<td class="none">
@@ -239,7 +263,7 @@ if(!empty($_GET['student']))
 											echo get_lang('Email').' : ';
 											if(!empty($a_infosUser['email']))
 											{
-												echo '<a href="mailto:'.$students['email'].'">'.$a_infosUser['email'].'</a>';
+												echo '<a href="mailto:'.$a_infosUser['email'].'">'.$a_infosUser['email'].'</a>';
 											}
 											else
 											{
@@ -278,7 +302,7 @@ if(!empty($_GET['student']))
 				
 						if(!empty($_GET['details']))
 						{
-							$sendMail = Display::encrypted_mailto_link($a_infosUser['email'], '> '.get_lang('SendMail'));
+							$sendMail = Display::encrypted_mailto_link($a_infosUser['email'], ' '.get_lang('SendMail'));
 						
 					?>
 						<td class="borderLeft">
@@ -294,13 +318,13 @@ if(!empty($_GET['student']))
 											if(!empty($a_infosUser['email']))
 											{
 												echo "<td class='none'>";
-												echo $sendMail;
+												echo '<img align="absbottom" src="../img/send_mail.gif">&nbsp;'.$sendMail;
 												echo "</td>";
 											}
 											else
 											{
 												echo "<td class='noLink none'>";
-												echo '<strong> > '.get_lang('SendMail').'</strong>';
+												echo '<img align="absbottom" src="../img/send_mail.gif">&nbsp; <strong> > '.get_lang('SendMail').'</strong>';
 												echo "</td>";
 											}
 										?>
@@ -308,23 +332,23 @@ if(!empty($_GET['student']))
 								</tr>
 								<tr>
 									<td class="none">
-										<?php echo "<a href=''>".'> '.get_lang('RdvAgenda')."</a>"; ?>
+										<?php echo "<img align='absbottom' src='../img/meeting_agenda.gif'><a href=''>".'&nbsp; '.get_lang('RdvAgenda')."</a>"; ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="none">
-										<?php echo "<a href=''>".'> '.get_lang('VideoConf')."</a>"; ?>
+										<?php echo "<img align='absbottom' src='../img/visio.gif'><a href=''>".'&nbsp; '.get_lang('VideoConf')."</a>"; ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="none">
-										<?php echo "<a href=''>".'> '.get_lang('Chat')."</a>"; ?>
+										<?php echo "<img align='absbottom' src='../img/chat.gif'><a href=''>".'&nbsp; '.get_lang('Chat')."</a>"; ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="none">
 								
-										<?php echo "<a href='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&csv=true#infosStudent'>".'> '.get_lang('ExcelFormat')."</a>"; ?>
+										<?php echo "<img align='absbottom' src='../img/spreadsheet.gif'><a href='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&csv=true#infosStudent'>".'&nbsp; '.get_lang('ExcelFormat')."</a>"; ?>
 									</td>
 								</tr>
 							</table>
@@ -783,13 +807,44 @@ if(!empty($_GET['student']))
 					
 					$progress = round(($a_nbItem['nbItem'] * 100)/$nbTotalItem);
 					
+					
+					/**
+					 * Calcul du temps passé sur le cours courant
+					 */
+					
+					$tbl_track_lcourse_access = Database :: get_statistic_table(STATISTIC_TRACK_E_COURSE_ACCESS_TABLE);
+					
+					$s_sql_connection_time="SELECT login_course_date, logout_course_date FROM $tbl_track_lcourse_access WHERE user_id ='".$_GET['student']."' AND logout_course_date <> 'null' AND course_code='".$a_cours['code']."'";
+
+					$q_result_connection_time=api_sql_query($s_sql_connection_time);
+					
+					$i_nb_seconds=0;
+					
+					while($a_connections=mysql_fetch_array($q_result_connection_time)){
+						
+						$s_login_date=$a_connections["login_course_date"];
+						$s_logout_date=$a_connections["logout_course_date"];
+						
+						$i_timestamp_login_date=strtotime($s_login_date);
+						$i_timestamp_logout_date=strtotime($s_logout_date);
+						
+						$i_nb_seconds+=($i_timestamp_logout_date-$i_timestamp_login_date);
+						
+					}
+					
+					$s_connection_time=calculHours($i_nb_seconds);
+					if($s_connection_time=="0h00m00s"){
+						$s_connection_time="";
+					}
+					
+					
 	?>			
 					<tr class="<?php echo $s_css_class;?>">
 						<td>
 							<?php echo $a_cours['title'].' - '.get_lang('Tutor').' : '.$a_cours['tutor_name']; ?>
 						</td>
-						<td>
-							
+						<td align="center">
+							<?php echo $s_connection_time;?>
 						</td>
 						<td align="center">
 							<?php echo $progress.'%'; ?>

main/mySpace/student.php

@@ -12,7 +12,17 @@ ob_start();
  $this_section = "session_my_space";
  
  api_block_anonymous_users();
-  $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+ 
+ $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+ 
+ if(isset($_GET["user_id"]) && $_GET["user_id"]!="" && !isset($_GET["type"])){
+ 	$interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
+ }
+ 
+ if(isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"]=="coach"){
+ 	$interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
+ }
+ 
  Display :: display_header($nameTools);
 
 // Database Table Definitions
@@ -84,14 +94,16 @@ $tbl_session_rel_user 		= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
  	$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
  	
  	
- 	$sql_select_courses="SELECT course_rel_user.course_code FROM $tbl_course_user as course_rel_user LEFT OUTER JOIN $tbl_session_course as src ON course_rel_user.course_code=src.course_code WHERE user_id='$i_teacher_id' AND status='1' AND src.course_code IS NULL";
-	
+ 	//$sql_select_courses="SELECT course_rel_user.course_code, src.course_code as test FROM $tbl_course_user as course_rel_user LEFT OUTER JOIN $tbl_session_course as src ON course_rel_user.course_code=src.course_code WHERE user_id='$i_teacher_id' AND status='1' AND src.course_code IS NULL";
+ 	$sql_select_courses="SELECT course_rel_user.course_code FROM $tbl_course_user as course_rel_user  WHERE user_id='$i_teacher_id' AND status='1'";
+
  	$result_courses=api_sql_query($sql_select_courses);
  	
  	while($a_courses=mysql_fetch_array($result_courses)){
  		
  		$s_course_code=$a_courses["course_code"];
  		$sqlStudents = "SELECT user.user_id,lastname,firstname,email FROM $tbl_course_user as course_rel_user, $tbl_user as user WHERE course_rel_user.user_id=user.user_id AND course_rel_user.status='5' AND course_rel_user.course_code='$s_course_code'";
+
  		$result_students=api_sql_query($sqlStudents);
 
  		if(mysql_num_rows($result_students)>0){
@@ -251,7 +263,7 @@ $tbl_session_rel_user 		= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
 	$a_students=array();
 	
 	//La personne est admin
-	if(api_is_platform_admin()){
+	if(api_is_platform_admin() && !isset($_GET["user_id"])){
 	
 		$sqlStudent = "	SELECT user_id,lastname,firstname,email
 						FROM $tbl_user
@@ -278,15 +290,37 @@ $tbl_session_rel_user 		= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
 	}
 	
 	else{
-		
-		$a_students=getStudentsFromCoursesNoSession($_user['user_id'], $a_students);
-
-		$a_students=getStudentsFromCoursesFromSessions($_user['user_id'], $a_students);
 
-		$a_students=getStudentsFromCoursesFromSessionsCoach($_user['user_id'], $a_students);
+		if(isset($_GET["user_id"])){
+			
+			//It's a teacher
+			if(!isset($_GET["type"])){
+			
+				$a_students=getStudentsFromCoursesNoSession($_GET["user_id"], $a_students);
+				
+				$a_students=getStudentsFromCoursesFromSessions($_GET["user_id"], $a_students);
+				
+			}
+			
+			//It's a coach
+			else{
+				$a_students=getStudentsFromCoursesFromSessionsCoach($_user['user_id'], $a_students);
+			}
+			
+		}
+		
+		else{
+			
+			$a_students=getStudentsFromCoursesNoSession($_user['user_id'], $a_students);
+	
+			$a_students=getStudentsFromCoursesFromSessions($_user['user_id'], $a_students);
+	
+			$a_students=getStudentsFromCoursesFromSessionsCoach($_user['user_id'], $a_students);
+			
+		}
 
 		
-	}	  
+	}
 	
 	usort($a_students,"mysort");
 	

main/mySpace/teachers.php

@@ -167,7 +167,7 @@ if(mysql_num_rows($resultFormateurs)>0){
 		$a_data[$i_user_id]["firstname"]=$s_firstname;
 		$a_data[$i_user_id]["email"]=$s_email;
 		
-		echo '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td><a href="mailto:'.$s_email.'">'.$s_email.'</a></td><td><a href="cours.php?user_id='.$i_user_id.'">-></a></td><td><a href="myStudents.php?user_id='.$i_user_id.'">-></a></td></tr>';
+		echo '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td><a href="mailto:'.$s_email.'">'.$s_email.'</a></td><td><a href="cours.php?user_id='.$i_user_id.'">-></a></td><td><a href="student.php?user_id='.$i_user_id.'">-></a></td></tr>';
 		
 	}