'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'
'; - } - - - /* - $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 = ''.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'
'; - } - */ + } return $graph; } diff --git a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php index dfade4f5b7..b993ba6cdb 100755 --- a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php +++ b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php @@ -103,28 +103,11 @@ class BlockTeacherGraph extends Block { * @return string content html */ public function get_teachers_information_graph() { - + $teachers = $this->teachers; $graph = ''; - // get data - $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); + $user_ids = array_keys($teachers); $a_last_week = get_last_week(); if (is_array($user_ids) && count($user_ids) > 0) { @@ -132,22 +115,18 @@ class BlockTeacherGraph extends Block { foreach ($user_ids as $user_id) { $teacher_info = api_get_user_info($user_id); $username = $teacher_info['username']; - $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); $hours = floor($time_on_platform_by_day / 3600); $min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60); $time_by_days[] = $min; } - $data_set->AddPoint($time_by_days,$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]); - $days_on_week = array(); foreach ($a_last_week as $weekday) { $days_on_week[] = date('d/m',$weekday); @@ -170,11 +149,11 @@ class BlockTeacherGraph extends Block { } else { // 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->setGraphArea(65,30,350,200); - $test->drawFilledRoundedRectangle(7,7,393,253,5,240,240,240); - $test->drawRoundedRectangle(5,5,395,255,5,230,230,230); + $test->setGraphArea(65,30,350,250); + $test->drawFilledRoundedRectangle(7,7,393,303,5,240,240,240); + $test->drawRoundedRectangle(5,5,395,305,5,230,230,230); $test->drawGraphArea(255,255,255,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); @@ -186,30 +165,24 @@ class BlockTeacherGraph extends Block { // Drawing Legend $test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8); $test->drawLegend(320,20,$data_set->GetDataDescription(),204,204,255); - - // Drawing title - //$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"); - + + $test->writeValues($data_set->GetData(),$data_set->GetDataDescription(),array("Days")); + $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 = ''.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'
'; - } - - return $graph; - + } + return $graph; + }