From 9f516e9dc476bf4a89b30f68f50a6669d9090daa Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 16 Dec 2014 14:31:09 +0100 Subject: [PATCH] Format code --- main/gradebook/lib/fe/catform.class.php | 62 +++-- main/gradebook/lib/fe/dataform.class.php | 32 +-- main/gradebook/lib/fe/displaygradebook.php | 7 +- main/gradebook/lib/fe/evalform.class.php | 22 +- main/gradebook/lib/fe/exportgradebook.php | 234 +++++++++--------- .../gradebook/lib/fe/gradebooktable.class.php | 2 +- .../lib/fe/linkaddeditform.class.php | 154 ++++++------ main/gradebook/lib/fe/linkform.class.php | 83 +++---- main/gradebook/lib/fe/resulttable.class.php | 37 ++- .../lib/fe/scoredisplayform.class.php | 43 ++-- main/gradebook/lib/fe/userform.class.php | 33 +-- main/gradebook/lib/fe/usertable.class.php | 52 ++-- .../lib/gradebook_data_generator.class.php | 2 +- .../lib/gradebook_functions_users.inc.php | 33 ++- .../lib/results_data_generator.class.php | 10 +- main/gradebook/lib/scoredisplay.class.php | 52 ++-- .../lib/user_data_generator.class.php | 116 +++++---- 17 files changed, 464 insertions(+), 510 deletions(-) diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php index 20ecb118ab..c764a656b5 100755 --- a/main/gradebook/lib/fe/catform.class.php +++ b/main/gradebook/lib/fe/catform.class.php @@ -12,12 +12,10 @@ require_once dirname(__FILE__).'/../be.inc.php'; */ class CatForm extends FormValidator { - - const TYPE_ADD = 1; - const TYPE_EDIT = 2; - const TYPE_MOVE = 3; - const TYPE_SELECT_COURSE = 4; - + const TYPE_ADD = 1; + const TYPE_EDIT = 2; + const TYPE_MOVE = 3; + const TYPE_SELECT_COURSE = 4; private $category_object; /** @@ -132,16 +130,16 @@ class CatForm extends FormValidator $this->build_basic_form(); } - /** - * Builds an form to edit a category - */ + /** + * Builds an form to edit a category + */ protected function build_editing_form() { $skills = $this->category_object->get_skills_for_select(); $course_code = api_get_course_id(); $session_id = api_get_session_id(); - //Freeze or not + //Freeze or not $test_cats = Category::load( null, null, @@ -388,37 +386,37 @@ class CatForm extends FormValidator $visibility_default = 0; } $this->setDefaults(array('visible' => $visibility_default)); - } + } /** - * This function builds an 'select course' form in the add category process, - * if parent id is 0, it will only show courses - */ + * This function builds an 'select course' form in the add category process, + * if parent id is 0, it will only show courses + */ protected function build_select_course_form() { - $select = $this->addElement('select','select_course',array(get_lang('PickACourse'),'test'), null); - $coursecat = Category :: get_all_courses(api_get_user_id()); - //only return courses that are not yet created by the teacher - - foreach($coursecat as $row) { - $select->addoption($row[1],$row[0]); - } - $this->setDefaults(array( - 'hid_user_id' => $this->category_object->get_user_id(), - 'hid_parent_id' => $this->category_object->get_parent_id() - )); - $this->addElement('hidden','hid_user_id'); - $this->addElement('hidden','hid_parent_id'); - $this->addElement('submit', null, get_lang('Ok')); - } + $select = $this->addElement('select','select_course',array(get_lang('PickACourse'),'test'), null); + $coursecat = Category :: get_all_courses(api_get_user_id()); + //only return courses that are not yet created by the teacher + + foreach($coursecat as $row) { + $select->addoption($row[1],$row[0]); + } + $this->setDefaults(array( + 'hid_user_id' => $this->category_object->get_user_id(), + 'hid_parent_id' => $this->category_object->get_parent_id() + )); + $this->addElement('hidden','hid_user_id'); + $this->addElement('hidden','hid_parent_id'); + $this->addElement('submit', null, get_lang('Ok')); + } function display() { - parent :: display(); - } + parent :: display(); + } function setDefaults($defaults = array(), $filter = null) { parent::setDefaults($defaults, $filter); - } + } } diff --git a/main/gradebook/lib/fe/dataform.class.php b/main/gradebook/lib/fe/dataform.class.php index 13438ca9b4..f302764df5 100755 --- a/main/gradebook/lib/fe/dataform.class.php +++ b/main/gradebook/lib/fe/dataform.class.php @@ -1,24 +1,18 @@ form_type = $form_type; if ($this->form_type == self :: TYPE_IMPORT) { $this->build_import_form(); - } - elseif ($this->form_type == self :: TYPE_EXPORT) { + } elseif ($this->form_type == self :: TYPE_EXPORT) { if ($locked_status == 0) { $this->build_export_form_option(false); } else { $this->build_export_form(); - } - } - elseif ($this->form_type == self :: TYPE_EXPORT_PDF) { + } + } elseif ($this->form_type == self :: TYPE_EXPORT_PDF) { $this->build_pdf_export_form(); } $this->setDefaults(); @@ -64,7 +57,6 @@ class DataForm extends FormValidator { )); } - protected function build_export_form() { $this->addElement('header', get_lang('ChooseFormat')); $this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv'); @@ -80,7 +72,7 @@ class DataForm extends FormValidator { $this->addElement('header', get_lang('ChooseFormat')); $this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv'); $this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml'); - $this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled')); + $this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled')); $this->addElement('style_submit_button', 'submit', get_lang('Export'), 'class="upload"'); $this->setDefaults(array ( 'file_type' => 'csv' @@ -102,8 +94,8 @@ class DataForm extends FormValidator { $this->addElement('checkbox','ignoreerrors',null,get_lang('IgnoreErrors')); $this->addElement('style_submit_button', 'submit', get_lang('Ok')); $this->setDefaults(array( - 'formSent' => '1', - 'file_type' => 'csv' + 'formSent' => '1', + 'file_type' => 'csv' )); } diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index d8a7fd7bca..722b2a6827 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -1,11 +1,8 @@ function setFocus(){ $("#evaluation_title").focus(); @@ -27,9 +15,15 @@ $(document).ready(function () { }); '; +/** + * Class EvalForm + * + * Extends FormValidator with add&edit forms for evaluations + * @author Stijn Konings + * @package chamilo.gradebook + */ class EvalForm extends FormValidator { - const TYPE_ADD = 1; const TYPE_EDIT = 2; const TYPE_MOVE = 3; diff --git a/main/gradebook/lib/fe/exportgradebook.php b/main/gradebook/lib/fe/exportgradebook.php index 8231ce05cc..0935b79b16 100755 --- a/main/gradebook/lib/fe/exportgradebook.php +++ b/main/gradebook/lib/fe/exportgradebook.php @@ -94,15 +94,15 @@ a:active {text-decoration: none; font-weight : bold; color : black;} * @return void */ function export_pdf_attendance($headers_table, $data_table, $headers_pdf, $footers_pdf, $title_pdf) { - require_once api_get_path(LIBRARY_PATH).'mpdf/mpdf.php'; + require_once api_get_path(LIBRARY_PATH).'mpdf/mpdf.php'; - $mpdf = new mPDF('UTF-8', 'A4-L', '', '', 15, 10, 35, 20, 4, 2, 'L'); - $mpdf->useOnlyCoreFonts = true; - $mpdf->mirrorMargins = 0; // Use different Odd/Even headers and footers and mirror margins + $mpdf = new mPDF('UTF-8', 'A4-L', '', '', 15, 10, 35, 20, 4, 2, 'L'); + $mpdf->useOnlyCoreFonts = true; + $mpdf->mirrorMargins = 0; // Use different Odd/Even headers and footers and mirror margins - if (is_array($headers_pdf)) { - // preparing headers pdf - $header = ' + if (is_array($headers_pdf)) { + // preparing headers pdf + $header = '
@@ -122,92 +122,92 @@ function export_pdf_attendance($headers_table, $data_table, $headers_pdf, $foote

'.$title_pdf.'
'.$headers_pdf[5][0].' '.$headers_pdf[5][1].'
'; - } + } - // preparing footer pdf - $footer = ''; - if (is_array($footers_pdf)) { - $footer .= ''; - foreach ($footers_pdf as $foot_pdf) { - $footer .= ''; - } - $footer .= ''; - } - $footer .= '
'.$foot_pdf.'
'; + // preparing footer pdf + $footer = ''; + if (is_array($footers_pdf)) { + $footer .= ''; + foreach ($footers_pdf as $foot_pdf) { + $footer .= ''; + } + $footer .= ''; + } + $footer .= '
'.$foot_pdf.'
'; - $footer .= '
{PAGENO}/{nb}
'; + $footer .= '
{PAGENO}/{nb}
'; - // preparing content pdf - $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css'; - if (file_exists($css_file)) { - $css = @file_get_contents($css_file); - } else { - $css = ''; - } + // preparing content pdf + $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css'; + if (file_exists($css_file)) { + $css = @file_get_contents($css_file); + } else { + $css = ''; + } - if(count($data_table) > 30) - $items_per_page = (count($data_table)/2); - else - $items_per_page = count($data_table); + if(count($data_table) > 30) + $items_per_page = (count($data_table)/2); + else + $items_per_page = count($data_table); - $count_pages = ceil(count($data_table) / $items_per_page); - for ($x = 0; $x<$count_pages; $x++) { - $content_table .= ''; - // header table - $content_table .= ''; - $i = 0; - if (is_array($headers_table)) { + $count_pages = ceil(count($data_table) / $items_per_page); + for ($x = 0; $x<$count_pages; $x++) { + $content_table .= '
'; + // header table + $content_table .= ''; + $i = 0; + if (is_array($headers_table)) { - foreach ($headers_table as $head_table) { - if (!empty($head_table[0])) { - $width = (!empty($head_table[1])?$head_table[1].'%':''); - $content_table .= ''; - $i++; - } - } - } - $content_table .= ''; - // body table - if (is_array($data_table) && count($data_table) > 0) { - $offset = $x*$items_per_page; - $data_table = array_slice ($data_table, $offset, count($data_table)); - $i = 1; - $item = $offset+1; - foreach ($data_table as $data) { - $content_table .= ''; - $content_table .= ''; - foreach ($data as $key => $content) { - if (isset($content)) { - $key == 1 ? $align='align="left"':$align='align="center"'; - $content_table .= ''; - } - } - $content_table .= ''; - $i++; - $item++; - if ($i > $items_per_page) { break; } - } - } else { - $content_table .= ''; - } - $content_table .= '
'.$head_table[0].'
'.($item<10?'0'.$item:$item).''.$content.'
'.get_lang('Empty').'
'; - if ($x < ($count_pages - 1)) { $content_table .= ''; } - } + foreach ($headers_table as $head_table) { + if (!empty($head_table[0])) { + $width = (!empty($head_table[1])?$head_table[1].'%':''); + $content_table .= ''.$head_table[0].''; + $i++; + } + } + } + $content_table .= ''; + // body table + if (is_array($data_table) && count($data_table) > 0) { + $offset = $x*$items_per_page; + $data_table = array_slice ($data_table, $offset, count($data_table)); + $i = 1; + $item = $offset+1; + foreach ($data_table as $data) { + $content_table .= ''; + $content_table .= ''.($item<10?'0'.$item:$item).''; + foreach ($data as $key => $content) { + if (isset($content)) { + $key == 1 ? $align='align="left"':$align='align="center"'; + $content_table .= ''.$content.''; + } + } + $content_table .= ''; + $i++; + $item++; + if ($i > $items_per_page) { break; } + } + } else { + $content_table .= ''.get_lang('Empty').''; + } + $content_table .= ''; + if ($x < ($count_pages - 1)) { $content_table .= ''; } + } - $html = $content_table; + $html = $content_table; - // set attributes for pdf - $mpdf->SetHTMLHeader($header); - $mpdf->SetHTMLFooter($footer); - if (!empty($css)) { - $mpdf->WriteHTML($css, 1); - $mpdf->WriteHTML($html, 2); - } else { - $mpdf->WriteHTML($html); - } - $mpdf->Output(replace_dangerous_char($title_pdf.'.pdf'), 'D'); - exit; + // set attributes for pdf + $mpdf->SetHTMLHeader($header); + $mpdf->SetHTMLFooter($footer); + if (!empty($css)) { + $mpdf->WriteHTML($css, 1); + $mpdf->WriteHTML($html, 2); + } else { + $mpdf->WriteHTML($html); + } + $mpdf->Output(replace_dangerous_char($title_pdf.'.pdf'), 'D'); + exit; } @@ -220,45 +220,45 @@ function export_pdf_attendance($headers_table, $data_table, $headers_pdf, $foote * @return void */ function export_pdf_with_html($headers_table, $data_table, $headers_pdf, $footers_pdf, $title_pdf) { - + require_once api_get_path(LIBRARY_PATH).'pdf.lib.php'; $headers_in_pdf = ''; - + if (is_array($headers_pdf)) { // preparing headers pdf - $header = '

- '; - foreach($headers_pdf as $header_pdf) { + $header = '

'.$title_pdf.'

+ '; + foreach($headers_pdf as $header_pdf) { if (!empty($header_pdf[0]) && !empty($header_pdf[1])) { $header.= ''; } - } + } $header.='

'.$title_pdf.'

'.$header_pdf[0].' '.$header_pdf[1].'

'; } - + // preparing footer pdf $footer = ''; if (is_array($footers_pdf)) { - $footer .= ''; + $footer .= ''; foreach ($footers_pdf as $foot_pdf) { $footer .= ''; } - $footer .= ''; + $footer .= ''; } - $footer .= '
'.$foot_pdf.'
'; + $footer .= ''; $footer .= '
{PAGENO}/{nb}
'; - - // preparing content pdf + + // preparing content pdf $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css'; if (file_exists($css_file)) { $css = @file_get_contents($css_file); } else { $css = ''; - } + } $items_per_page = 30; - $count_pages = ceil(count($data_table) / $items_per_page); + $count_pages = ceil(count($data_table) / $items_per_page); for ($x = 0; $x<$count_pages; $x++) { - $content_table .= ''; + $content_table .= '
'; // header table $content_table .= ''; $i = 0; @@ -267,41 +267,41 @@ function export_pdf_with_html($headers_table, $data_table, $headers_pdf, $footer if (!empty($head_table[0])) { $width = (!empty($head_table[1])?$head_table[1].'%':''); $content_table .= ''; - $i++; - } - } - } - $content_table .= ''; + $i++; + } + } + } + $content_table .= ''; // body table - + if (is_array($data_table) && count($data_table) > 0) { - $offset = $x*$items_per_page; + $offset = $x*$items_per_page; $data_table = array_slice ($data_table, $offset, count($data_table)); $i = 1; $item = $offset+1; - foreach ($data_table as $data) { + foreach ($data_table as $data) { $content_table .= ''; $content_table .= ''; - foreach ($data as $key => $content) { + foreach ($data as $key => $content) { if (isset($content)) { $key == 1 ? $align='align="left"':$align='align="center"'; - $content_table .= ''; - } + $content_table .= ''; + } } $content_table .= ''; $i++; $item++; if ($i > $items_per_page) { break; } - } + } } else { $content_table .= ''; - } - $content_table .= '
'.$head_table[0].'
'.($item<10?'0'.$item:$item).''.$content.''.$content.'
'.get_lang('Empty').'
'; - if ($x < ($count_pages - 1)) { $content_table .= ''; } - } + } + $content_table .= ''; + if ($x < ($count_pages - 1)) { $content_table .= ''; } + } $pdf = new PDF(); - $pdf->set_custom_footer($footer); - $pdf->set_custom_header($headers_in_pdf); + $pdf->set_custom_footer($footer); + $pdf->set_custom_header($headers_in_pdf); $pdf->content_to_pdf($header.$content_table, $css, $title_pdf ); exit; diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index 4c9f9aa781..49f509165c 100755 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -530,7 +530,7 @@ class GradebookTable extends SortableTable * @param unknown_type $item * @return string */ - private function build_name_link ($item) + private function build_name_link($item) { $view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null; switch ($item->get_item_type()) { diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php index 50c9d57241..c4f8fadce4 100755 --- a/main/gradebook/lib/fe/linkaddeditform.class.php +++ b/main/gradebook/lib/fe/linkaddeditform.class.php @@ -1,12 +1,6 @@ addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link')); } - if (count($category_object) == 1) { - $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id()); - } else { - $select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id')); - $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero'); - - $default_weight = 0; - if (!empty($category_object)) { - foreach ($category_object as $my_cat) { - - if ($my_cat->get_course_code() == api_get_course_id()) { - $grade_model_id = $my_cat->get_grade_model_id(); - if (empty($grade_model_id)) { - - if ($my_cat->get_parent_id() == 0 ) { - $default_weight = $my_cat->get_weight(); - $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); - } else { - $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); - } - } else { - $select_gradebook->addoption(get_lang('Select'), 0); - } - if ($link->get_category_id() == $my_cat->get_id()) { - $default_weight = $my_cat->get_weight(); - } - } - } - } - } + if (count($category_object) == 1) { + $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id()); + } else { + $select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id')); + $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero'); + + $default_weight = 0; + if (!empty($category_object)) { + foreach ($category_object as $my_cat) { + + if ($my_cat->get_course_code() == api_get_course_id()) { + $grade_model_id = $my_cat->get_grade_model_id(); + if (empty($grade_model_id)) { + + if ($my_cat->get_parent_id() == 0 ) { + $default_weight = $my_cat->get_weight(); + $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); + } else { + $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); + } + } else { + $select_gradebook->addoption(get_lang('Select'), 0); + } + if ($link->get_category_id() == $my_cat->get_id()) { + $default_weight = $my_cat->get_weight(); + } + } + } + } + } $this->add_textfield( - 'weight_mask', - array(get_lang('Weight'), null, ' [0 .. '.$category_object[0]->get_weight().'] '), - true, - array( - 'size' => '4', - 'maxlength' => '5', - 'class' => 'span1' - ) - ); + 'weight_mask', + array(get_lang('Weight'), null, ' [0 .. '.$category_object[0]->get_weight().'] '), + true, + array( + 'size' => '4', + 'maxlength' => '5', + 'class' => 'span1' + ) + ); - $this->addElement('hidden', 'weight'); + $this->addElement('hidden', 'weight'); - /* + /* - // ELEMENT: weight + // ELEMENT: weight $this->add_textfield('weight', array(get_lang('Weight'), null, '/ '.$default_weight.''), true, array ( 'size' => '4', 'maxlength' => '5', @@ -126,21 +120,21 @@ class LinkAddEditForm extends FormValidator $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric'); $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>='); if ($form_type == self :: TYPE_EDIT) { - $parent_cat = Category :: load($link->get_category_id()); - - if ($parent_cat[0]->get_parent_id() == 0) { - $values['weight'] = $link->get_weight(); - } else { - $cat = Category :: load($parent_cat[0]->get_parent_id()); - //$global_weight = $cat[0]->get_weight(); - //$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight; - //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight()); - //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight; - //$values['weight'] = $weight; - $values['weight'] = $link->get_weight() ; - } - $defaults['weight_mask'] = $values['weight'] ; - $defaults['select_gradebook'] = $link->get_category_id(); + $parent_cat = Category :: load($link->get_category_id()); + + if ($parent_cat[0]->get_parent_id() == 0) { + $values['weight'] = $link->get_weight(); + } else { + $cat = Category :: load($parent_cat[0]->get_parent_id()); + //$global_weight = $cat[0]->get_weight(); + //$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight; + //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight()); + //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight; + //$values['weight'] = $weight; + $values['weight'] = $link->get_weight() ; + } + $defaults['weight_mask'] = $values['weight'] ; + $defaults['select_gradebook'] = $link->get_category_id(); } // ELEMENT: max @@ -187,14 +181,14 @@ class LinkAddEditForm extends FormValidator $this->addElement('style_submit_button', 'submit', get_lang('LinkMod'),'class="save"'); } - if ($form_type == self :: TYPE_ADD) { - $setting = api_get_setting('tool_visible_by_default_at_creation'); - $visibility_default = 1; - if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') { - $visibility_default = 0; - } - $defaults['visible'] = $visibility_default; - } + if ($form_type == self :: TYPE_ADD) { + $setting = api_get_setting('tool_visible_by_default_at_creation'); + $visibility_default = 1; + if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') { + $visibility_default = 0; + } + $defaults['visible'] = $visibility_default; + } // set default values $this->setDefaults($defaults); diff --git a/main/gradebook/lib/fe/linkform.class.php b/main/gradebook/lib/fe/linkform.class.php index 9cfad74f63..c8ee820bd1 100755 --- a/main/gradebook/lib/fe/linkform.class.php +++ b/main/gradebook/lib/fe/linkform.class.php @@ -1,18 +1,13 @@ setDefaults(); } - protected function build_move() { + protected function build_move() + { $renderer =& $this->defaultRenderer(); $renderer->setElementTemplate('{element} '); $this->addElement('static',null,null,'"'.$this->link_object->get_name().'" '); @@ -67,11 +64,11 @@ class LinkForm extends FormValidator $select->addoption($line.' '.$cat[1],$cat[0]); $line = ''; } - $this->addElement('submit', null, get_lang('Ok')); + $this->addElement('submit', null, get_lang('Ok')); } protected function build_create() - { + { $this->addElement('header', get_lang('MakeLink')); $select = $this->addElement('select', 'select_link', get_lang('ChooseLink'), null, array('onchange' => 'document.create_link.submit()')); @@ -82,28 +79,28 @@ class LinkForm extends FormValidator $courseCode = $this->category_object->get_course_code(); foreach ($linkTypes as $linkType) { - // The hot potatoe link will be added "inside" the exercise option. - if ($linkType == LINK_HOTPOTATOES) { - continue; - } - $link = $this->createLink($linkType, $courseCode); + // The hot potatoe link will be added "inside" the exercise option. + if ($linkType == LINK_HOTPOTATOES) { + continue; + } + $link = $this->createLink($linkType, $courseCode); // disable this element if the link works with a dropdownlist // and if there are no links left if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') { $select->addoption($link->get_type_name(), $linkType, 'disabled'); } else { - if ($link->get_type() == LINK_EXERCISE) { - // Adding exercise - $select->addoption($link->get_type_name(), $linkType); - // Adding hot potatoes - $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode); - $select->addoption( - '   '.$linkHot->get_type_name(), - LINK_HOTPOTATOES - ); - } else { - $select->addoption($link->get_type_name(), $linkType); - } + if ($link->get_type() == LINK_EXERCISE) { + // Adding exercise + $select->addoption($link->get_type_name(), $linkType); + // Adding hot potatoes + $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode); + $select->addoption( + '   '.$linkHot->get_type_name(), + LINK_HOTPOTATOES + ); + } else { + $select->addoption($link->get_type_name(), $linkType); + } } } @@ -112,20 +109,20 @@ class LinkForm extends FormValidator } } - /** - * @param $link - * @param $courseCode - * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink - */ - private function createLink($link, $courseCode) - { - $link = LinkFactory::create($link); - if (!empty($courseCode)) { - $link->set_course_code($courseCode); - } elseif(!empty($_GET['course_code'])) { - $link->set_course_code(Database::escape_string($_GET['course_code'])); - } + /** + * @param $link + * @param $courseCode + * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink + */ + private function createLink($link, $courseCode) + { + $link = LinkFactory::create($link); + if (!empty($courseCode)) { + $link->set_course_code($courseCode); + } elseif(!empty($_GET['course_code'])) { + $link->set_course_code(Database::escape_string($_GET['course_code'])); + } - return $link; - } + return $link; + } } diff --git a/main/gradebook/lib/fe/resulttable.class.php b/main/gradebook/lib/fe/resulttable.class.php index bec6e9207e..b47337e504 100755 --- a/main/gradebook/lib/fe/resulttable.class.php +++ b/main/gradebook/lib/fe/resulttable.class.php @@ -1,16 +1,11 @@ datagen = new ResultsDataGenerator($evaluation, $results, true); @@ -81,7 +76,7 @@ class ResultTable extends SortableTable // determine sorting type $col_adjust = $this->iscourse == '1' ? 1 : 0; - + switch ($this->column) { // first name or last name case (0 + $col_adjust): @@ -101,23 +96,23 @@ class ResultTable extends SortableTable break; //Score case (2 + $col_adjust): - $sorting = ResultsDataGenerator :: RDG_SORT_SCORE; + $sorting = ResultsDataGenerator :: RDG_SORT_SCORE; break; case (3 + $col_adjust): $sorting = ResultsDataGenerator :: RDG_SORT_MASK; break; } - + if ($this->direction == 'DESC') { $sorting |= ResultsDataGenerator :: RDG_SORT_DESC; } else { $sorting |= ResultsDataGenerator :: RDG_SORT_ASC; } - + $data_array = $this->datagen->get_data($sorting, $from, $this->per_page); - + // generate the data to display - $sortable_data = array(); + $sortable_data = array(); foreach ($data_array as $item) { $row = array (); if ($this->iscourse == '1') { @@ -130,9 +125,9 @@ class ResultTable extends SortableTable $row[] = $item['lastname']; $row[] = $item['firstname']; } - + $row[] = Display::bar_progress($item['percentage_score'], false, $item['score']); - //$row[] = Display::bar_progress($item['percentage_score'], true); + //$row[] = Display::bar_progress($item['percentage_score'], true); if ($scoredisplay->is_custom()) { $row[] = $item['display']; } @@ -144,8 +139,8 @@ class ResultTable extends SortableTable return $sortable_data; } - - private function build_edit_column ($item) { + + private function build_edit_column ($item) { $status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id()); $locked_status = $this->evaluation->get_locked(); if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {//api_is_course_admin() @@ -156,12 +151,12 @@ class ResultTable extends SortableTable $edit_column.= ' '; $edit_column.= ' '; } - // Evaluation's origin is a link + // Evaluation's origin is a link if ($this->evaluation->get_category_id() < 0) { $link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id()); $doc_url = $link->get_view_url($item['id']); - + if ($doc_url != null) { $edit_column .= ' ' .'' diff --git a/main/gradebook/lib/fe/scoredisplayform.class.php b/main/gradebook/lib/fe/scoredisplayform.class.php index a1246baafa..6ef1ded349 100755 --- a/main/gradebook/lib/fe/scoredisplayform.class.php +++ b/main/gradebook/lib/fe/scoredisplayform.class.php @@ -1,16 +1,11 @@ get_custom_score_display_settings(); - + $nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1'; - $this->setDefaults(array ( - 'scorecolpercent' => $displayscore->get_color_split_value() + $this->setDefaults(array ( + 'scorecolpercent' => $displayscore->get_color_split_value() )); - + $this->addElement('hidden', 'maxvalue', '100'); $this->addElement('hidden', 'minvalue', '0'); $counter= 1; @@ -46,20 +41,20 @@ class ScoreDisplayForm extends FormValidator $scorecol = array(); //settings for the colored score - $this->addElement('header', get_lang('ScoreEdit')); - - if ($displayscore->is_coloring_enabled()) { - $this->addElement('html', '' . get_lang('ScoreColor') . ''); + $this->addElement('header', get_lang('ScoreEdit')); + + if ($displayscore->is_coloring_enabled()) { + $this->addElement('html', '' . get_lang('ScoreColor') . ''); $this->addElement('text', 'scorecolpercent', array(get_lang('Below'), get_lang('WillColorRed'), '%'), array ( 'size' => 5, 'maxlength' => 5, 'class'=>'span1', )); - - if (api_get_setting('teachers_can_change_score_settings') != 'true') { + + if (api_get_setting('teachers_can_change_score_settings') != 'true') { $this->freeze('scorecolpercent'); } - + $this->addRule('scorecolpercent', get_lang('OnlyNumbers'), 'numeric'); $this->addRule(array('scorecolpercent','maxvalue'), get_lang('Over100'), 'compare', '<='); $this->addRule(array('scorecolpercent','minvalue'), get_lang('UnderMin'), 'compare', '>'); @@ -67,8 +62,8 @@ class ScoreDisplayForm extends FormValidator //Settings for the scoring system - if ($displayscore->is_custom()) { - $this->addElement('html', '
' . get_lang('ScoringSystem') . ''); + if ($displayscore->is_custom()) { + $this->addElement('html', '
' . get_lang('ScoringSystem') . ''); $this->addElement('static', null, null, get_lang('ScoreInfo')); $scorenull[]= & $this->CreateElement('static', null, null, get_lang('Between')); $this->setDefaults(array ( @@ -86,14 +81,14 @@ class ScoreDisplayForm extends FormValidator $elementTemplateTwoLabel = '

