From e0dbe98f7f91481a6e8183d761122cb3dcf96600 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 13 Mar 2009 22:59:52 +0100 Subject: [PATCH] [svn r19042] added : Chart in the access details by user see FS#3805 --- main/gradebook/lib/fe/flatviewtable.class.php | 4 +- main/mySpace/access_details.php | 204 ++++++++++++++++-- 2 files changed, 187 insertions(+), 21 deletions(-) diff --git a/main/gradebook/lib/fe/flatviewtable.class.php b/main/gradebook/lib/fe/flatviewtable.class.php index 7df3479ab0..a320013f42 100644 --- a/main/gradebook/lib/fe/flatviewtable.class.php +++ b/main/gradebook/lib/fe/flatviewtable.class.php @@ -139,7 +139,7 @@ class FlatViewTable extends SortableTable //background color area & stripe or not $Test->drawGraphArea(255,255,255,TRUE); - $Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,1, FALSE); + $Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,150,150,150,TRUE,0,1, FALSE); //background grid $Test->drawGrid(4,TRUE,230,230,230,50); @@ -293,7 +293,7 @@ class FlatViewTable extends SortableTable //background color area & stripe or not $Test->drawGraphArea(255,255,255,TRUE); //print_r($DataSet->GetData()); - $Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,1, FALSE); + $Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,150,150,150,TRUE,0,1, FALSE); //background grid $Test->drawGrid(4,TRUE,230,230,230,50); diff --git a/main/mySpace/access_details.php b/main/mySpace/access_details.php index 7798653df4..3943452adf 100644 --- a/main/mySpace/access_details.php +++ b/main/mySpace/access_details.php @@ -4,8 +4,8 @@ ============================================================================== Dokeos - elearning and course management software - Copyright (c) 2008 Furio Petrossi - Copyright (c) 2008 Dokeos SPRL + Copyright (c) 2009 Dokeos SPRL + Copyright (c) 2008 Furio Petrossi For a full list of contributors, see "credits.txt". The full license can be read in "license.txt". @@ -28,14 +28,15 @@ * @package dokeos.library ============================================================================== - * Calculates the time spent on the course - * @param integer $user_id the user id - * @param string $course_code the course code +* Calculates the time spent on the course +* @param integer $user_id the user id +* @param string $course_code the course code * Funzione scritta da Mario per testare cose */ $language_file = array ('registration', 'index', 'tracking'); require_once('../inc/global.inc.php'); + /** * Gets the connections to a course as an array of login and logout time */ @@ -51,7 +52,7 @@ function get_connections_to_course($user_id, $course_code) { $sql = 'SELECT login_course_date, logout_course_date FROM ' . $tbl_track_course . ' WHERE user_id = ' . intval($user_id) . ' - AND course_code="' . $course_true . '" ORDER BY login_course_date'; + AND course_code="' . $course_true . '" ORDER BY login_course_date DESC'; $rs = api_sql_query($sql); $connections = array(); @@ -70,13 +71,40 @@ function get_connections_to_course($user_id, $course_code) { return $connections; } + + +function get_connections_to_course_by_time($user_id, $course_code, $year='', $month='', $day='') { + $course_code = Database::escape_string($course_code); + $tbl_track_course = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + $tbl_main=Database::get_main_table(TABLE_MAIN_COURSE); + $sql_query='SELECT visual_code as course_code FROM '.$tbl_main.' c WHERE code="'.$course_code.'";'; + $result=api_sql_query($sql_query,__FILE__,__LINE__); + $row_query=Database::fetch_array($result,'ASSOC'); + $course_true=isset($row_query['course_code']) ? $row_query['course_code']: $course_code; + + $sql = 'SELECT login_course_date, logout_course_date FROM ' . $tbl_track_course . ' + WHERE user_id = ' . intval($user_id) . ' + AND course_code="' . $course_true . '" + ORDER BY login_course_date DESC'; + + $rs = api_sql_query($sql); + $connections = array(); + while ($a_connections = Database::fetch_array($rs)) { + $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); + $connections[] = array('login'=>$i_timestamp_login_date, 'logout'=>$i_timestamp_logout_date); + } + return $connections; +} + /** * Transforms seconds into a time format */ function calculHours($seconds) -{ - +{ //How many hours ? $hours = floor($seconds / 3600); @@ -95,23 +123,165 @@ function calculHours($seconds) } /* MAIN */ -//Print headers + +$user_id = Database::escape_string($_REQUEST['student']); +$course_code=Database::escape_string($_REQUEST['course']); + +include_once(api_get_path(LIBRARY_PATH).'pchart/pData.class.php'); +include_once(api_get_path(LIBRARY_PATH).'pchart/pChart.class.php'); +include_once(api_get_path(LIBRARY_PATH).'pchart/pCache.class.php'); +$connections = get_connections_to_course($user_id, $course_code); +$i = 0; +if (api_is_xml_http_request()) { + $type = $_GET['type']; + $main_year = $main_month_year = $main_day = array(); + foreach ($connections as $key=>$data) { + //creating the main array + $main_year[date('Y',$data['login'])]+=calculHours($data['logout']-$data['login'])*60; + $main_month_year[date('m-Y',$data['login'])]+=calculHours($data['logout']-$data['login'])*60; + $main_day[date('d-m-Y',$data['login'])]+=calculHours($data['logout']-$data['login'])*60; + + if ($i > 500) { + break; + } + $i++; + } + switch ($type) { + case 'day': + $main_date = $main_day; + break; + case 'month': + $main_date = $main_month_year ; + break; + case 'year': + $main_date = $main_year; + break; + } + + //echo '
'; print_r($main_date);
+	// the nice graphics :D
+	$labels = array_keys($main_date);	
+	if (count($main_date)==1) {
+		$labels = $labels[0];
+		$main_date = $main_date[$labels];
+	}
+	
+	$DataSet = new pData;	
+	$DataSet->AddPoint($main_date,'Q');
+	if (count($main_date)!=1) {
+		$DataSet->AddPoint($labels,'Date');
+	}
+	$DataSet->AddAllSeries();  
+	$DataSet->RemoveSerie('Date');  
+	$DataSet->SetAbsciseLabelSerie('Date');
+	$DataSet->SetYAxisName(get_lang('Minutes'));  
+	$graph_id = api_get_user_id().'AccessDetails'.api_get_course_id();
+	$DataSet->AddAllSeries();
+	
+	$Cache = new pCache();
+	// the graph id
+	$data = $DataSet->GetData();
+	
+	if ($Cache->IsInCache($graph_id, $DataSet->GetData())) {
+	//if (0) {
+		//if we already created the img
+		//	echo 'in cache';
+		$img_file = $Cache->GetHash($graph_id,$DataSet->GetData());			
+	} else  {		  
+	// if the image does not exist in the main/garbage/ folder		
+		// Initialise the graph  
+		$Test = new pChart(760,230);
+		 
+		//which schema of color will be used
+		$quant_resources = count($data[0])-1;					
+		// Adding the color schemma
+		$Test->loadColorPalette(api_get_path(LIBRARY_PATH)."pchart/palette/default.txt");
+								
+	  	$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",8);     
+	  	$Test->setGraphArea(70,30,680,200);     
+	  	$Test->drawFilledRoundedRectangle(7,7,693,223,5,240,240,240);     
+	  	$Test->drawRoundedRectangle(5,5,695,225,5,230,230,230);     
+	  	$Test->drawGraphArea(255,255,255,TRUE);  
+	  	$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,150,150,150,TRUE,0,0);     
+	  	$Test->drawGrid(4,TRUE,230,230,230,50);  
+	    $Test->setLineStyle(2); 
+		// Draw the 0 line     
+		$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",6);     
+		$Test->drawTreshold(0,143,55,72,TRUE,TRUE);
+		
+	  	if (count($main_date)==1) {
+			//Draw a graph 
+			echo ''.$labels.'
';			
+  			$Test->drawBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(),TRUE);
+	  	} else {
+			//Draw the line graph  
+			$Test->drawLineGraph($DataSet->GetData(),$DataSet->GetDataDescription());     
+			$Test->drawPlotGraph($DataSet->GetData(),$DataSet->GetDataDescription(),3,2,255,255,255);
+ 		}
+	  
+		// Finish the graph     
+		$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",8);     
+		       
+		$Test->setFontProperties(api_get_path(LIBRARY_PATH)."pchart/fonts/tahoma.ttf",10);     
+		$Test->drawTitle(60,22,get_lang('AccessDetails'),50,50,50,585);    
+		
+		//------------------						
+		//echo 'not in cache';			
+		$Cache->WriteToCache($graph_id,$DataSet->GetData(),$Test);						
+		ob_start();
+		$Test->Stroke();
+		ob_end_clean();				
+		$img_file = $Cache->GetHash($graph_id,$DataSet->GetData());		
+	}	
+	echo '';
+	exit;
+}
+
 $nameTools= get_lang('AccessDetails');
 $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$_GET['course'], "name" => get_lang("Users"));
 $interbreadcrumb[] = array ("url" => "myStudents.php?cidReq=".$_GET['course']."&student=".$_GET['student']."&details=true&origin=user_course", "name" => get_lang('DetailsStudentInCourse'));
 
