Adding survey list in student reporting page (only for courses) see BT#3139

main/mySpace/index.php

@@ -25,6 +25,9 @@ $nameTools   		= get_lang('MySpace');
 
 $user_id 	 		= api_get_user_id();
 $is_coach 			= api_is_coach($_GET['session_id']); // This is used?
+
+$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
+
 $is_platform_admin 	= api_is_platform_admin();
 $is_drh 			= api_is_drh();
 $is_session_admin 	= api_is_session_admin();
@@ -123,12 +126,7 @@ if ($is_platform_admin) {
 		$menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32), api_get_self().'?view=teacher');
 		$menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), api_get_self().'?view=admin');		
         $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php');        
-        
         //$menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('CurrentCoursesReport'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php');        
-        
-        
-        
-        
 	} else {		
 		$menu_items[] = Display::return_icon('teacher_na.png', get_lang('TeacherInterface'), array(), 32);		
 		$menu_items[] = Display::url(Display::return_icon('star.png', get_lang('AdminInterface'), array(), 32), api_get_self().'?view=admin');
@@ -335,9 +333,10 @@ if (empty($session_id)) {
 	}
 } else {
 	$courses = Tracking::get_courses_followed_by_coach($user_id, $session_id);	
-}
-
 	   
+    //Courses for the user
+    $count_courses = count($courses);
+}
 
 if ($count_courses || $count_sessions) {
 	//If we are in course

main/mySpace/myStudents.php

@@ -6,7 +6,7 @@
  */
 
 // name of the language file that needs to be included
-$language_file = array('registration', 'index', 'tracking', 'exercice', 'admin', 'gradebook');
+$language_file = array('registration', 'index', 'tracking', 'exercice', 'admin', 'gradebook', 'survey');
 
 $cidReset = true;
 
@@ -21,6 +21,8 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/linkfactory.class.php
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
 require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 
+require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
+
 $htmlHeadXtra[] = '<script type="text/javascript">
 
 function show_image(image,width,height) {
@@ -600,6 +602,7 @@ if (empty($_GET['details'])) {
 
 		if (!empty($courses)) {		    
             foreach ($courses as $course_code) {
+                 
                 if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) {
                     $course_info = CourseManager :: get_course_information($course_code);
     												
@@ -853,7 +856,7 @@ if (empty($_GET['details'])) {
 			get_lang('Attempts')
 		);
 
-		$t_quiz = Database :: get_course_table(TABLE_QUIZ_TEST, $info_course['db_name']);
+		$t_quiz = Database :: get_course_table(TABLE_QUIZ_TEST);
 		$sql_exercices = "SELECT quiz.title, id FROM " . $t_quiz . " AS quiz
 						  WHERE quiz.c_id =  ".$info_course['real_id']." AND
 						  		active='1' AND 
@@ -918,6 +921,51 @@ if (empty($_GET['details'])) {
 		}
 		echo '</table>';
         
+        
+        //@when using sessions we do not show the survey list
+        if (empty($session_id)) {
+            $survey_list = survey_manager::get_surveys($course_code, $session_id);        
+    
+            $survey_data = array();
+            foreach($survey_list as $survey) {
+                $user_list = survey_manager::get_people_who_filled_survey($survey['survey_id'], false, $info_course['real_id']);
+                $survey_done = Display::return_icon("accept_na.png", get_lang('NoAnswer'), array(), 22);            
+                if (in_array($student_id, $user_list)) {
+                     $survey_done = Display::return_icon("accept.png", get_lang('Answered'), array(), 22);    
+                }
+                $data = array('title' => $survey['title'], 'done' => $survey_done);
+                $survey_data[] = $data;       
+            }        
+            
+            if (!empty($survey_list)) {
+                
+                $table = new HTML_Table(array('class' => 'data_table'));
+                $header_names = array(get_lang('Survey'), get_lang('Answered'));
+                $row = 0;
+                $column = 0;
+                foreach ($header_names as $item) {
+                    $table->setHeaderContents($row, $column, $item);
+                    $column++;
+                }
+                $row = 1;
+                if (!empty($survey_data)) {
+                    foreach ($survey_data as $data) {
+                        $column = 0;
+                        $table->setCellContents($row, $column, $data);
+                        //$table->setRowAttributes($row, 'style="text-align:center"');
+                        $class = 'class="row_odd"';
+                        if($row % 2) {
+                            $class = 'class="row_even"';
+                        }
+                        $table->setRowAttributes($row, $class, true);
+                        $column++;
+                        $row++;
+                    }
+                }
+                echo $table->toHtml();  
+            }
+         }
+    				
 	    // line about other tools
 		echo '<table class="data_table">';
 		

main/mySpace/myspace.lib.php

@@ -1301,7 +1301,9 @@ class MySpace {
 			$table_row[] = $avg_assignments_in_course;
 
 			//set the "from" value to know if I access the Reporting by the chamilo tab or the course link
-			$table_row[] = '<center><a href="../tracking/courseLog.php?cidReq='.$course_code.'&studentlist=true&from=myspace&id_session='.$session_id.'"><img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a></center>';
+			$table_row[] = '<center><a href="../tracking/courseLog.php?cidReq='.$course_code.'&studentlist=true&from=myspace&id_session='.$session_id.'">
+			                 <img src="'.api_get_path(WEB_IMG_PATH).'2rightarrow.gif" border="0" /></a>
+			                </center>';
 			$csv_content[] = array(
 				api_html_entity_decode($row_course[1], ENT_QUOTES, $charset),
 				$nb_students_in_course,

main/survey/survey.lib.php

@@ -27,6 +27,17 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
  */
 class survey_manager {
     
+    function get_surveys($course_code, $session_id = 0) {
+        $table_survey = Database :: get_course_table(TABLE_SURVEY);
+        $course_info = api_get_course_info($course_code);
+        $session_condition = api_get_session_condition($session_id, true, true);
+        
+        $sql = "SELECT * FROM $table_survey WHERE c_id = {$course_info['real_id']} $session_condition ";
+        $result = Database::query($sql);
+        $result = Database::store_result($result, 'ASSOC');
+        return $result;
+    }
+
 	/***
 	 * SYRVEY FUNCTIONS
 	 */
@@ -1170,7 +1181,7 @@ class survey_manager {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version February 2007
 	 */
-	function get_people_who_filled_survey($survey_id, $all_user_info = false) {
+	function get_people_who_filled_survey($survey_id, $all_user_info = false, $course_id = null) {
 		global $_course;
 
 		// Database table definition
@@ -1182,8 +1193,11 @@ class survey_manager {
 
 		// Getting the survey information
 		$survey_data	= survey_manager::get_survey($survey_id);
-		
+		if (empty($course_id)) {
 		      $course_id 		= api_get_course_int_id();
+        } else {
+            $course_id = intval($course_id);
+        }
            
 		if ($all_user_info) {
 			$order_clause = api_sort_by_first_name() ? ' ORDER BY user.firstname, user.lastname' : ' ORDER BY user.lastname, user.firstname';
@@ -1194,7 +1208,8 @@ class survey_manager {
 								survey_id= '".Database::escape_string($survey_data['survey_id'])."' ".
                         $order_clause;
 		} else {
-			$sql = "SELECT DISTINCT user FROM $table_survey_answer WHERE survey_id= '".Database::escape_string($survey_data['survey_id'])."'";
+			$sql = "SELECT DISTINCT user FROM $table_survey_answer 
+			        WHERE c_id = $course_id AND survey_id= '".Database::escape_string($survey_data['survey_id'])."'  ";
 		}
 		
 		$res = Database::query($sql);
@@ -2571,7 +2586,6 @@ class SurveyUtil {
 			}
 		}
 
-
 		echo $question['survey_question'];