From 3573dc8e93e0559e6f2f839dd76fea80c84dacbf Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Oct 2010 11:48:44 +0200 Subject: [PATCH] Fixing api_is_western_name_order wrong uses in BT#1636 --- main/admin/configure_inscription.php | 4 ++-- main/gradebook/gradebook_view_result.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php index 4637c24989..91c9f30c41 100755 --- a/main/admin/configure_inscription.php +++ b/main/admin/configure_inscription.php @@ -187,8 +187,8 @@ if ($display_all_form) { if (api_is_western_name_order()) { // FIRST NAME and LAST NAME - $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); - $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); + $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); + $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); } else { // LAST NAME and FIRST NAME $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php index f6fa8e5c1b..717f91fd3b 100755 --- a/main/gradebook/gradebook_view_result.php +++ b/main/gradebook/gradebook_view_result.php @@ -219,8 +219,8 @@ if ($export_result_form->validate()) { // set headers data table $head_ape_name = ''; - if (!api_is_western_name_order()) { - $head_ape_name = get_lang('FirstName').' '.get_lang('LastName'); + if (api_is_western_name_order()) { + $head_ape_name = get_lang('FirstName').' '.get_lang('LastName'); } else { $head_ape_name = get_lang('LastName').' '.get_lang('FirstName'); } @@ -233,12 +233,12 @@ if ($export_result_form->validate()) { $head_letter = get_lang('Letters'); } $head_table = array( - array(get_lang('Item'),5), - array(get_lang('Code'),15), + array('#',3), + array(get_lang('Code'),12), array($head_ape_name, 50), - array(get_lang('Score'),15), + array(get_lang('Score'),12), array($head_letter,15), - array($head_display_score,15) + array($head_display_score,30) ); // get data table @@ -252,8 +252,8 @@ if ($export_result_form->validate()) { $result = array(); $user_info = api_get_user_info($data['id']); $result[] = $user_info['username']; - if (!api_is_western_name_order()) { - $result[] = $user_info['firstname'].', '.$user_info['lastname']; + if (api_is_western_name_order()) { + $result[] = $user_info['firstname'].', '.$user_info['lastname']; } else { $result[] = $user_info['lastname'].', '.$user_info['firstname']; }