chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed - display all students or teachers informations graph - partial BT#540

Browse Source
skala
Cristian Fasanando 16 years ago
parent e963b8fccf
commit 465c8a403b
2 changed files with 21 additions and 190 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 150
      plugin/dashboard/block_student_graph/block_student_graph.class.php
  2. 39
      plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

150
plugin/dashboard/block_student_graph/block_student_graph.class.php
Unescape View File

@ -126,9 +126,6 @@ class BlockStudentGraph extends Block {
arsort($attendances_faults_avg); arsort($attendances_faults_avg);
$usernames = array_keys($attendances_faults_avg); $usernames = array_keys($attendances_faults_avg);
// get only until five users
if (count($usernames) > 5) { array_splice($usernames,5); }
$faults = array(); $faults = array();
foreach ($usernames as $username) { foreach ($usernames as $username) {
$faults[] = $attendances_faults_avg[$username]; $faults[] = $attendances_faults_avg[$username];
@ -141,12 +138,9 @@ class BlockStudentGraph extends Block {
// Defining data // Defining data
$data_set = new pData; $data_set = new pData;
$data_set->AddPoint($faults,"Promedio"); $data_set->AddPoint($faults,"Promedio");
$data_set->AddPoint($usernames,"Usuario"); $data_set->AddPoint($usernames,"Usuario");
$data_set->AddAllSeries(); $data_set->AddAllSeries();
//$data_set->SetYAxisName(get_lang('UserName'));
//$data_set->SetXAxisName(get_lang('AttendancesFaults'));
$data_set->SetAbsciseLabelSerie("Usuario"); $data_set->SetAbsciseLabelSerie("Usuario");
// prepare cache for saving image // prepare cache for saving image
@ -161,16 +155,11 @@ class BlockStudentGraph extends Block {
} else { } else {
// Initialise the graph // Initialise the graph
$test = new MyHorBar(400,280); $test = new MyHorBar(400,330);
//$Test->setFontProperties("Fonts/tahoma.ttf",8);
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8); $test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
//$test->setGraphArea(120,60,450,650); $test->setGraphArea(65,30,350,250);
$test->setGraphArea(65,30,350,200); $test->drawFilledRoundedRectangle(7,7,393,303,5,240,240,240);
//$Test->setFixedScale(0,5,5,0,0,0); $test->drawRoundedRectangle(5,5,395,305,5,230,230,230);
//$test->drawFilledRoundedRectangle(7,7,493,693,5,240,240,240);
$test->drawFilledRoundedRectangle(7,7,393,253,5,240,240,240);
//$test->drawRoundedRectangle(5,5,495,695,5,230,230,230);
$test->drawRoundedRectangle(5,5,395,255,5,230,230,230);
$test->drawGraphArea(255,255,255,TRUE); $test->drawGraphArea(255,255,255,TRUE);
$test->setFixedScale(0,100,5); $test->setFixedScale(0,100,5);
$test->drawHorScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,2,TRUE); $test->drawHorScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,2,TRUE);
@ -197,137 +186,6 @@ class BlockStudentGraph extends Block {
} else { } else {
$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>'; $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
} }
/*
$students = $this->students;
$attendance = new Attendance();
// get data
$attendances_faults_avg = array();
foreach ($students as $student) {
$student_id = $student['user_id'];
$student_info = api_get_user_info($student_id);
// get average of faults in attendances by student
$results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
if (!empty($results_faults_avg)) {
$attendances_faults_avg[$student_info['username']] = $results_faults_avg['porcent'];
} else {
$attendances_faults_avg[$student_info['username']] = 0;
}
}
arsort($attendances_faults_avg);
$usernames = array_keys($attendances_faults_avg);
// get only until five users
if (count($usernames) > 5) { array_splice($usernames,5); }
$faults = array();
foreach ($usernames as $username) {
$faults[] = $attendances_faults_avg[$username];
}
$graph = '';
$img_file = '';
if (is_array($usernames) && count($usernames) > 0) {
// Defining data
$data_set = new pData;
$data_set->AddPoint($faults,"Promedio"); // $this->Data = array(0=>array('Promedio'=>57,'Name'=>0), 1=>array('Promedio'=>43,'Name'=>1), 2=>array('Promedio'=>29,'Name'=>2))
$data_set->AddPoint($usernames,"Usuario"); // $this->Data = array(0=>array('Usuario'=>'alumno3','Name'=>0), 1=>array('Usuario'=>'alumno1','Name'=>1), 2=>array('Usuario'=>'alumno2','Name'=>2))
$data_set->AddAllSeries(); // $this->DataDescription = array('Position'=>'Name', 'Format'=>array('X'=>'number','Y'=>'number'), 'Unit'=>array('X'=>null,'Y'=null),'Values'=>array(0=>'Promedio',1=>'Usuario'))
$data_set->SetXAxisName(get_lang('UserName')); // $this->DataDescription["Axis"]["X"] = 'UserName';
$data_set->SetYAxisName(get_lang('AttendancesFaults')); // $this->DataDescription["Axis"]["Y"] = 'AttendancesFaults';
$data_set->SetAbsciseLabelSerie("Usuario"); // $this->DataDescription["Position"] = "Usuario";
// prepare cache for saving image
$graph_id = $this->user_id.'StudentEvaluationGraph'; // the graph id
$cache = new pCache();
$data = $data_set->GetData(); // return $this->DataDescription
if ($cache->IsInCache($graph_id, $data_set->GetData())) {
//if we already created the img
$img_file = $cache->GetHash($graph_id, $data_set->GetData()); // image file with hash
} else {
// Initializing the graph
$test = new pChart(365,300); // Create transparent image 365x300
// $this->FontName = api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf'
// $this->FontSize = 8
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
$X1 = 50;
$Y1 = 30;
$X2 = 345;
$Y2 = 200;
//$this->GArea_X1 = $X1;$this->GArea_Y1 = $Y1;$this->GArea_X2 = $X2;$this->GArea_Y2 = $Y2;
$test->setGraphArea(50,30,345,200);
$test->drawFilledRoundedRectangle(7,7,371,240,5,240,240,240);
$test->drawRoundedRectangle(5,5,373,225,5,230,230,230);
$test->drawGraphArea(255,255,255,TRUE);
$test->setFixedScale(0,100,5);
$test->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,10,TRUE);
$test->drawGrid(4,TRUE,230,230,230,50);
// Drawing bars
//$test->drawBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
//$test->drawLimitsGraph($data_set->GetData(),$data_set->GetDataDescription(),240,240,240);
//$test->drawOverlayBarGraph($data_set->GetData(),$data_set->GetDataDescription());
$test->drawHorizontalBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
// Drawing title
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',10);
$test->drawTitle(50,22,get_lang('AttendancesFaults'),50,50,50,385);
$test->writeValues($data_set->GetData(),$data_set->GetDataDescription(),"Promedio");
$cache->WriteToCache($graph_id, $data_set->GetData(), $test);
ob_start();
$test->Stroke();
ob_end_clean();
$img_file = $cache->GetHash($graph_id, $data_set->GetData());
}
if (!empty($img_file)) {
$graph = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">';
}
} else {
$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
}
*/
return $graph; return $graph;
} }

