chamilo / chamilo-lms

plugin/bbb/lib/bbb_plugin.class.php

Indentation +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@
  * main/img/icons/64/plugin_name_na.png
 */
 /**
- * Videoconference plugin with BBB
- */
+     * Videoconference plugin with BBB
+     */
 //namespace Chamilo\Plugin\BBB;
 /**
- * Class BBBPlugin
- */
+     * Class BBBPlugin
+     */
 class BBBPlugin extends Plugin
 {
     public $isCoursePlugin = true;

plugin/dashboard/block_course/block_course.class.php

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * This file is part of course block plugin for dashboard,
- * it should be required inside dashboard controller for showing it into dashboard interface from plattform
- * @package chamilo.dashboard
- * @author Christian Fasanando
- */
+     * This file is part of course block plugin for dashboard,
+     * it should be required inside dashboard controller for showing it into dashboard interface from plattform
+     * @package chamilo.dashboard
+     * @author Christian Fasanando
+     */
 /**
- * This class is used like controller for this course block plugin,
- * the class name must be registered inside path.info file (e.g: controller = "BlockCourse"), so dashboard controller will be instantiate it
- * @package chamilo.dashboard
- */
+     * This class is used like controller for this course block plugin,
+     * the class name must be registered inside path.info file (e.g: controller = "BlockCourse"), so dashboard controller will be instantiate it
+     * @package chamilo.dashboard
+     */
 class BlockCourse extends Block
 {
 

plugin/dashboard/block_student_graph/block_student_graph.class.php

Indentation +74 added lines, -74 removed lines

@@ -22,40 +22,40 @@ 
 {
 
     private $user_id;
-	private $students;
-	private $path;
-	private $permission = array(DRH);
+    private $students;
+    private $path;
+    private $permission = array(DRH);
 
-	/**
-	 * Constructor
-	 */
+    /**
+     * Constructor
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_student_graph';
-    	if ($this->is_block_visible_for_user($user_id)) {
-    		/*if (api_is_platform_admin()) {
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_student_graph';
+        if ($this->is_block_visible_for_user($user_id)) {
+            /*if (api_is_platform_admin()) {
 	    		$this->students = UserManager::get_user_list(array('status' => STUDENT));
 	    	} else if (api_is_drh()) {*/
-	    		$this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
-	    	//}
-    	}
+                $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
+            //}
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -67,12 +67,12 @@ 
     public function get_block()
     {
 
-    	global $charset;
-    	$column = 1;
-    	$data   = array();
-		$students_attendance_graph = $this->get_students_attendance_graph();
+        global $charset;
+        $column = 1;
+        $data   = array();
+        $students_attendance_graph = $this->get_students_attendance_graph();
 
-		$html = '<div class="panel panel-default" id="intro">
+        $html = '<div class="panel panel-default" id="intro">
 	                <div class="panel-heading">
 	                    '.get_lang('StudentsInformationsGraph').'
 	                    <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -84,51 +84,51 @@ 
 						'.$students_attendance_graph.'
 	                </div>
 	            </div>';
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
-    	return $data;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
+        return $data;
     }
 
     /**
- 	 * This method return a graph containing information about students evaluation,
+     * This method return a graph containing information about students evaluation,
      * it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  img html
- 	 */
+     * @return string  img html
+     */
     public function get_students_attendance_graph()
     {
 
-		$students = $this->students;
- 		$attendance = new Attendance();
-
- 		// get data
- 		$attendances_faults_avg = array();
- 		if (is_array($students) && count($students) > 0) {
-	 		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['lastname']] = $results_faults_avg['porcent'];
-	 			} else {
-	 				$attendances_faults_avg[$student['lastname']] = 0;
-	 			}
-	 		}
- 		}
+        $students = $this->students;
+            $attendance = new Attendance();
+
+            // get data
+            $attendances_faults_avg = array();
+            if (is_array($students) && count($students) > 0) {
+                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['lastname']] = $results_faults_avg['porcent'];
+                    } else {
+                        $attendances_faults_avg[$student['lastname']] = 0;
+                    }
+                }
+            }
 
- 		arsort($attendances_faults_avg);
-		$usernames = array_keys($attendances_faults_avg);
+            arsort($attendances_faults_avg);
+        $usernames = array_keys($attendances_faults_avg);
 
-		$faults = array();
-		foreach ($usernames as $username) {
-			$faults[] = $attendances_faults_avg[$username];
-		}
+        $faults = array();
+        foreach ($usernames as $username) {
+            $faults[] = $attendances_faults_avg[$username];
+        }
 