-Display :: display_header($nameTools);
+$htmlHeadXtra[] = ''; //jQuery
+$htmlHeadXtra[] = '';
+$htmlHeadXtra[] = '';
+$htmlHeadXtra[] = '';
+$htmlHeadXtra[] = '';
 
-$user_id = (int)$_REQUEST['student'];
-$course_code=Database::escape_string($_REQUEST['course']);
+$htmlHeadXtra[] = ''  ;
 
+Display :: display_header($nameTools);
 $TBL_USERINFO_DEF 		= Database :: get_course_table(TABLE_USER_INFO);
 $mainUserInfo = api_get_user_info($user_id, $course_code);
+
+$result_to_print = '';
+$main_date_array = array();
+foreach ($connections as $key=>$data) { 
+	$result_to_print .= '  '.date('d-m-Y (H:i:s)',$data['login']).' - '.calculHours($data['logout']-$data['login']).'
'."\n";	
+}
+
 echo '',get_lang('User'),': ',$mainUserInfo['firstName'],' ',$mainUserInfo['lastName'],' 
';
+echo ''.get_lang('Course').': ',$course_code,'

';
+
+?>
+

+    
+    
';?>
+
+
';
+echo '',get_lang('DateAndTimeOfAccess'),' - ',get_lang('Duration'),'

';
+echo $result_to_print;
 
-$connections = get_connections_to_course($user_id, $course_code);
-echo ''.get_lang('Course').': ',$course_code,' - ',$_course['name'],'
';
-echo '',get_lang('DateAndTimeOfAccess'),' - ',get_lang('Duration'),'
';
 /* Login time against logout time
 foreach ($connections as $key=>$data)
 {
@@ -125,9 +295,5 @@ foreach ($connections as $key=>$data)
 }
 echo ("");
 */
-foreach ($connections as $key=>$data)
-{ 
-    echo '  '.date('d-m-Y (H:i:s)',$data['login']).' - '.calculHours($data['logout']-$data['login']).'
'."\n"; 
-}
 Display:: display_footer();
 ?>
\ No newline at end of file