39
plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
Unescape View File

@ -107,24 +107,7 @@ class BlockTeacherGraph extends Block {
$teachers = $this->teachers; $teachers = $this->teachers;
$graph = ''; $graph = '';
// get data $user_ids = array_keys($teachers);
$time_on_the_platform = array();
foreach ($teachers as $teacher) {
$teacher_id = $teacher['user_id'];
// get time on platform last week
$time_on_platform_last_week = Tracking :: get_time_spent_on_the_platform($teacher_id,true);
if (!empty($time_on_platform_last_week)) {
$time_on_the_platform[$teacher_id] = $time_on_platform_last_week;
} else {
$time_on_the_platform[$teacher_id] = 0;
}
}
arsort($time_on_the_platform);
// get only until five users
if (count($time_on_the_platform) > 5) { array_splice($time_on_the_platform,5); }
$user_ids = array_keys($time_on_the_platform);
$a_last_week = get_last_week(); $a_last_week = get_last_week();
if (is_array($user_ids) && count($user_ids) > 0) { if (is_array($user_ids) && count($user_ids) > 0) {
@ -132,7 +115,6 @@ class BlockTeacherGraph extends Block {
foreach ($user_ids as $user_id) { foreach ($user_ids as $user_id) {
$teacher_info = api_get_user_info($user_id); $teacher_info = api_get_user_info($user_id);
$username = $teacher_info['username']; $username = $teacher_info['username'];
$time_by_days = array(); $time_by_days = array();
foreach ($a_last_week as $day) { foreach ($a_last_week as $day) {
$time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, false, $day); $time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, false, $day);
@ -140,14 +122,11 @@ class BlockTeacherGraph extends Block {
$min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60); $min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60);
$time_by_days[] = $min; $time_by_days[] = $min;
} }
$data_set->AddPoint($time_by_days,$username); $data_set->AddPoint($time_by_days,$username);
$data_set->AddSerie($username); $data_set->AddSerie($username);
} }
$last_week = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]); $last_week = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
$days_on_week = array(); $days_on_week = array();
foreach ($a_last_week as $weekday) { foreach ($a_last_week as $weekday) {
$days_on_week[] = date('d/m',$weekday); $days_on_week[] = date('d/m',$weekday);
@ -170,11 +149,11 @@ class BlockTeacherGraph extends Block {
} else { } else {
// Initializing the graph // Initializing the graph
$test = new pChart(400,280); $test = new pChart(400,330);
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8); $test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
$test->setGraphArea(65,30,350,200); $test->setGraphArea(65,30,350,250);
$test->drawFilledRoundedRectangle(7,7,393,253,5,240,240,240); $test->drawFilledRoundedRectangle(7,7,393,303,5,240,240,240);
$test->drawRoundedRectangle(5,5,395,255,5,230,230,230); $test->drawRoundedRectangle(5,5,395,305,5,230,230,230);
$test->drawGraphArea(255,255,255,TRUE); $test->drawGraphArea(255,255,255,TRUE);
$test->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,2,TRUE); $test->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL,150,150,150,TRUE,0,2,TRUE);
$test->drawGrid(4,TRUE,230,230,230,50); $test->drawGrid(4,TRUE,230,230,230,50);
@ -187,11 +166,7 @@ class BlockTeacherGraph extends Block {
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8); $test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
$test->drawLegend(320,20,$data_set->GetDataDescription(),204,204,255); $test->drawLegend(320,20,$data_set->GetDataDescription(),204,204,255);
// Drawing title $test->writeValues($data_set->GetData(),$data_set->GetDataDescription(),array("Days"));
//$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',10);
//$test->drawTitle(50,22,get_lang('TimeSpentOnThePlatformLastWeekByDay'),50,50,50,385);
$test->writeValues($data_set->GetData(),$data_set->GetDataDescription(),"Days");
$cache->WriteToCache($graph_id, $data_set->GetData(), $test); $cache->WriteToCache($graph_id, $data_set->GetData(), $test);
ob_start(); ob_start();
@ -200,14 +175,12 @@ class BlockTeacherGraph extends Block {
$img_file = $cache->GetHash($graph_id, $data_set->GetData()); $img_file = $cache->GetHash($graph_id, $data_set->GetData());
} }
if (!empty($img_file)) { if (!empty($img_file)) {
$graph = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">'; $graph = '<img src="'.api_get_path(WEB_ARCHIVE_PATH).$img_file.'">';
} }
} else { } else {
$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>'; $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
} }
return $graph; return $graph;
} }

Write Preview
Loading…
Cancel
Save