-		$graph = '';
-		$img_file = '';
+        $graph = '';
+        $img_file = '';
 
-		if (is_array($usernames) && count($usernames) > 0) {
+        if (is_array($usernames) && count($usernames) > 0) {
 
             // Defining data
             $dataSet = new pData();
@@ -233,19 +233,19 @@ 
                 $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
             }
             $graph = '<img src="' . $imgPath . '" >';
-		} else {
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
-		}
+        } else {
+            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'</p>';
+        }
 
- 		return $graph;
- 	}
+            return $graph;
+        }
 
     /**
-	 * Get number of students
-	 * @return int
-	 */
-	function get_number_of_students()
+     * Get number of students
+     * @return int
+     */
+    function get_number_of_students()
     {
-		return count($this->students);
-	}
+        return count($this->students);
+    }
 }

plugin/dashboard/block_teacher/block_teacher.class.php

Indentation +103 added lines, -103 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * This file is part of teacher block plugin for dashboard,
- * it should be required inside dashboard controller for showing it into dashboard interface from plattform
- * @package chamilo.dashboard
- * @author Christian Fasanando
- */
+     * This file is part of teacher block plugin for dashboard,
+     * it should be required inside dashboard controller for showing it into dashboard interface from plattform
+     * @package chamilo.dashboard
+     * @author Christian Fasanando
+     */
 
 /**
  * required files for getting data
@@ -24,32 +24,32 @@ 
     private $path;
     private $permission = array(DRH);
 
-	/**
-	 * Controller
-	 */
+    /**
+     * Controller
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_teacher';
-    	if ($this->is_block_visible_for_user($user_id)) {
-	        $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
-    	}
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_teacher';
+        if ($this->is_block_visible_for_user($user_id)) {
+            $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -60,12 +60,12 @@ 
     public function get_block()
     {
 
-    	global $charset;
-    	$column = 1;
-    	$data = array();
-		$teacher_content_html = $this->get_teachers_content_html_for_drh();
+        global $charset;
+        $column = 1;
+        $data = array();
+        $teacher_content_html = $this->get_teachers_content_html_for_drh();
 
-		$html = '
+        $html = '
                 <div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('TeachersInformationsList').'
@@ -79,27 +79,27 @@ 
                 </div>
 				';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
 
-    	return $data;
+        return $data;
 
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_teachers_content_html_for_platform_admin()
     {
-	 	$teachers = $this->teachers;
-		//$content = '<div style="margin:10px;">';
-		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
+            $teachers = $this->teachers;
+        //$content = '<div style="margin:10px;">';
+        $content = '<h4>'.get_lang('YourTeachers').'</h4>';
 
         $teachers_table = null;
-		if (count($teachers) > 0) {
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
-	 		$teachers_table .= '
+        if (count($teachers) > 0) {
+                $teachers_table .= '<table class="data_table" width:"95%">';
+                $teachers_table .= '
 								<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('TimeSpentOnThePlatform').'</th>
@@ -107,103 +107,103 @@ 
 								</tr>
 							';
 
-	 		$i = 1;
-	 		foreach ($teachers as $teacher) {
+                $i = 1;
+                foreach ($teachers as $teacher) {
 
-	 			$teacher_id = $teacher['user_id'];
-	 			$firstname 	= $teacher['firstname'];
-	 			$lastname 	= $teacher['lastname'];
-	 			$username	= $teacher['username'];
+                    $teacher_id = $teacher['user_id'];
+                    $firstname 	= $teacher['firstname'];
+                    $lastname 	= $teacher['lastname'];
+                    $username	= $teacher['username'];
 
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
-	 			$last_connection = Tracking :: get_last_connection_date($teacher_id);
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id));
+                    $last_connection = Tracking :: get_last_connection_date($teacher_id);
 
-				if ($i%2 == 0) $class_tr = 'row_odd';
-			    else $class_tr = 'row_even';
+                if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
 
-				$teachers_table .= '
+                $teachers_table .= '
 									<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
 										<td align="right">'.$time_on_platform.'</td>
 										<td align="right">'.$last_connection.'</td>
 									</tr>
 									';
-	 			$i++;
-	 		}
-	 		$teachers_table .= '</table>';
-		} else {
-			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
-		}
+                    $i++;
+                }
+                $teachers_table .= '</table>';
+        } else {
+            $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+        }
 
-	 	$content .= $teachers_table;
+            $content .= $teachers_table;
 
- 		if (count($teachers) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;">
+            if (count($teachers) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;">
 			<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin">'.get_lang('SeeMore').'</a></div>';
-		}
+        }
 
-		//$content .= '</div>';
+        //$content .= '</div>';
 
- 		return $content;
-	}
+            return $content;
+    }
 
-	public function get_teachers_content_html_for_drh()
+    public function get_teachers_content_html_for_drh()
     {
-  		$teachers = $this->teachers;
- 		//$content = '<div style="margin:10px;">';
- 		$content = '<h4>'.get_lang('YourTeachers').'</h4>';
+            $teachers = $this->teachers;
+            //$content = '<div style="margin:10px;">';
+            $content = '<h4>'.get_lang('YourTeachers').'</h4>';
         $teachers_table = null;
- 		if (count($teachers) > 0) {
- 			$a_last_week = get_last_week();
- 			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
+            if (count($teachers) > 0) {
+                $a_last_week = get_last_week();
+                $last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
 
-	 		$teachers_table .= '<table class="data_table" width:"95%">';
-	 		$teachers_table .= '
+                $teachers_table .= '<table class="data_table" width:"95%">';
+                $teachers_table .= '
 								<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('TimeSpentLastWeek').'<br />'.$last_week.'</th>
 								</tr>
 							';
 
-	 		$i = 1;
-	 		foreach ($teachers as $teacher) {
+                $i = 1;
+                foreach ($teachers as $teacher) {
 
-	 			$teacher_id = $teacher['user_id'];
-	 			$firstname  = $teacher['firstname'];
-	 			$lastname   = $teacher['lastname'];
-				$username	= $teacher['username'];
-	 			$time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
+                    $teacher_id = $teacher['user_id'];
+                    $firstname  = $teacher['firstname'];
+                    $lastname   = $teacher['lastname'];
+                $username	= $teacher['username'];
+                    $time_on_platform = api_time_to_hms(Tracking :: get_time_spent_on_the_platform($teacher_id,true));
 
-	 			if ($i%2 == 0) $class_tr = 'row_odd';
-	    		else $class_tr = 'row_even';
-	    		$teachers_table .= '<tr class="'.$class_tr.'">
+                    if ($i%2 == 0) $class_tr = 'row_odd';
+                else $class_tr = 'row_even';
+                $teachers_table .= '<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname,$lastname).' ('.$username.')</td>
 										<td align="right">'.$time_on_platform.'</td>
 									</tr>';
 
-	 			$i++;
-	 		}
-	 		$teachers_table .= '</table>';
- 		} else {
- 			$teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
- 		}
+                    $i++;
+                }
+                $teachers_table .= '</table>';
+            } else {
+                $teachers_table .= get_lang('ThereIsNoInformationAboutYourTeachers');
+            }
 
-  		$content .= $teachers_table;
+            $content .= $teachers_table;
 
- 		if (count($teachers) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
-		}
-		//$content .= '</div>';
+            if (count($teachers) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/teachers.php">'.get_lang('SeeMore').'</a></div>';
+        }
+        //$content .= '</div>';
 
-  		return $content;
-  	}
+            return $content;
+        }
 
     /**
-	 * Get number of teachers
-	 * @return int
-	 */
-	function get_number_of_teachers()
+     * Get number of teachers
+     * @return int
+     */
+    function get_number_of_teachers()
     {
-		return count($this->teachers);
-	}
+        return count($this->teachers);
+    }
 }

