From a8ed60247f46b0c6455ce32d36e65b8a5eec83be Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Mon, 6 Feb 2017 16:01:39 +0100 Subject: [PATCH] Minor - Format code --- main/gradebook/gradebook_view_result.php | 42 ++++++++---- main/gradebook/lib/be/abstractlink.class.php | 16 +++-- main/gradebook/lib/be/linkfactory.class.php | 1 - main/gradebook/lib/fe/displaygradebook.php | 67 +++++++++---------- main/gradebook/lib/fe/evalform.class.php | 33 ++++++--- main/gradebook/lib/fe/resulttable.class.php | 7 +- .../Rule/CompareDateTimeText.php | 8 ++- main/inc/lib/pear/HTML/QuickForm.php | 2 +- .../lib/pear/HTML/QuickForm/Rule/Compare.php | 2 +- 9 files changed, 107 insertions(+), 71 deletions(-) diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php index ea3d469d8f..25ea15ec04 100755 --- a/main/gradebook/gradebook_view_result.php +++ b/main/gradebook/gradebook_view_result.php @@ -73,7 +73,7 @@ if (isset($_GET['editres'])) { $result->set_id($edit_res_xml); $result->set_user_id($values['hid_user_id']); $result->set_evaluation_id($select_eval); - $row_value = isset($values['score']) ? (float) $values['score'] : 0; + $row_value = isset($values['score']) ? $values['score'] : 0; if (!empty($row_value) || $row_value == 0) { $result->set_score(api_number_format($row_value, api_get_setting('gradebook_number_decimals'))); } @@ -176,21 +176,43 @@ if (isset($_GET['import'])) { } } else { header('Location: ' . api_get_self() . '?import=&selecteval=' . $select_eval . '&importnofile='); - Display::addFlash(Display::return_message(get_lang('ImportNoFile'), 'warning', false)); + Display::addFlash( + Display::return_message( + get_lang('ImportNoFile'), + 'warning', + false + ) + ); exit; } if ($overwritescore != 0) { header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '&importoverwritescore=' . $overwritescore); - Display::addFlash(Display::return_message(get_lang('ImportOverWriteScore') . ' ' . $overwritescore)); + Display::addFlash( + Display::return_message( + get_lang('ImportOverWriteScore').' '.$overwritescore + ) + ); exit; } if ($nr_results_added == 0) { - Display::addFlash(Display::return_message(get_lang('ProblemUploadingFile'), 'warning', false)); + Display::addFlash( + Display::return_message( + get_lang('ProblemUploadingFile'), + 'warning', + false + ) + ); header('Location: ' . api_get_self() . '?selecteval=' . $select_eval. '¬hingadded='); exit; } - Display::addFlash(Display::return_message(get_lang('FileUploadComplete'), 'success', false)); + Display::addFlash( + Display::return_message( + get_lang('FileUploadComplete'), + 'success', + false + ) + ); header('Location: ' . api_get_self() . '?selecteval=' . $select_eval . '&importok='); exit; } @@ -356,7 +378,8 @@ if (isset($_GET['export'])) { if (isset($_GET['resultdelete'])) { $result = Result :: load($_GET['resultdelete']); $result[0]->delete(); - header('Location: gradebook_view_result.php?deleteresult=&selecteval=' . $select_eval); + Display::addFlash(Display::return_message(get_lang('ResultDeleted'))); + header('Location: gradebook_view_result.php?selecteval=' . $select_eval.'&'.api_get_cidreq()); exit; } @@ -458,13 +481,6 @@ if (isset($_GET['adduser'])) { Display :: display_confirmation_message(get_lang('UserAdded'), false); } -if (isset($_GET['deleteresult'])) { - Display :: display_confirmation_message(get_lang('ResultDeleted'), false); -} - -if (isset($_GET['editallresults'])) { - Display :: display_confirmation_message(get_lang('AllResultsEdited'), false); -} if (isset($_GET['incorrectdata'])) { Display :: display_warning_message(get_lang('IncorrectData'), false); } diff --git a/main/gradebook/lib/be/abstractlink.class.php b/main/gradebook/lib/be/abstractlink.class.php index d5ff12b5cb..d7f9e444c0 100755 --- a/main/gradebook/lib/be/abstractlink.class.php +++ b/main/gradebook/lib/be/abstractlink.class.php @@ -138,22 +138,22 @@ abstract class AbstractLink implements GradebookItem return $this->visible; } - public function set_id ($id) + public function set_id($id) { $this->id = $id; } - public function set_type ($type) + public function set_type($type) { $this->type = $type; } - public function set_ref_id ($ref_id) + public function set_ref_id($ref_id) { $this->ref_id = $ref_id; } - public function set_user_id ($user_id) + public function set_user_id($user_id) { $this->user_id = $user_id; } @@ -163,9 +163,11 @@ abstract class AbstractLink implements GradebookItem */ public function set_course_code($course_code) { - $this->course_code = $course_code; - $course_info = api_get_course_info($course_code); - $this->course_id = $course_info['real_id']; + $courseInfo = api_get_course_info($course_code); + if ($courseInfo) { + $this->course_code = $course_code; + $this->course_id = $courseInfo['real_id']; + } } public function getStudentList() diff --git a/main/gradebook/lib/be/linkfactory.class.php b/main/gradebook/lib/be/linkfactory.class.php index 7dffb4d622..2b4a540c43 100755 --- a/main/gradebook/lib/be/linkfactory.class.php +++ b/main/gradebook/lib/be/linkfactory.class.php @@ -112,6 +112,5 @@ class LinkFactory public function delete() { - } } diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index bd4036ec59..d5f834ec1c 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -62,12 +62,11 @@ class DisplayGradebook } $scoredisplay = ScoreDisplay :: instance(); - $student_score = ''; - $average = ""; - if (($evalobj->has_results())) { // TODO this check needed ? + $average = ''; + if (($evalobj->has_results())) { + // TODO this check needed ? $score = $evalobj->calc_score(); - if ($score != null) { $average = get_lang('Average') . ' : ' . $scoredisplay->display_score($score, SCORE_AVERAGE) . ''; $student_score = $evalobj->calc_score(api_get_user_id()); @@ -261,7 +260,6 @@ class DisplayGradebook } if (!$is_course_admin && ($status <> 1 || $sessionStatus == 0) && $selectcat <> 0) { - $catcourse = Category::load($catobj->get_id()); /** @var Category $category */ $category = $catcourse[0]; @@ -269,9 +267,7 @@ class DisplayGradebook $scoredisplay = ScoreDisplay :: instance(); $allevals = $category->get_evaluations($userId, true); $alllinks = $category->get_links($userId, true); - $allEvalsLinks = array_merge($allevals, $alllinks); - $item_value_total = 0; $scoreinfo = null; @@ -387,14 +383,14 @@ class DisplayGradebook if ($my_category['generate_certificates'] == 1) { $actionsLeft .= Display::url( - Display::return_icon( - 'certificate_list.png', - get_lang('GradebookSeeListOfStudentsCertificates'), - '', - ICON_SIZE_MEDIUM - ), - "gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . $selectcat - ); + Display::return_icon( + 'certificate_list.png', + get_lang('GradebookSeeListOfStudentsCertificates'), + '', + ICON_SIZE_MEDIUM + ), + "gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . $selectcat + ); } $actionsLeft .= Display::url( @@ -470,8 +466,14 @@ class DisplayGradebook * @param bool $show_add_qualification * @param bool $show_add_link */ - public function display_reduce_header_gradebook($catobj, $is_course_admin, $is_platform_admin, $simple_search_form, $show_add_qualification = true, $show_add_link = true) - { + public function display_reduce_header_gradebook( + $catobj, + $is_course_admin, + $is_platform_admin, + $simple_search_form, + $show_add_qualification = true, + $show_add_link = true + ) { //student if (!$is_course_admin) { $user = api_get_user_info(api_get_user_id()); @@ -504,26 +506,29 @@ class DisplayGradebook } /** - * @param int $userid + * @param $userId + * @param $categoryId + * @return string */ - public static function display_header_user($userid, $categoryId) + public static function display_header_user($userId, $categoryId) { - $user_id = $userid; - $user = api_get_user_info($user_id); + $user = api_get_user_info($userId); + if (empty($user)) { + return ''; + } $catcourse = Category :: load($categoryId); $scoredisplay = ScoreDisplay :: instance(); - $scorecourse = $catcourse[0]->calc_score($user_id); // generating the total score for a course - $allevals = $catcourse[0]->get_evaluations($user_id, true); - $alllinks = $catcourse[0]->get_links($user_id, true); + $allevals = $catcourse[0]->get_evaluations($userId, true, api_get_course_id()); + $alllinks = $catcourse[0]->get_links($userId, true, api_get_course_id()); $evals_links = array_merge($allevals, $alllinks); $item_value = 0; $item_total = 0; for ($count = 0; $count < count($evals_links); $count++) { $item = $evals_links[$count]; - $score = $item->calc_score($user_id); + $score = $item->calc_score($userId); $my_score_denom = ($score[1] == 0) ? 1 : $score[1]; $item_value+=$score[0] / $my_score_denom * $item->get_weight(); $item_total+=$item->get_weight(); @@ -532,17 +537,11 @@ class DisplayGradebook $total_score = array($item_value, $item_total); $scorecourse_display = $scoredisplay->display_score($total_score, SCORE_DIV_PERCENT); - $cattotal = Category :: load(0); - $scoretotal = $cattotal[0]->calc_score($user_id); - $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable')); - - $imageUrl = UserManager::getUserPicture($userid); - $info = '
'; - $info .= '
'; + $info .= '
'; $info .= '
'; $info .= '
'; - $info .= get_lang('Name') . ' : ' . + $info .= get_lang('Name') . ' : ' . $user['complete_name'] . '
'; if (api_get_setting('show_email_addresses') == 'true') { @@ -552,8 +551,6 @@ class DisplayGradebook $info .= get_lang('TotalUser') . ' : ' . $scorecourse_display . ''; $info .= '
'; $info .= '
'; - echo $info; } - } diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php index 836da1a909..5b075b31c1 100755 --- a/main/gradebook/lib/fe/evalform.class.php +++ b/main/gradebook/lib/fe/evalform.class.php @@ -52,7 +52,6 @@ class EvalForm extends FormValidator if (isset($extra1)) { $this->extra = $extra1; } - switch ($form_type) { case self :: TYPE_EDIT: $this->build_editing_form(); @@ -360,22 +359,38 @@ class EvalForm extends FormValidator 'score' => $this->result_object->get_score(), 'maximum' => $this->evaluation_object->get_max() )); - $userinfo = api_get_user_info($this->result_object->get_user_id()); + $userInfo = api_get_user_info($this->result_object->get_user_id()); $renderer = & $this->defaultRenderer(); $renderer->setCustomElementTemplate('{element} '); - $this->addElement('label', get_lang('User'), $userinfo['complete_name']); + $this->addHeader(get_lang('User').': '.$userInfo['complete_name']); - $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array( - 'size' => '4', - 'class' => 'span1', - 'maxlength' => '5' - )); + $this->addText( + 'score', + array( + get_lang('Score'), + null, + '/ '.$this->evaluation_object->get_max(), + ), + false, + array( + 'size' => '4', + 'maxlength' => '5', + ) + ); $this->addButtonSave(get_lang('Edit'), 'submit'); $this->addElement('hidden', 'minvalue', 0); $this->addElement('hidden', 'hid_user_id', $this->result_object->get_user_id()); $this->addElement('hidden', 'maxvalue', $this->evaluation_object->get_max()); - $this->addRule('score', get_lang('OnlyNumbers'), 'numeric', null, 'client'); + + $this->addRule( + 'score', + get_lang('OnlyNumbers'), + 'numeric', + null, + 'client' + ); + $this->addRule( array( 'score', diff --git a/main/gradebook/lib/fe/resulttable.class.php b/main/gradebook/lib/fe/resulttable.class.php index 72e31ad942..fc637ff9fa 100755 --- a/main/gradebook/lib/fe/resulttable.class.php +++ b/main/gradebook/lib/fe/resulttable.class.php @@ -20,7 +20,12 @@ class ResultTable extends SortableTable */ public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false) { - parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1); + parent:: __construct( + 'resultlist', + null, + null, + (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1 + ); $this->datagen = new ResultsDataGenerator($evaluation, $results, true); diff --git a/main/inc/lib/formvalidator/Rule/CompareDateTimeText.php b/main/inc/lib/formvalidator/Rule/CompareDateTimeText.php index 3984c23a46..8389fc6617 100644 --- a/main/inc/lib/formvalidator/Rule/CompareDateTimeText.php +++ b/main/inc/lib/formvalidator/Rule/CompareDateTimeText.php @@ -11,8 +11,9 @@ class HTML_QuickForm_Rule_CompareDateTimeText extends HTML_QuickForm_Rule_Compar * @param string $operator The operator to use (default '==') * @return boolean True if the 2 given dates match the operator */ - function validate($values, $operator = null) { - $datetime1 = api_strtotime($values[0]); + function validate($values, $operator = null) + { + $datetime1 = api_strtotime($values[0]); $datetime2 = api_strtotime($values[1]); if (strpos($operator, 'allow_empty') !== false) { @@ -21,7 +22,8 @@ class HTML_QuickForm_Rule_CompareDateTimeText extends HTML_QuickForm_Rule_Compar return true; } } - $result = parent::validate(array($datetime1, $datetime2), $operator); + $result = parent::validate(array($datetime1, $datetime2), $operator); + return $result; } } diff --git a/main/inc/lib/pear/HTML/QuickForm.php b/main/inc/lib/pear/HTML/QuickForm.php index d48a7b213f..d30c475dd5 100755 --- a/main/inc/lib/pear/HTML/QuickForm.php +++ b/main/inc/lib/pear/HTML/QuickForm.php @@ -1774,7 +1774,7 @@ class HTML_QuickForm extends HTML_Common } if (count($test) > 0) { return - "\n