* - +

{error}

 '.get_lang('And').'     {element} %  ='; $elementTemplateTwoLabel2 = '{error}
 {element} '.get_lang('Add').' - '.get_lang('Delete').' + '.get_lang('Delete').'

'; $scorebetw= array (); @@ -116,11 +111,11 @@ class ScoreDisplayForm extends FormValidator $this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>'); } } - + if ($displayscore->is_custom()) $this->addElement('style_submit_button', 'submit', get_lang('Ok'),'class="save"'); } - + function validate() { return parent :: validate(); } diff --git a/main/gradebook/lib/fe/userform.class.php b/main/gradebook/lib/fe/userform.class.php index fd1d6ae843..c6577da0c8 100755 --- a/main/gradebook/lib/fe/userform.class.php +++ b/main/gradebook/lib/fe/userform.class.php @@ -1,18 +1,14 @@ form_type= $form_type; if (isset ($user)) { @@ -47,11 +44,12 @@ class UserForm extends FormValidator $this->setDefaults(); } - protected function build_simple_search() { + protected function build_simple_search() + { if (isset($_GET['search']) && (!empty($_GET['search']))) { - $this->setDefaults(array( - 'keyword' => Security::remove_XSS($_GET['search']) - )); + $this->setDefaults(array( + 'keyword' => Security::remove_XSS($_GET['search']) + )); } $renderer =& $this->defaultRenderer(); $renderer->setElementTemplate('{element} '); @@ -59,7 +57,8 @@ class UserForm extends FormValidator $this->addElement('style_submit_button','submit',get_lang('Search'),'class="search"'); } - protected function build_user_info_form() { + protected function build_user_info_form() + { if (api_is_western_name_order()) { $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']); $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']); @@ -73,10 +72,14 @@ class UserForm extends FormValidator $this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']); $this->addElement('style_submit_button', 'submit', get_lang('Back'),'class="save"'); } - function display() { + + function display() + { parent :: display(); } - function setDefaults($defaults= array(), $filter = null) { + + function setDefaults($defaults= array(), $filter = null) + { parent :: setDefaults($defaults, $filter); } } diff --git a/main/gradebook/lib/fe/usertable.class.php b/main/gradebook/lib/fe/usertable.class.php index 41e0cc432b..1526b9f2c5 100755 --- a/main/gradebook/lib/fe/usertable.class.php +++ b/main/gradebook/lib/fe/usertable.class.php @@ -1,16 +1,11 @@ userid = $userid; - $this->datagen = new UserDataGenerator($userid, $evals, $links); - if (isset($addparams)) { $this->set_additional_parameters($addparams); } @@ -48,22 +39,22 @@ class UserTable extends SortableTable if ($scoredisplay->is_custom()) { $this->set_header($column++, get_lang('Display')); } - } + } /** * Function used by SortableTable to get total number of items in the table */ - function get_total_number_of_items () { + function get_total_number_of_items () + { return $this->datagen->get_total_items_count(); } - /** * Function used by SortableTable to generate the data to display */ - function get_table_data ($from = 1) { - + function get_table_data ($from = 1) + { $scoredisplay = ScoreDisplay :: instance(); // determine sorting type @@ -116,27 +107,26 @@ class UserTable extends SortableTable return $sortable_data; } - -// Other functions - - private function build_type_column ($item) { + private function build_type_column($item) + { return build_type_icon_tag($item->get_icon_name()); } - private function build_name_link ($item) { + private function build_name_link($item) + { switch ($item->get_item_type()) { // evaluation case 'E' : return ' ' - . '' - . $item->get_name() - . ''; + . '' + . $item->get_name() + . ''; // link case 'L' : return ' ' - . $item->get_name() - . '' - . ' [' . $item->get_type_name() . ']'; + . $item->get_name() + . '' + . ' [' . $item->get_type_name() . ']'; } } -} \ No newline at end of file +} diff --git a/main/gradebook/lib/gradebook_data_generator.class.php b/main/gradebook/lib/gradebook_data_generator.class.php index 2159ffeaa8..0f880eeb62 100755 --- a/main/gradebook/lib/gradebook_data_generator.class.php +++ b/main/gradebook/lib/gradebook_data_generator.class.php @@ -1,7 +1,7 @@ get_id()) - .' AND res.user_id = user.user_id'; + .' AND res.user_id = user.user_id'; $result = Database::query($sql); $users = array_merge($users, get_user_array_from_sql_result($result)); } diff --git a/main/gradebook/lib/results_data_generator.class.php b/main/gradebook/lib/results_data_generator.class.php index c91a7bee80..06b236177a 100755 --- a/main/gradebook/lib/results_data_generator.class.php +++ b/main/gradebook/lib/results_data_generator.class.php @@ -82,11 +82,11 @@ class ResultsDataGenerator $user['score'] = $this->get_score_display($result->get_score(),true, $ignore_score_color); } $user['percentage_score'] = intval($scoredisplay->display_score( - array($result->get_score(), $this->evaluation->get_max()), - SCORE_PERCENT, - SCORE_BOTH, - true - ) + array($result->get_score(), $this->evaluation->get_max()), + SCORE_PERCENT, + SCORE_BOTH, + true + ) ); if ($pdf && $number_decimals == null){ $user['scoreletter'] = $result->get_score(); diff --git a/main/gradebook/lib/scoredisplay.class.php b/main/gradebook/lib/scoredisplay.class.php index 29e69ab513..7881352c45 100755 --- a/main/gradebook/lib/scoredisplay.class.php +++ b/main/gradebook/lib/scoredisplay.class.php @@ -1,37 +1,31 @@ userid = $userid; $evals_filtered = array(); foreach ($evals as $eval) { @@ -61,12 +59,13 @@ class UserDataGenerator $this->categorycache = array(); $this->scorecache = null; $this->avgcache = null; - } + } /** * Get total number of items (rows) */ - public function get_total_items_count() { + public function get_total_items_count() + { return count($this->items); } @@ -81,7 +80,8 @@ class UserDataGenerator * 5: student's score * 6: student's score as custom display (only if custom scoring enabled) */ - public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false) { + public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false) + { // do some checks on count, redefine if invalid value if (!isset($count)) { $count = count ($this->items) - $start; @@ -102,22 +102,22 @@ class UserDataGenerator usort($allitems, array('UserDataGenerator', 'sort_by_category')); } elseif ($sorting & self :: UDG_SORT_AVERAGE) { // if user sorts on average scores, first calculate them and cache them - foreach ($allitems as $item) { - $this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score(); + foreach ($allitems as $item) { + $this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score(); } usort($allitems, array('UserDataGenerator', 'sort_by_average')); } elseif ($sorting & self :: UDG_SORT_SCORE) { // if user sorts on student's scores, first calculate them and cache them foreach ($allitems as $item) { $this->scorecache[$item->get_item_type() . $item->get_id()] - = $item->calc_score($this->userid); + = $item->calc_score($this->userid); } usort($allitems, array('UserDataGenerator', 'sort_by_score')); } elseif ($sorting & self :: UDG_SORT_MASK) { // if user sorts on student's masks, first calculate scores and cache them foreach ($allitems as $item) { $this->scorecache[$item->get_item_type() . $item->get_id()] - = $item->calc_score($this->userid); + = $item->calc_score($this->userid); } usort($allitems, array('UserDataGenerator', 'sort_by_mask')); } @@ -132,7 +132,7 @@ class UserDataGenerator if (!isset ($this->scorecache)) { foreach ($visibleitems as $item) { $this->scorecache[$item->get_item_type() . $item->get_id()] - = $item->calc_score($this->userid); + = $item->calc_score($this->userid); } } @@ -154,10 +154,11 @@ class UserDataGenerator return $data; } - // Sort functions - // Make sure to only use functions as defined in the GradebookItem interface ! + // Sort functions + // Make sure to only use functions as defined in the GradebookItem interface ! - function sort_by_type($item1, $item2) { + function sort_by_type($item1, $item2) + { if ($item1->get_item_type() == $item2->get_item_type()) { return $this->sort_by_name($item1,$item2); } else { @@ -165,13 +166,15 @@ class UserDataGenerator } } - function sort_by_course($item1, $item2) { + function sort_by_course($item1, $item2) + { $name1 = api_strtolower($this->get_course_name_from_code_cached($item1->get_course_code())); $name2 = api_strtolower($this->get_course_name_from_code_cached($item2->get_course_code())); return api_strnatcmp($name1, $name2); } - function sort_by_category($item1, $item2) { + function sort_by_category($item1, $item2) + { $cat1 = $this->get_category_cached($item1->get_category_id()); $cat2 = $this->get_category_cached($item2->get_category_id()); $name1 = api_strtolower($this->get_category_name_to_display($cat1)); @@ -179,31 +182,34 @@ class UserDataGenerator return api_strnatcmp($name1, $name2); } - - function sort_by_name($item1, $item2) { + function sort_by_name($item1, $item2) + { return api_strnatcmp($item1->get_name(),$item2->get_name()); } - - function sort_by_average($item1, $item2) { + function sort_by_average($item1, $item2) + { $score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()]; $score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()]; return $this->compare_scores($score1, $score2); } - function sort_by_score($item1, $item2) { + function sort_by_score($item1, $item2) + { $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()]; $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()]; return $this->compare_scores($score1, $score2); } - function sort_by_mask($item1, $item2) { + function sort_by_mask($item1, $item2) + { $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()]; $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()]; return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2); } - function compare_scores ($score1, $score2) { + function compare_scores ($score1, $score2) + { if (!isset($score1)) { return (isset($score2) ? 1 : 0); } elseif (!isset($score2)) { @@ -213,28 +219,28 @@ class UserDataGenerator } else { return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1); } - } -// Other functions - private function build_course_name ($item) { + private function build_course_name ($item) + { return $this->get_course_name_from_code_cached($item->get_course_code()); } - private function build_category_name ($item) { + private function build_category_name ($item) + { $cat = $this->get_category_cached($item->get_category_id()); - + return $this->get_category_name_to_display($cat); } - - private function build_average_column ($item, $ignore_score_color) { + private function build_average_column ($item, $ignore_score_color) + { if (isset($this->avgcache)) { - $avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()]; + $avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()]; } else { $avgscore = $item->calc_score(); - } - + } + $scoredisplay = ScoreDisplay :: instance(); $displaytype = SCORE_AVERAGE; /*if ($ignore_score_color) @@ -243,8 +249,9 @@ class UserDataGenerator return $scoredisplay->display_score($avgscore, $displaytype); } - private function build_result_column ($item, $ignore_score_color) { - $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()]; + private function build_result_column ($item, $ignore_score_color) + { + $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()]; $scoredisplay = ScoreDisplay :: instance(); $displaytype = SCORE_DIV_PERCENT; if ($ignore_score_color) { @@ -253,7 +260,8 @@ class UserDataGenerator return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_DEFAULT); } - private function build_mask_column ($item, $ignore_score_color) { + private function build_mask_column($item, $ignore_score_color) + { $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()]; $scoredisplay = ScoreDisplay :: instance(); $displaytype = SCORE_DIV_PERCENT; @@ -266,9 +274,9 @@ class UserDataGenerator private function get_course_name_from_code_cached ($coursecode) { if (isset ($this->coursecodecache) - && isset ($this->coursecodecache[$coursecode])) { - return $this->coursecodecache[$coursecode]; - } else { + && isset ($this->coursecodecache[$coursecode])) { + return $this->coursecodecache[$coursecode]; + } else { $name = get_course_name_from_code($coursecode); $this->coursecodecache[$coursecode] = $name; return $name; @@ -277,9 +285,9 @@ class UserDataGenerator private function get_category_cached ($category_id) { if (isset ($this->categorycache) - && isset ($this->categorycache[$category_id])) { - return $this->categorycache[$category_id]; - }else { + && isset ($this->categorycache[$category_id])) { + return $this->categorycache[$category_id]; + }else { $cat = Category::load($category_id); if (isset($cat)){ $this->categorycache[$category_id] = $cat[0]; @@ -290,14 +298,14 @@ class UserDataGenerator } private function get_category_name_to_display ($cat) { - if (isset($cat)) { - if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){ - return ''; - } else { - return $cat->get_name(); - } - } else { - return ''; - } + if (isset($cat)) { + if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){ + return ''; + } else { + return $cat->get_name(); + } + } else { + return ''; + } } }