plugin/dashboard/block_student/block_student.class.php

Indentation +146 added lines, -146 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * This file is part of student block plugin for dashboard,
- * it should be required inside dashboard controller for showing it into dashboard interface from plattform
- * @package chamilo.dashboard
- * @author Christian Fasanando
- */
+     * This file is part of student block plugin for dashboard,
+     * it should be required inside dashboard controller for showing it into dashboard interface from plattform
+     * @package chamilo.dashboard
+     * @author Christian Fasanando
+     */
 
 /**
  * This class is used like controller for student block plugin,
@@ -14,36 +14,36 @@ 
 class BlockStudent extends Block
 {
     private $user_id;
-	private $students;
-	private $path;
-	private $permission = array(DRH);
+    private $students;
+    private $path;
+    private $permission = array(DRH);
 
-	/**
-	 * Constructor
-	 */
+    /**
+     * Constructor
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_student';
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_student';
+        if ($this->is_block_visible_for_user($user_id)) {
             $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
-    	}
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -53,12 +53,12 @@ 
      */
     public function get_block()
     {
-    	global $charset;
-    	$column = 1;
-    	$data   = array();
+        global $charset;
+        $column = 1;
+        $data   = array();
 
         $student_content_html = $this->get_students_content_html_for_drh();
-		$html = '<div class="panel panel-default" id="intro">
+        $html = '<div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('StudentsInformationsList').'
                         <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -70,24 +70,24 @@ 
                         '.$student_content_html.'
                     </div>
                     </div>';
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
-    	return $data;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
+        return $data;
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_students_content_html_for_platform_admin()
     {
- 		$students = $this->students;
- 		//$content = '<div style="margin:10px;">';
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
+            $students = $this->students;
+            //$content = '<div style="margin:10px;">';
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
         $students_table = null;
- 		if (count($students) > 0) {
-	 		$students_table .= '<table class="data_table">';
-	 		$students_table .= '<tr>
+            if (count($students) > 0) {
+                $students_table .= '<table class="data_table">';
+                $students_table .= '<tr>
 									<th width="10%" rowspan="2">'.get_lang('FirstName').'</th>
 									<th width="10%" rowspan="2">'.get_lang('LastName').'</th>
 									<th width="30%" colspan="2">'.get_lang('CourseInformation').'</th>
@@ -97,146 +97,146 @@ 
 									<th width="10%">'.get_lang('Time').'</th>
 								</tr>';
 
-	 		$i = 1;
-	 		foreach ($students as $student) {
+                $i = 1;
+                foreach ($students as $student) {
 
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
-	 			$count_courses = count($courses_by_user);
-				$rowspan = $count_courses?$count_courses+1:2;
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
+                    $count_courses = count($courses_by_user);
+                $rowspan = $count_courses?$count_courses+1:2;
 
-				if ($i%2 == 0) {
+                if ($i%2 == 0) {
                     $style = ' style="background-color:#F2F2F2" ';
                 } else {
                     $style = ' style="background-color:#FFF" ';
                 }
 
-	 			$students_table .= '<tr '.$style.'>
+                    $students_table .= '<tr '.$style.'>
 										<td rowspan="'.$rowspan.'">'.$student['firstname'].'</td>
 										<td rowspan="'.$rowspan.'">'.$student['lastname'].'</td>
 									</tr>';
 
-	 			// courses information about the student
-	 			if (!empty($courses_by_user)) {
-		 			foreach ($courses_by_user as $course) {
-		 				$course_code = $course['code'];
-						$courseInfo = api_get_course_info($course_code);
-						$courseId = $courseInfo['real_id'];
-		 				$course_title = $course['title'];
-		 				$time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
-		 				$students_table .= '<tr '.$style.'>
+                    // courses information about the student
+                    if (!empty($courses_by_user)) {
+                        foreach ($courses_by_user as $course) {
+                            $course_code = $course['code'];
+                        $courseInfo = api_get_course_info($course_code);
+                        $courseId = $courseInfo['real_id'];
+                            $course_title = $course['title'];
+                            $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
+                            $students_table .= '<tr '.$style.'>
 											<td align="right">'.$course_title.'</td>
 											<td align="right">'.$time.'</td>
 											</tr>';
-		 			}
-	 			} else {
-	 				$students_table .= '<tr '.$style.'>
+                        }
+                    } else {
+                        $students_table .= '<tr '.$style.'>
 											<td align="center" colspan="2"><i>'.get_lang('Empty').'</i></td>
 										</tr>';
-	 			}
-	 			$i++;
-	 		}
-	 		$students_table .= '</table>';
- 		} else {
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
- 		}
-
- 		$content .= $students_table;
-
- 		if (count($students) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
-		}
-		//$content .= '</div>';
-
- 		return $content;
- 	}
-
-  	public function get_students_content_html_for_drh() {
-  		$attendance = new Attendance();
-  		$students = $this->students;
- 		//$content = '<div style="margin:5px;">';
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
+                    }
+                    $i++;
+                }
+                $students_table .= '</table>';
+            } else {
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            }
+
+            $content .= $students_table;
+
+            if (count($students) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
+        }
+        //$content .= '</div>';
+
+            return $content;
+        }
+
+        public function get_students_content_html_for_drh() {
+            $attendance = new Attendance();
+            $students = $this->students;
+            //$content = '<div style="margin:5px;">';
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
         $students_table = null;
- 		if (count($students) > 0) {
-	 		$students_table .= '<table class="data_table">';
-	 		$students_table .= '<tr>
+            if (count($students) > 0) {
+                $students_table .= '<table class="data_table">';
+                $students_table .= '<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('AttendancesFaults').'</th>
 									<th>'.get_lang('Evaluations').'</th>
 								</tr>';
-	 		$i = 1;
-	 		foreach ($students as $student) {
-
-	 			$student_id = $student['user_id'];
-	 			$firstname  = $student['firstname'];
-	 			$lastname   = $student['lastname'];
-	 			$username	= $student['username'];
-
-
-				// 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 = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
-	 			} else {
-	 				$attendances_faults_avg = '0%';
-	 			}
-
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
-				$evaluations_avg  = 0;
-				$score = $weight = 0;
-	 			foreach ($courses_by_user as $course) {
-	 				$course_code = $course['code'];
-	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
-	 				$scoretotal = array();
-	 				if (isset($cats) && isset($cats[0])) {
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
-	 				}
-
-	 				if (!empty($scoretotal)) {
-	 					$score  += $scoretotal[0];
-	 					$weight += $scoretotal[1];
-	 				}
-	 			}
-
-	 			if (!empty($weight)) {
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
-	 			}
-
-	 			if ($i%2 == 0) {
+                $i = 1;
+                foreach ($students as $student) {
+
+                    $student_id = $student['user_id'];
+                    $firstname  = $student['firstname'];
+                    $lastname   = $student['lastname'];
+                    $username	= $student['username'];
+
+
+                // 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 = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
+                    } else {
+                        $attendances_faults_avg = '0%';
+                    }
+
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
+                $evaluations_avg  = 0;
+                $score = $weight = 0;
+                    foreach ($courses_by_user as $course) {
+                        $course_code = $course['code'];
+                        $cats = Category::load(null, null, $course_code, null, null, null, false);
+                        $scoretotal = array();
+                        if (isset($cats) && isset($cats[0])) {
+                            $scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
+                        }
+
+                        if (!empty($scoretotal)) {
+                            $score  += $scoretotal[0];
+                            $weight += $scoretotal[1];
+                        }
+                    }
+
+                    if (!empty($weight)) {
+                        $evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
+                    }
+
+                    if ($i%2 == 0) {
                     $class_tr = 'row_odd';
                 } else {
                     $class_tr = 'row_even';
                 }
-	    		$students_table .= '<tr class="'.$class_tr.'">
+                $students_table .= '<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
 										<td>'.$attendances_faults_avg.'</td>
 										<td>'.$evaluations_avg.'</td>
 									</tr>';
 
-	 			$i++;
-	 		}
-	 		$students_table .= '</table>';
- 		} else {
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
- 		}
+                    $i++;
+                }
+                $students_table .= '</table>';
+            } else {
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            }
 
-  		$content .= $students_table;
+            $content .= $students_table;
 
- 		if (count($students) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;">
+            if (count($students) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;">
                             <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('SeeMore').'</a>
                          </div>';
-		}
-		//$content .= '</div>';
+        }
+        //$content .= '</div>';
 
-  		return $content;
-  	}
+            return $content;
+        }
 
     /**
-	 * Get number of students
-	 * @return int
-	 */
-	function get_number_of_students()
+     * Get number of students
+     * @return int
+     */
+    function get_number_of_students()
     {
-		return count($this->students);
-	}
+        return count($this->students);
+    }
 }

plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php

Indentation +102 added lines, -102 removed lines

@@ -23,42 +23,42 @@ 
 class BlockEvaluationGraph extends Block
 {
     private $user_id;
-	private $courses;
-	private $sessions;
-	private $path;
-	private $permission = array(DRH, SESSIONADMIN);
-
-	/**
-	 * Constructor
-	 */
+    private $courses;
+    private $sessions;
+    private $path;
+    private $permission = array(DRH, SESSIONADMIN);
+
+    /**
+     * Constructor
+     */
     public function __construct($user_id)
     {
-    	$this->path = 'block_evaluation_graph';
-    	$this->user_id 	= $user_id;
-    	$this->bg_width = 450;
-    	$this->bg_height = 350;
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->path = 'block_evaluation_graph';
+        $this->user_id 	= $user_id;
+        $this->bg_width = 450;
+        $this->bg_height = 350;
+        if ($this->is_block_visible_for_user($user_id)) {
             if (!api_is_session_admin()) {
                 $this->courses  = CourseManager::get_courses_followed_by_drh($user_id);
             }
             $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
-    	}
+        }
     }
 
-	/**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+    /**
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -68,14 +68,14 @@ 
      */
     public function get_block()
     {
-		global $charset;
-    	$column = 1;
-    	$data   = array();
+        global $charset;
+        $column = 1;
+        $data   = array();
 
-		$evaluations_base_courses_graph         = $this->get_evaluations_base_courses_graph();
-		$evaluations_courses_in_sessions_graph  = $this->get_evaluations_courses_in_sessions_graph();
+        $evaluations_base_courses_graph         = $this->get_evaluations_base_courses_graph();
+        $evaluations_courses_in_sessions_graph  = $this->get_evaluations_courses_in_sessions_graph();
 
-		$html = '<div class="panel panel-default" id="intro">
+        $html = '<div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('EvaluationsGraph').'
                         <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -105,43 +105,43 @@ 
                 }
             }
         }
