Pārlūkot izejas kodu

Exercises results: Now students can see the results even if the exercise was not validated by the teacher

Julio Montoya 13 gadi atpakaļ
vecāks
revīzija
05a57212aa
2 mainītis faili ar 17 papildinājumiem un 8 dzēšanām
  1. 8 2
      main/exercice/exercise.lib.php
  2. 9 6
      main/exercice/overview.php

+ 8 - 2
main/exercice/exercise.lib.php

@@ -1108,10 +1108,16 @@ function get_exam_results_data($from, $number_of_items, $column, $direction) {
                             $html_link.=' ';
                         }
                     } else {
+                    	
+                    	$attempt_url 	= api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$results[$i]['exid'].'&id_session='.api_get_session_id().'&height=500&width=750';
+                    	$attempt_link 	= Display::url(get_lang('Show'), $attempt_url, array('class'=>'thickbox'))."   ";
+                    	
+                    	$html_link.= $attempt_link;
+                    	
                         if ($revised) {
-                            $html_link.="<a href='exercise_show.php?".api_get_cidreq()."&id=$id'>" . get_lang('Show') . "</a> ";
+                        	$html_link.= Display::span(get_lang('Validated'), array('class'=>'label_tag notice'));                            
                         } else {
-                            $html_link.='&nbsp;' . get_lang('NoResult');
+                        	$html_link.= Display::span(get_lang('NotValidated'), array('class'=>'label_tag notice'));                            
                         }
                     }
                     $more_details_list = $html_link;

+ 9 - 6
main/exercice/overview.php

@@ -109,18 +109,21 @@ if (!empty($attempts)) {
 	foreach($attempts as $attempt_result) {	
 		$counter++;
 		$score = show_score($attempt_result['exe_result'], $attempt_result['exe_weighting']);
-		$attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$attempt_result['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750';
-		$attempt_link = Display::url(Display::return_icon('quiz.png', get_lang('Result'), array(), 22), $attempt_url, array('class'=>'thickbox'));
+		$attempt_url 	= api_get_path(WEB_CODE_PATH).'exercice/result.php?'.api_get_cidreq().'&id='.$attempt_result['exe_id'].'&id_session='.api_get_session_id().'&height=500&width=750';
+		$attempt_link 	= Display::url(get_lang('Show'), $attempt_url, array('class'=>'thickbox'));
 		
-		if (!$is_allowed_to_edit && $attempt_result['attempt_revised'] == 0) {
-			$attempt_link = get_lang('NoResult');
-			$attempt_link = Display::return_icon('quiz_na.png', get_lang('NoResult'), array(), 22);
+		$teacher_revised = Display::span(get_lang('Validated'), array('class'=>'label_tag notice'));
+			//$attempt_link = get_lang('NoResult');
+			//$attempt_link = Display::return_icon('quiz_na.png', get_lang('NoResult'), array(), 22);
+		if ($attempt_result['attempt_revised'] == 0) {
+			$teacher_revised = Display::span(get_lang('NotValidated'), array('class'=>'label_tag notice'));
 		}
 				
 		$row = array('count'	 	=> $counter,
 					 'date'	 		=> api_convert_and_format_date($attempt_result['start_date'], DATE_TIME_FORMAT_LONG)
 				);
-		
+		$attempt_link .= "&nbsp;&nbsp;&nbsp;".$teacher_revised;
+		 
 		if ($objExercise->results_disabled == EXERCISE_FEEDBACK_TYPE_END || $objExercise->results_disabled == EXERCISE_FEEDBACK_TYPE_EXAM) {
 			$row['result'] = $score;
 		}