Minor - Fixing work/user lists + changing exercise category lang variable

main/exercice/tests_category.php

@@ -222,7 +222,8 @@ function display_categories() {
 		$tmpobj = new Testcategory($row['id']);
 		$nb_question = $tmpobj->getCategoryQuestionsNumber();
 		echo '<div class="sectiontitle" id="id_cat'.$row['id'].'">';
-		echo "<span style='float:right'>".$nb_question.' '.get_lang('NbCategory')."</span>";
+        $nb_question_label = $nb_question == 1 ? $nb_question.' '.get_lang('Question') : $nb_question.' '.get_lang('Questions'); 
+		echo "<span style='float:right'>".$nb_question_label."</span>";
 		echo $row['title'];
 		echo '</div>';
 		echo '<div class="sectioncomment">';

main/user/user.php

@@ -536,7 +536,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 
 			$groups_name = GroupManager :: get_user_group_name($user_id);
 			$temp = array();
-			if (api_is_allowed_to_edit(null, true)) {				
+			if (api_is_allowed_to_edit(null, true)) {
 				if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
                 	$temp[] = $user_id;
                 }
@@ -558,7 +558,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 					$temp[] = $o_course_user['firstname'];
 				}
 
-                $temp[] = $o_course_user['username'];   // 
+                $temp[] = $o_course_user['username'];
 				$temp[] = isset($o_course_user['role']) ? $o_course_user['role'] : null;
 				$temp[] = implode(', ', $groups_name); //Group
 				
@@ -571,6 +571,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				} else {
 					$temp[] = '-';
 				}
+
 				$temp[] = $o_course_user['active'];
 				$temp[] = $user_id;
 			} else {
@@ -582,7 +583,9 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				} else {
 					$photo= '<center><img src="'.$image_repository.$existing_image.'" alt="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'"  width="22" height="22" title="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" /></center>';
 				}
+                
 				$temp[] = $photo;
+                $temp[] = $o_course_user['official_code'];
 
 				if ($is_western_name_order) {
 					$temp[] = $o_course_user['firstname'];
@@ -590,10 +593,11 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				} else {
 					$temp[] = $o_course_user['lastname'];
 					$temp[] = $o_course_user['firstname'];
-				}
+				}				
+				$temp[] = $o_course_user['username'];
 				$temp[] = $o_course_user['role'];
 				$temp[] = implode(', ', $groups_name);//Group
-				$temp[] = $o_course_user['official_code'];				
+				//$temp[] = $o_course_user['official_code'];				
 			}
 			$a_users[$user_id] = $temp;
 		}

main/work/work.lib.php

@@ -444,7 +444,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 		}
 	}
 	
-	$table_header[] = array(get_lang('Date'), true, 'style="width:180px"');
+	$table_header[] = array(get_lang('Date'), true, 'style="width:200px"');
 
 	if ($is_allowed_to_edit) {
 		$table_header[] = array(get_lang('Actions'), false, 'style="width:90px"');