-		$html .= '</div>
+        $html .= '</div>
 			     </div>';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
 
-    	return $data;
-	}
+        return $data;
+    }
 
     /**
- 	 * This method return a graph containing informations about evaluations
+     * This method return a graph containing informations about evaluations
      * inside base courses, it's used inside get_block method for showing
      * it inside dashboard interface
- 	 * @return string  img html
- 	 */
+     * @return string  img html
+     */
     public function get_evaluations_base_courses_graph()
     {
-		$graphs = array();
-		if (!empty($this->courses)) {
-			$courses_code = array_keys($this->courses);
-			foreach ($courses_code as $course_code) {
-				$cats = Category::load(null, null, $course_code, null, null, null, false);
-
-				if (isset($cats) && isset($cats[0])) {
-					$alleval = $cats[0]->get_evaluations(null, true, $course_code);
-					$alllinks = $cats[0]->get_links(null, true);
-					$users = GradebookUtils::get_all_users($alleval, $alllinks);
-					$datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
-					$evaluation_sumary = $datagen->get_evaluation_sumary_results();
-					if (!empty($evaluation_sumary)) {
-						$items = array_keys($evaluation_sumary);
-						$max = $min = $avg = array();
-						foreach ($evaluation_sumary as $evaluation) {
-							$max[] = $evaluation['max'];
+        $graphs = array();
+        if (!empty($this->courses)) {
+            $courses_code = array_keys($this->courses);
+            foreach ($courses_code as $course_code) {
+                $cats = Category::load(null, null, $course_code, null, null, null, false);
+
+                if (isset($cats) && isset($cats[0])) {
+                    $alleval = $cats[0]->get_evaluations(null, true, $course_code);
+                    $alllinks = $cats[0]->get_links(null, true);
+                    $users = GradebookUtils::get_all_users($alleval, $alllinks);
+                    $datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
+                    $evaluation_sumary = $datagen->get_evaluation_sumary_results();
+                    if (!empty($evaluation_sumary)) {
+                        $items = array_keys($evaluation_sumary);
+                        $max = $min = $avg = array();
+                        foreach ($evaluation_sumary as $evaluation) {
+                            $max[] = $evaluation['max'];
                             $min[] = !empty($evaluation['min']) ? $evaluation['min'] : 0;
-							$avg[] = $evaluation['avg'];
-						}
+                            $avg[] = $evaluation['avg'];
+                        }
                         // Dataset definition
                         $dataSet = new pData();
                         $dataSet->addPoints($min, 'Serie3');
@@ -283,43 +283,43 @@ 
                         if (!empty($imgPath)) {
                             $courses_graph[$course_code] = '<img src="' . $imgPath . '">';
                         }
-					}
-				}
-			} // end for
-		}
-    	return $graphs;
- 	}
-
-	/**
- 	 * This method return a graph containing information about evaluations
+                    }
+                }
+            } // end for
+        }
+        return $graphs;
+        }
+
+    /**
+     * This method return a graph containing information about evaluations
      * inside courses in sessions, it's used inside get_block method for
      * showing it inside dashboard interface
- 	 * @return string  img html
- 	 */
+     * @return string  img html
+     */
     public function get_evaluations_courses_in_sessions_graph()
     {
-		$graphs = array();
-		if (!empty($this->sessions)) {
-			$session_ids = array_keys($this->sessions);
-			foreach ($session_ids as $session_id) {
-				$courses_code = array_keys(Tracking::get_courses_list_from_session($session_id));
-				$courses_graph = array();
-				foreach ($courses_code as $course_code) {
-					$cats = Category::load(null, null, $course_code, null, null, $session_id);
-					if (isset($cats) && isset($cats[0])) {
-						$alleval = $cats[0]->get_evaluations(null, true, $course_code);
-						$alllinks = $cats[0]->get_links(null, true);
-						$users = GradebookUtils::get_all_users($alleval, $alllinks);
-						$datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
-						$evaluation_sumary = $datagen->get_evaluation_sumary_results();
-						if (!empty($evaluation_sumary)) {
-							$items = array_keys($evaluation_sumary);
-							$max = $min = $avg = array();
-							foreach ($evaluation_sumary as $evaluation) {
-								$max[] = $evaluation['max'];
-								$min[] = $evaluation['min'];
-								$avg[] = $evaluation['avg'];
-							}
+        $graphs = array();
+        if (!empty($this->sessions)) {
+            $session_ids = array_keys($this->sessions);
+            foreach ($session_ids as $session_id) {
+                $courses_code = array_keys(Tracking::get_courses_list_from_session($session_id));
+                $courses_graph = array();
+                foreach ($courses_code as $course_code) {
+                    $cats = Category::load(null, null, $course_code, null, null, $session_id);
+                    if (isset($cats) && isset($cats[0])) {
+                        $alleval = $cats[0]->get_evaluations(null, true, $course_code);
+                        $alllinks = $cats[0]->get_links(null, true);
+                        $users = GradebookUtils::get_all_users($alleval, $alllinks);
+                        $datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks);
+                        $evaluation_sumary = $datagen->get_evaluation_sumary_results();
+                        if (!empty($evaluation_sumary)) {
+                            $items = array_keys($evaluation_sumary);
+                            $max = $min = $avg = array();
+                            foreach ($evaluation_sumary as $evaluation) {
+                                $max[] = $evaluation['max'];
+                                $min[] = $evaluation['min'];
+                                $avg[] = $evaluation['avg'];
+                            }
                             // Dataset definition
                             $dataSet = new pData();
                             $dataSet->addPoints($min, 'Serie3');
@@ -455,14 +455,14 @@ 
                             if (!empty($imgPath)) {
                                 $courses_graph[$course_code] = '<img src="' . $imgPath . '">';
                             }
-						}
-					}
-				}
-				if (!empty($courses_graph)) {
-					$graphs[$session_id] = $courses_graph;
-				}
-			}
-		}
-    	return $graphs;
- 	}
+                        }
+                    }
+                }
+                if (!empty($courses_graph)) {
+                    $graphs[$session_id] = $courses_graph;
+                }
+            }
+        }
+        return $graphs;
+        }
 }

plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

Indentation +79 added lines, -79 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * This file is part of teacher graph block plugin for dashboard,
- * it should be required inside dashboard controller for showing it into dashboard interface from plattform
- * @package chamilo.dashboard
- * @author Christian Fasanando
- */
+     * This file is part of teacher graph block plugin for dashboard,
+     * it should be required inside dashboard controller for showing it into dashboard interface from plattform
+     * @package chamilo.dashboard
+     * @author Christian Fasanando
+     */
 
 /**
  * required files for getting data
@@ -26,32 +26,32 @@ 
     private $path;
     private $permission = array(DRH);
 
-	/**
-	 * Controller
-	 */
+    /**
+     * Controller
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_teacher_graph';
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_teacher_graph';
+        if ($this->is_block_visible_for_user($user_id)) {
             $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
-    	}
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -61,11 +61,11 @@ 
      */
     public function get_block()
     {
-    	global $charset;
-    	$column = 1;
-    	$data   = array();
-		$teacher_information_graph = $this->get_teachers_information_graph();
-		$html = '
+        global $charset;
+        $column = 1;
+        $data   = array();
+        $teacher_information_graph = $this->get_teachers_information_graph();
+        $html = '
                 <div class="panel panel-default" id="intro">
                     <div class="panel-heading">'.get_lang('TeachersInformationsGraph').'
                         <div class="pull-right"><a class="btn btn-danger btn-xs"  onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -79,53 +79,53 @@ 
                 </div>
 				';
 
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
 
-    	return $data;
+        return $data;
 
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_teachers_information_graph()
     {
-	 	$teachers = $this->teachers;
-		$graph = '';
-
- 		$user_ids = array_keys($teachers);
- 		$a_last_week = get_last_week();
-
-		if (is_array($user_ids) && count($user_ids) > 0) {
-			$dataSet = new pData;
-			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) {
-					// day is received as y-m-d 12:00:00
-					$start_date = api_get_utc_datetime($day);
-					$end_date = api_get_utc_datetime($day+(3600*24-1));
-
-					$time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, 'custom', $start_date, $end_date);
-					$hours = floor($time_on_platform_by_day / 3600);
-					$min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60);
-					$time_by_days[] = $min;
-				}
-				$dataSet->addPoints($time_by_days, $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);
-			}
-
-			$dataSet->addPoints($days_on_week, 'Days');
-			$dataSet->setAbscissaName($last_week);
-			$dataSet->setAxisName(0, get_lang('Minutes'));
+            $teachers = $this->teachers;
+        $graph = '';
+
+            $user_ids = array_keys($teachers);
+            $a_last_week = get_last_week();
+
+        if (is_array($user_ids) && count($user_ids) > 0) {
+            $dataSet = new pData;
+            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) {
+                    // day is received as y-m-d 12:00:00
+                    $start_date = api_get_utc_datetime($day);
+                    $end_date = api_get_utc_datetime($day+(3600*24-1));
+
+                    $time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, 'custom', $start_date, $end_date);
+                    $hours = floor($time_on_platform_by_day / 3600);
+                    $min = floor(($time_on_platform_by_day - ($hours * 3600)) / 60);
+                    $time_by_days[] = $min;
+                }
+                $dataSet->addPoints($time_by_days, $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);
+            }
+
+            $dataSet->addPoints($days_on_week, 'Days');
+            $dataSet->setAbscissaName($last_week);
+            $dataSet->setAxisName(0, get_lang('Minutes'));
             $dataSet->setAbscissa('Days');
             $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
 
