Adding api_is_western_name_order in Gradebook

skala
Julio Montoya 15 years ago
parent 3573dc8e93
commit 2a2783b1ce
  1. 59
      main/gradebook/lib/fe/evalform.class.php

@ -128,15 +128,27 @@ class EvalForm extends FormValidator
</form>' </form>'
); );
if (api_is_western_name_order()){
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>'.get_lang('OfficialCode').'</th> <th>'.get_lang('OfficialCode').'</th>
<th>'.get_lang('Username').'</th> <th>'.get_lang('UserName').'</th>
<th>'.get_lang('Firstname').'</th> <th>'.get_lang('FirstName').'</th>
<th>'.get_lang('LastName').'</th> <th>'.get_lang('LastName').'</th>
<th>'.get_lang('Qualify').'</th> <th>'.get_lang('Qualify').'</th>
</tr>' </tr>'
); );
} else {
$renderer->setHeaderTemplate(
'<tr>
<th>'.get_lang('OfficialCode').'</th>
<th>'.get_lang('UserName').'</th>
<th>'.get_lang('LastName').'</th>
<th>'.get_lang('FirstName').'</th>
<th>'.get_lang('Qualify').'</th>
</tr>'
);
}
$template_submit = '<tr> $template_submit = '<tr>
<td colspan="4" ></td> <td colspan="4" ></td>
<td > <td >
@ -150,10 +162,8 @@ class EvalForm extends FormValidator
$user= get_user_info_from_id($result->get_user_id()); $user= get_user_info_from_id($result->get_user_id());
$results_and_users[] = array ('result' => $result, 'user' => $user); $results_and_users[] = array ('result' => $result, 'user' => $user);
} }
usort($results_and_users, array ('EvalForm', 'sort_by_user')); usort($results_and_users, array ('EvalForm', 'sort_by_user'));
$defaults= array (); $defaults= array ();
foreach ($results_and_users as $result_and_user) { foreach ($results_and_users as $result_and_user) {
@ -174,12 +184,18 @@ class EvalForm extends FormValidator
'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>='); 'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
$defaults['score[' . $result->get_id() . ']']= $result->get_score(); $defaults['score[' . $result->get_id() . ']']= $result->get_score();
if (api_is_western_name_order() ) {
$user_info = '<td align="left" >'.$user['firstname'].'</td>';
$user_info .= '<td align="left" >'.$user['lastname'].'</td>';
} else {
$user_info = '<td align="left" >'.$user['lastname'].'</td>';
$user_info .= '<td align="left" >'.$user['firstname'].'</td>';
}
$template = '<tr> $template = '<tr>
<td align="left" >'.$user['official_code'].'</td> <td align="left" >'.$user['official_code'].'</td>
<td align="left" >'.$user['username'].'</td> <td align="left" >'.$user['username'].'</td>
<td align="left" >'.$user['firstname'].'</td> '.$user_info.'
<td align="left" >'.$user['lastname'].'</td>
<td align="left">{element} / '.$this->evaluation_object->get_max().' <td align="left">{element} / '.$this->evaluation_object->get_max().'
<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
</td> </td>
@ -229,15 +245,28 @@ class EvalForm extends FormValidator
</form>' </form>'
); );
if (api_is_western_name_order()){
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>'.get_lang('OfficialCode').'</th> <th>'.get_lang('OfficialCode').'</th>
<th>'.get_lang('Username').'</th> <th>'.get_lang('UserName').'</th>
<th>'.get_lang('Firstname').'</th> <th>'.get_lang('FirstName').'</th>
<th>'.get_lang('LastName').'</th> <th>'.get_lang('LastName').'</th>
<th>'.get_lang('Qualify').'</th> <th>'.get_lang('Qualify').'</th>
</tr>' </tr>'
); );
} else {
$renderer->setHeaderTemplate(
'<tr>
<th>'.get_lang('OfficialCode').'</th>
<th>'.get_lang('UserName').'</th>
<th>'.get_lang('LastName').'</th>
<th>'.get_lang('FirstName').'</th>
<th>'.get_lang('Qualify').'</th>
</tr>'
);
}
$template_submit = '<tr> $template_submit = '<tr>
<td colspan="4" ></td> <td colspan="4" ></td>
<td > <td >
@ -263,17 +292,27 @@ class EvalForm extends FormValidator
'minvalue' 'minvalue'
), get_lang('UnderMin'), 'compare', '>='); ), get_lang('UnderMin'), 'compare', '>=');
if (api_is_western_name_order() ) {
$user_info = '<td align="left" >'.$user[3].'</td>';
$user_info .= '<td align="left" >'.$user[2].'</td>';
} else {
$user_info = '<td align="left" >'.$user[2].'</td>';
$user_info .= '<td align="left" >'.$user[3].'</td>';
}
$template = '<tr> $template = '<tr>
<td align="left" >'.$user[4].'</td> <td align="left" >'.$user[4].'</td>
<td align="left" >'.$user[1].'</td> <td align="left" >'.$user[1].'</td>
<td align="left" >'.$user[3].'</td> '.$user_info.'
<td align="left" >'.$user[2].'</td>
<td align="left">{element} / '.$this->evaluation_object->get_max().' <td align="left">{element} / '.$this->evaluation_object->get_max().'
<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
</td> </td>
</tr>'; </tr>';
$renderer->setElementTemplate($template, 'score[' . $user[0] . ']'); $renderer->setElementTemplate($template, 'score[' . $user[0] . ']');
$nr_users++; $nr_users++;
} }

Loading…
Cancel
Save