[svn r11885] update reporting

main/mySpace/index.php

@@ -54,13 +54,70 @@ function count_teacher_courses()
  ***************************/
 
 $isCoach = api_is_coach();
+$isPlatformAdmin = api_is_platform_admin();
+
+$view = isset($_GET['view']) ? $_GET['view'] : 'teacher';
+
+$menu_items = array();
+
+if(api_is_allowed_to_create_course())
+{
+	if(!$isCoach && !api_is_platform_admin())
+	{
+		$view = 'teacher';
+	}
+	if($view=='teacher')
+	{
+		$menu_items[] = get_lang('TeacherInterface');
+	}
+	else
+	{
+		$menu_items[] = '<a href="'.api_get_self().'?view=teacher">'.get_lang('TeacherInterface').'</a>';
+	}
+}
+if($isCoach)
+{
+	if(!api_is_allowed_to_create_course() && !api_is_platform_admin())
+	{
+		$view = 'teacher';
+	}
+	if($view=='coach')
+	{
+		$menu_items[] = get_lang('CoachInterface');
+	}
+	else
+	{
+		$menu_items[] = '<a href="'.api_get_self().'?view=coach">'.get_lang('CoachInterface').'</a>';
+	}
+}
+if(api_is_platform_admin)
+{
+	if($view=='admin')
+	{
+		$menu_items[] = get_lang('AdminInterface');
+	}
+	else
+	{
+		$menu_items[] = '<a href="'.api_get_self().'?view=admin">'.get_lang('AdminInterface').'</a>';
+	}
+}
+
+$nb_menu_items = count($menu_items);
+foreach($menu_items as $key=> $item)
+{
+	echo $item;
+	if($key!=$nb_menu_items-1)
+	{
+		echo ' | ';
+	}
+}
 
 echo '<div align="right">
 				<a href="#" onclick="window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
 				<a href="'.$_SERVER['PHP_SELF'].'?export=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
 			  </div>';
 
-if($isCoach)
+if($isCoach && $view=='coach')
 {
 	
 	/****************************************
@@ -331,18 +388,22 @@ if($isCoach)
 
 echo '<div class="clear">&nbsp;</div>';
 
-$sqlNbCours = "	SELECT course_rel_user.course_code, course.title
+
+if(api_is_allowed_to_create_course() && $view=='teacher')
+{
+	
+	$sqlNbCours = "	SELECT course_rel_user.course_code, course.title
 					FROM $tbl_course_user as course_rel_user
 					INNER JOIN $tbl_course as course
 						ON course.code = course_rel_user.course_code
 				  	WHERE course_rel_user.user_id='".$_user['user_id']."' AND course_rel_user.status='1'
 				  ";
-$resultNbCours = api_sql_query($sqlNbCours, __FILE__, __LINE__);
-$a_courses = api_store_result($resultNbCours);
-$nb_teacher_courses = count($a_courses);
+	$resultNbCours = api_sql_query($sqlNbCours, __FILE__, __LINE__);
+	$a_courses = api_store_result($resultNbCours);
+	$nb_teacher_courses = count($a_courses);
 	
-if($nb_teacher_courses)
-{
+	if($nb_teacher_courses)
+	{
 		
 				  
 		$table = new SortableTable('tracking_list_course', 'count_teacher_courses');
@@ -450,6 +511,7 @@ if($nb_teacher_courses)
 		$table -> updateColAttributes(7,array('align'=>'center'));
 		$table -> display();
 			
+	}
 }
 
 

main/mySpace/myStudents.php

@@ -408,6 +408,9 @@ if(!empty($_GET['student']))
 						<th>
 							<?php echo get_lang('Progress'); ?>
 						</th>
+						<th>
+							<?php echo get_lang('Progress'); ?>
+						</th>
 						<th>
 							<?php echo get_lang('LastConnexion'); ?>
 						</th>
@@ -458,6 +461,36 @@ if(!empty($_GET['student']))
 					$start_time = mysql_result($rs, 0, 0);
 					
 					
+					// get the average score in this lp (if there are exercices)
+					$score = 0;
+					$sql = 'SELECT DISTINCT path 
+							FROM '.$a_infosCours['db_name'].'.'.$tbl_course_lp_item.'
+							WHERE item_type = "quiz"
+							AND lp_id='.$a_learnpath['id'];
+					$rs = api_sql_query($sql, __FILE__,__LINE__);
+					$nb_quiz = mysql_num_rows($rs);
+					while ($quiz = Database :: fetch_array($rs))
+					{
+						$sqlScore = "SELECT  exe_result,
+									 exe_weighting
+					 				 FROM ".Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES)."
+									 WHERE exe_user_id = ".$student_id."
+					 				 AND exe_cours_id = '".Database::escape_string($_GET['course'])."'
+									 AND exe_exo_id = ".$quiz['path']."
+									 ORDER BY exe_id DESC LIMIT 0,1";
+						$rs_score = api_sql_query($sqlScore, __FILE__, __LINE__);
+						$score += mysql_result($rs_score, 0, 0) / mysql_result($rs_score, 0, 1) * 100; 
+					}
+					if($nb_quiz == 0)
+					{
+						$score = '-';
+					}
+					else
+					{
+						$score = $score / $nb_quiz.' %';
+					}
+					
+					
 					if($i%2==0){
 						$s_css_class="row_odd";
 					}
@@ -477,6 +510,9 @@ if(!empty($_GET['student']))
 						<td align="center">
 						<?php echo api_time_to_hms($total_time) ?>
 						</td>
+						<td align="center">
+							<?php echo $score ?>
+						</td>
 						<td align="center">
 							<?php echo $progress ?>
 						</td>