@@ -194,20 +194,20 @@ 
                 $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
             }
             $graph = '<img src="' . $imgPath . '" >';
-		} else {
-			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
-		}
+        } else {
+            $graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
+        }
 
- 		return $graph;
-	}
+            return $graph;
+    }
 
     /**
-	 * Get number of teachers
-	 * @return int
-	 */
-	function get_number_of_teachers()
+     * Get number of teachers
+     * @return int
+     */
+    function get_number_of_teachers()
     {
-		return count($this->teachers);
-	}
+        return count($this->teachers);
+    }
 
 }

plugin/jcapture/action.php

Indentation +11 added lines, -11 removed lines

@@ -11,18 +11,18 @@
  
 class action_plugin_jcapture extends DokuWiki_Action_Plugin {
  
-  /**
-   * return some info
-   */
-  function getInfo(){
+    /**
+     * return some info
+     */
+    function getInfo(){
     return array(
-                 'author' => 'Pavel Vlasov',
-                 'email'  => 'Pavel.Vlasov@nasdanika.com',
-                 'name'   => 'JCapture',
-                 'desc'   => 'Plugin for making screen captures.',
-                 'url'    => 'http://www.nasdanika.com/wiki/doku.php?id=products:jcapture:start',
-                 );
-  }
+                    'author' => 'Pavel Vlasov',
+                    'email'  => 'Pavel.Vlasov@nasdanika.com',
+                    'name'   => 'JCapture',
+                    'desc'   => 'Plugin for making screen captures.',
+                    'url'    => 'http://www.nasdanika.com/wiki/doku.php?id=products:jcapture:start',
+                    );
+    }
 
     /**
      * Register the eventhandlers

plugin/jcapture/applet.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php 
 
-	//fix for Opera XMLHttpRequests
-	if(!count($_POST) && $HTTP_RAW_POST_DATA){
-	  parse_str($HTTP_RAW_POST_DATA, $_POST);
-	}
+    //fix for Opera XMLHttpRequests
+    if(!count($_POST) && $HTTP_RAW_POST_DATA){
+        parse_str($HTTP_RAW_POST_DATA, $_POST);
+    }
 	
-	if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
-	require_once(DOKU_INC.'inc/init.php');
-	require_once(DOKU_INC.'inc/common.php');
-	require_once(DOKU_INC.'inc/pageutils.php');
-	require_once(DOKU_INC.'inc/auth.php');
-	//close sesseion
-	session_write_close();
+    if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
+    require_once(DOKU_INC.'inc/init.php');
+    require_once(DOKU_INC.'inc/common.php');
+    require_once(DOKU_INC.'inc/pageutils.php');
+    require_once(DOKU_INC.'inc/auth.php');
+    //close sesseion
+    session_write_close();
 	
-	header('Content-Type: text/html; charset=utf-8');
+    header('Content-Type: text/html; charset=utf-8');
 	
-	$hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
+    $hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
 	
-	$imageFormat = "PNG";
+    $imageFormat = "PNG";
 
-	$cookies;
-	foreach (array_keys($_COOKIE) as $cookieName) {
-		$cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
-	} 
+    $cookies;
+    foreach (array_keys($_COOKIE) as $cookieName) {
+        $cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
+    } 
 	
-	$pageName = $_GET["pageName"];
-	$edid = $_GET["edid"];
+    $pageName = $_GET["pageName"];
+    $edid = $_GET["edid"];
 ?>
 
 <script language="JavaScript" type="text/javascript"><!--