@@ -7,12 +7,12 @@ discard block |
||
7 | 7 | require_once '../inc/global.inc.php'; |
8 | 8 | api_block_anonymous_users(); |
9 | 9 | GradebookUtils::block_students(); |
10 | -$select_eval=Security::remove_XSS($_GET['selecteval']); |
|
10 | +$select_eval = Security::remove_XSS($_GET['selecteval']); |
|
11 | 11 | if (empty($select_eval)) { |
12 | 12 | api_not_allowed(); |
13 | 13 | } |
14 | -$resultedit = Result :: load (null,null,$select_eval); |
|
15 | -$evaluation = Evaluation :: load ($select_eval); |
|
14 | +$resultedit = Result :: load(null, null, $select_eval); |
|
15 | +$evaluation = Evaluation :: load($select_eval); |
|
16 | 16 | |
17 | 17 | $evaluation[0]->check_lock_permissions(); |
18 | 18 | |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | $values = $edit_result_form->exportValues(); |
30 | 30 | $scores = ($values['score']); |
31 | 31 | foreach ($scores as $row) { |
32 | - $resultedit = Result :: load (key($scores)); |
|
32 | + $resultedit = Result :: load(key($scores)); |
|
33 | 33 | $row_value = $row; |
34 | - if ($row_value != '' ) { |
|
34 | + if ($row_value != '') { |
|
35 | 35 | $resultedit[0]->set_score(floatval(number_format($row_value, api_get_setting('gradebook_number_decimals')))); |
36 | 36 | $resultedit[0]->save(); |
37 | 37 | } |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | exit; |
42 | 42 | } |
43 | 43 | |
44 | -$interbreadcrumb[] = array ( |
|
44 | +$interbreadcrumb[] = array( |
|
45 | 45 | 'url' => $_SESSION['gradebook_dest'], |
46 | 46 | 'name' => get_lang('Gradebook') |
47 | 47 | ); |
48 | -$interbreadcrumb[]= array ( |
|
48 | +$interbreadcrumb[] = array( |
|
49 | 49 | 'url' => 'gradebook_view_result.php?selecteval='.$select_eval.'&'.api_get_cidreq(), |
50 | 50 | 'name' => get_lang('ViewResult') |
51 | 51 | ); |
52 | 52 | Display :: display_header(get_lang('EditResult')); |
53 | -DisplayGradebook::display_header_result($evaluation[0],null,0,0); |
|
53 | +DisplayGradebook::display_header_result($evaluation[0], null, 0, 0); |
|
54 | 54 | echo $table; |
55 | 55 | Display :: display_footer(); |
@@ -79,7 +79,7 @@ |
||
79 | 79 | |
80 | 80 | $submitted = isset($_POST['submitted']) ? $_POST['submitted'] : ''; |
81 | 81 | if ($submitted == 1) { |
82 | - Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />'; |
|
82 | + Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')).'<br /><br />'; |
|
83 | 83 | if (isset($_POST['evaluation'])) { |
84 | 84 | $eval_log = new Evaluation(); |
85 | 85 | } |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | api_block_anonymous_users(); |
12 | 12 | GradebookUtils::block_students(); |
13 | 13 | |
14 | -$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?','name' => get_lang('Gradebook')); |
|
15 | -$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details')); |
|
16 | -$interbreadcrumb[] = array ('url' => 'gradebook_showlog_link.php?visiblelink='.Security::remove_XSS($_GET['visiblelink']).'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('GradebookQualifyLog')); |
|
14 | +$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook')); |
|
15 | +$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('Details')); |
|
16 | +$interbreadcrumb[] = array('url' => 'gradebook_showlog_link.php?visiblelink='.Security::remove_XSS($_GET['visiblelink']).'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('GradebookQualifyLog')); |
|
17 | 17 | $this_section = SECTION_COURSES; |
18 | 18 | Display :: display_header(''); |
19 | 19 | echo '<div class="actions">'; |
@@ -22,21 +22,21 @@ discard block |
||
22 | 22 | |
23 | 23 | $t_user = Database :: get_main_table(TABLE_MAIN_USER); |
24 | 24 | $t_link_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); |
25 | -$visible_link=Security::remove_XSS($_GET['visiblelink']); |
|
25 | +$visible_link = Security::remove_XSS($_GET['visiblelink']); |
|
26 | 26 | $evaledit = EvalLink :: load($visible_link); |
27 | 27 | $sql = "SELECT lk.name,lk.description,lk.weight,lk.visible,lk.type,lk.created_at,us.username |
28 | 28 | FROM ".$t_link_log." lk inner join ".$t_user." us |
29 | 29 | ON lk.user_id_log=us.user_id |
30 | 30 | WHERE lk.id_linkeval_log=".$evaledit[0]->get_id()." AND lk.type='link';"; |
31 | -$result=Database::query($sql); |
|
32 | -$list_info=array(); |
|
33 | -while ($row=Database::fetch_row($result)) { |
|
31 | +$result = Database::query($sql); |
|
32 | +$list_info = array(); |
|
33 | +while ($row = Database::fetch_row($result)) { |
|
34 | 34 | $list_info[] = $row; |
35 | 35 | } |
36 | 36 | |
37 | -foreach($list_info as $key => $info_log) { |
|
38 | - $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A'; |
|
39 | - $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible'); |
|
37 | +foreach ($list_info as $key => $info_log) { |
|
38 | + $list_info[$key][5] = ($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A'; |
|
39 | + $list_info[$key][3] = ($info_log[3] == 1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $parameters = array( |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | 'selectcat' => Security::remove_XSS($_GET['selectcat']), |
45 | 45 | ); |
46 | 46 | |
47 | -$table = new SortableTableFromArrayConfig($list_info, 1,20,'gradebooklink'); |
|
47 | +$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'gradebooklink'); |
|
48 | 48 | $table->set_additional_parameters($parameters); |
49 | 49 | $table->set_header(0, get_lang('GradebookNameLog')); |
50 | 50 | $table->set_header(1, get_lang('GradebookDescriptionLog')); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | 'actions', |
37 | 37 | Display::toolbarButton( |
38 | 38 | get_lang('SearchCertificates'), |
39 | - api_get_path(WEB_CODE_PATH) . "gradebook/search.php", |
|
39 | + api_get_path(WEB_CODE_PATH)."gradebook/search.php", |
|
40 | 40 | 'search', |
41 | 41 | 'info' |
42 | 42 | ) |
@@ -11,20 +11,20 @@ discard block |
||
11 | 11 | GradebookUtils::block_students(); |
12 | 12 | $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); |
13 | 13 | //selected name of database |
14 | -$course_id = GradebookUtils::get_course_id_by_link_id($_GET['editlink']); |
|
15 | -$tbl_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD); |
|
16 | -$tbl_work = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); |
|
17 | -$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); |
|
14 | +$course_id = GradebookUtils::get_course_id_by_link_id($_GET['editlink']); |
|
15 | +$tbl_forum_thread = Database :: get_course_table(TABLE_FORUM_THREAD); |
|
16 | +$tbl_work = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); |
|
17 | +$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); |
|
18 | 18 | |
19 | -$linkarray = LinkFactory :: load($_GET['editlink']); |
|
19 | +$linkarray = LinkFactory :: load($_GET['editlink']); |
|
20 | 20 | /** @var AbstractLink $link */ |
21 | 21 | $link = $linkarray[0]; |
22 | 22 | if ($link->is_locked() && !api_is_platform_admin()) { |
23 | 23 | api_not_allowed(); |
24 | 24 | } |
25 | 25 | |
26 | -$linkcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']):''; |
|
27 | -$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']):''; |
|
26 | +$linkcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : ''; |
|
27 | +$linkedit = isset($_GET['editlink']) ? Security::remove_XSS($_GET['editlink']) : ''; |
|
28 | 28 | |
29 | 29 | $session_id = api_get_session_id(); |
30 | 30 | if ($session_id == 0) { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | null, |
40 | 40 | $link, |
41 | 41 | 'edit_link_form', |
42 | - api_get_self() . '?selectcat=' . $linkcat. '&editlink=' . $linkedit.'&'.api_get_cidreq() |
|
42 | + api_get_self().'?selectcat='.$linkcat.'&editlink='.$linkedit.'&'.api_get_cidreq() |
|
43 | 43 | ); |
44 | 44 | if ($form->validate()) { |
45 | 45 | $values = $form->exportValues(); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | //Update weight for attendance |
59 | 59 | $sql = 'SELECT ref_id FROM '.$tbl_grade_links.' |
60 | 60 | WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE; |
61 | - $rs_attendance = Database::query($sql); |
|
61 | + $rs_attendance = Database::query($sql); |
|
62 | 62 | if (Database::num_rows($rs_attendance) > 0) { |
63 | 63 | $row_attendance = Database::fetch_array($rs_attendance); |
64 | 64 | $attendance_id = $row_attendance['ref_id']; |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | weight='.$final_weight.' |
82 | 82 | WHERE c_id = '.$course_id.' AND id = ( |
83 | 83 | SELECT ref_id FROM '.$tbl_grade_links.' |
84 | - WHERE id='.intval($_GET['editlink'] ).' AND type=3 |
|
84 | + WHERE id='.intval($_GET['editlink']).' AND type=3 |
|
85 | 85 | )'; |
86 | 86 | |
87 | 87 | Database::query($sql_t); |
88 | - header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id().'&'.api_get_cidreq()); |
|
88 | + header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat='.$link->get_category_id().'&'.api_get_cidreq()); |
|
89 | 89 | exit; |
90 | 90 | } |
91 | 91 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | if (!$isDrhOfCourse) { |
17 | 17 | GradebookUtils::block_students(); |
18 | 18 | } |
19 | -$interbreadcrumb[]= array ( |
|
19 | +$interbreadcrumb[] = array( |
|
20 | 20 | 'url' => $_SESSION['gradebook_dest'], |
21 | 21 | 'name' => get_lang('Gradebook' |
22 | 22 | )); |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | $alllinks = $category[0]->get_links($my_user_id, true); |
28 | 28 | |
29 | 29 | if ($_GET['selectcat'] != null) { |
30 | - $addparams= array ( |
|
30 | + $addparams = array( |
|
31 | 31 | 'userid' => $my_user_id, |
32 | 32 | 'selectcat' => Security::remove_XSS($_GET['selectcat']) |
33 | 33 | ); |
34 | 34 | } else { |
35 | - $addparams= array ( |
|
35 | + $addparams = array( |
|
36 | 36 | 'userid' => $my_user_id, |
37 | 37 | 'selecteval' => Security::remove_XSS($_GET['selecteval']) |
38 | 38 | ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $newarray[] = array_slice($data, 1); |
50 | 50 | } |
51 | 51 | $userinfo = api_get_user_info($my_user_id); |
52 | - $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')'; |
|
52 | + $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')'; |
|
53 | 53 | |
54 | 54 | if ($displayscore->is_custom()) { |
55 | 55 | $header_names = array( |
@@ -95,23 +95,23 @@ discard block |
||
95 | 95 | $actions = '<div class="actions">'; |
96 | 96 | |
97 | 97 | if (isset($_GET['selectcat'])) { |
98 | - $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView')); |
|
99 | - $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
98 | + $interbreadcrumb[] = array('url' => 'gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView')); |
|
99 | + $actions .= '<a href=gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'>'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | if (isset ($_GET['selecteval'])) { |
103 | - $interbreadcrumb[]= array ( |
|
104 | - 'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']), |
|
103 | + $interbreadcrumb[] = array( |
|
104 | + 'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']), |
|
105 | 105 | 'name' => get_lang('ViewResult' |
106 | 106 | )); |
107 | - $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '> |
|
108 | - '.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
107 | + $actions .= '<a href=gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'> |
|
108 | + '.Display::return_icon('back.png', get_lang('BackToEvaluation'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
109 | 109 | } |
110 | 110 | |
111 | -$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank"> |
|
112 | -' . Display::return_icon('pdf.png', get_lang('ExportPDF'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
111 | +$actions .= '<a href="'.api_get_self().'?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat='.$category[0]->get_id().'" target="_blank"> |
|
112 | +' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
113 | 113 | |
114 | -$actions.='</div>'; |
|
114 | +$actions .= '</div>'; |
|
115 | 115 | |
116 | 116 | Display :: display_header(get_lang('ResultsPerUser')); |
117 | 117 | echo $actions; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | null, |
31 | 31 | 'add_eval_form', |
32 | 32 | null, |
33 | - api_get_self() . '?selectcat=' . $select_cat.'&'.api_get_cidreq() |
|
33 | + api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq() |
|
34 | 34 | ); |
35 | 35 | |
36 | 36 | if ($form->validate()) { |
@@ -69,23 +69,23 @@ discard block |
||
69 | 69 | //header('Location: gradebook_add_user.php?selecteval=' . $eval->get_id()); |
70 | 70 | exit; |
71 | 71 | } else { |
72 | - header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq()); |
|
72 | + header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq()); |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 | } else { |
76 | 76 | $val_addresult = isset($values['addresult']) ? $values['addresult'] : null; |
77 | 77 | if ($val_addresult == 1) { |
78 | - header('Location: gradebook_add_result.php?selecteval=' . $eval->get_id().'&'.api_get_cidreq()); |
|
78 | + header('Location: gradebook_add_result.php?selecteval='.$eval->get_id().'&'.api_get_cidreq()); |
|
79 | 79 | exit; |
80 | 80 | } else { |
81 | - header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq()); |
|
81 | + header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq()); |
|
82 | 82 | exit; |
83 | 83 | } |
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | 87 | $interbreadcrumb[] = array( |
88 | - 'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat.'&'.api_get_cidreq(), |
|
88 | + 'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat.'&'.api_get_cidreq(), |
|
89 | 89 | 'name' => get_lang('Gradebook')) |
90 | 90 | ; |
91 | 91 | $this_section = SECTION_COURSES; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $("#hid_category_id option:selected").each(function () { |
97 | 97 | var cat_id = $(this).val(); |
98 | 98 | $.ajax({ |
99 | - url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight", |
|
99 | + url: "' . api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight", |
|
100 | 100 | data: "cat_id="+cat_id, |
101 | 101 | success: function(return_value) { |
102 | 102 | if (return_value != 0 ) { |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | require_once '../inc/global.inc.php'; |
10 | -$current_course_tool = TOOL_GRADEBOOK; |
|
10 | +$current_course_tool = TOOL_GRADEBOOK; |
|
11 | 11 | |
12 | 12 | api_protect_course_script(true); |
13 | 13 | api_block_anonymous_users(); |
@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | $catadd = new Category(); |
17 | 17 | $catadd->set_user_id(api_get_user_id()); |
18 | 18 | $catadd->set_parent_id($_GET['selectcat']); |
19 | -$catcourse = Category :: load ($_GET['selectcat']); |
|
19 | +$catcourse = Category :: load($_GET['selectcat']); |
|
20 | 20 | $form = new CatForm( |
21 | 21 | CatForm :: TYPE_SELECT_COURSE, |
22 | 22 | $catadd, |
23 | 23 | 'add_cat_form', |
24 | 24 | null, |
25 | - api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq() |
|
25 | + api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq() |
|
26 | 26 | ); |
27 | 27 | |
28 | 28 | if ($form->validate()) { |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | $cat = new Category(); |
31 | 31 | $cat->set_course_code($values['select_course']); |
32 | 32 | $cat->set_name($values['name']); |
33 | - header('location: gradebook_add_link.php?selectcat=' .Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq()); |
|
33 | + header('location: gradebook_add_link.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq()); |
|
34 | 34 | exit; |
35 | 35 | } |
36 | 36 | |
37 | -$interbreadcrumb[] = array ( |
|
37 | +$interbreadcrumb[] = array( |
|
38 | 38 | 'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq(), |
39 | 39 | 'name' => get_lang('Gradebook') |
40 | 40 | ); |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | } |
52 | 52 | if (count($result) == 0) { |
53 | - $evals_filtered=$evals; |
|
53 | + $evals_filtered = $evals; |
|
54 | 54 | } else { |
55 | - $evals_filtered=$evals_filtered_copy; |
|
55 | + $evals_filtered = $evals_filtered_copy; |
|
56 | 56 | } |
57 | 57 | $this->items = array_merge($evals_filtered, $links); |
58 | 58 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | { |
86 | 86 | // do some checks on count, redefine if invalid value |
87 | 87 | if (!isset($count)) { |
88 | - $count = count ($this->items) - $start; |
|
88 | + $count = count($this->items) - $start; |
|
89 | 89 | } |
90 | 90 | if ($count < 0) { |
91 | 91 | $count = 0; |
@@ -104,20 +104,20 @@ discard block |
||
104 | 104 | } elseif ($sorting & self :: UDG_SORT_AVERAGE) { |
105 | 105 | // if user sorts on average scores, first calculate them and cache them |
106 | 106 | foreach ($allitems as $item) { |
107 | - $this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score(); |
|
107 | + $this->avgcache[$item->get_item_type().$item->get_id()] = $item->calc_score(); |
|
108 | 108 | } |
109 | 109 | usort($allitems, array('UserDataGenerator', 'sort_by_average')); |
110 | 110 | } elseif ($sorting & self :: UDG_SORT_SCORE) { |
111 | 111 | // if user sorts on student's scores, first calculate them and cache them |
112 | 112 | foreach ($allitems as $item) { |
113 | - $this->scorecache[$item->get_item_type() . $item->get_id()] |
|
113 | + $this->scorecache[$item->get_item_type().$item->get_id()] |
|
114 | 114 | = $item->calc_score($this->userid); |
115 | 115 | } |
116 | 116 | usort($allitems, array('UserDataGenerator', 'sort_by_score')); |
117 | 117 | } elseif ($sorting & self :: UDG_SORT_MASK) { |
118 | 118 | // if user sorts on student's masks, first calculate scores and cache them |
119 | 119 | foreach ($allitems as $item) { |
120 | - $this->scorecache[$item->get_item_type() . $item->get_id()] |
|
120 | + $this->scorecache[$item->get_item_type().$item->get_id()] |
|
121 | 121 | = $item->calc_score($this->userid); |
122 | 122 | } |
123 | 123 | usort($allitems, array('UserDataGenerator', 'sort_by_mask')); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | // fill score cache if not done yet |
133 | 133 | if (!isset ($this->scorecache)) { |
134 | 134 | foreach ($visibleitems as $item) { |
135 | - $this->scorecache[$item->get_item_type() . $item->get_id()] |
|
135 | + $this->scorecache[$item->get_item_type().$item->get_id()] |
|
136 | 136 | = $item->calc_score($this->userid); |
137 | 137 | } |
138 | 138 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $scoredisplay = ScoreDisplay :: instance(); |
142 | 142 | $data = array(); |
143 | 143 | foreach ($visibleitems as $item) { |
144 | - $row = array (); |
|
144 | + $row = array(); |
|
145 | 145 | $row[] = $item; |
146 | 146 | $row[] = $item->get_name(); |
147 | 147 | $row[] = $this->build_course_name($item); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | function sort_by_type($item1, $item2) |
164 | 164 | { |
165 | 165 | if ($item1->get_item_type() == $item2->get_item_type()) { |
166 | - return $this->sort_by_name($item1,$item2); |
|
166 | + return $this->sort_by_name($item1, $item2); |
|
167 | 167 | } else { |
168 | 168 | return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1); |
169 | 169 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | function sort_by_name($item1, $item2) |
205 | 205 | { |
206 | - return api_strnatcmp($item1->get_name(),$item2->get_name()); |
|
206 | + return api_strnatcmp($item1->get_name(), $item2->get_name()); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | /** |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | */ |
214 | 214 | function sort_by_average($item1, $item2) |
215 | 215 | { |
216 | - $score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()]; |
|
217 | - $score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()]; |
|
216 | + $score1 = $this->avgcache[$item1->get_item_type().$item1->get_id()]; |
|
217 | + $score2 = $this->avgcache[$item2->get_item_type().$item2->get_id()]; |
|
218 | 218 | |
219 | 219 | return $this->compare_scores($score1, $score2); |
220 | 220 | } |
@@ -226,8 +226,8 @@ discard block |
||
226 | 226 | */ |
227 | 227 | function sort_by_score($item1, $item2) |
228 | 228 | { |
229 | - $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()]; |
|
230 | - $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()]; |
|
229 | + $score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()]; |
|
230 | + $score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()]; |
|
231 | 231 | |
232 | 232 | return $this->compare_scores($score1, $score2); |
233 | 233 | } |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | */ |
240 | 240 | function sort_by_mask($item1, $item2) |
241 | 241 | { |
242 | - $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()]; |
|
243 | - $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()]; |
|
242 | + $score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()]; |
|
243 | + $score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()]; |
|
244 | 244 | |
245 | 245 | return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2); |
246 | 246 | } |
@@ -256,10 +256,10 @@ discard block |
||
256 | 256 | return (isset($score2) ? 1 : 0); |
257 | 257 | } elseif (!isset($score2)) { |
258 | 258 | return -1; |
259 | - } elseif (($score1[0]/$score1[1]) == ($score2[0]/$score2[1])) { |
|
259 | + } elseif (($score1[0] / $score1[1]) == ($score2[0] / $score2[1])) { |
|
260 | 260 | return 0; |
261 | 261 | } else { |
262 | - return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1); |
|
262 | + return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1); |
|
263 | 263 | } |
264 | 264 | } |
265 | 265 | |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | private function build_average_column($item, $ignore_score_color) |
292 | 292 | { |
293 | 293 | if (isset($this->avgcache)) { |
294 | - $avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()]; |
|
294 | + $avgscore = $this->avgcache[$item->get_item_type().$item->get_id()]; |
|
295 | 295 | } else { |
296 | 296 | $avgscore = $item->calc_score(); |
297 | 297 | } |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | */ |
312 | 312 | private function build_result_column($item, $ignore_score_color) |
313 | 313 | { |
314 | - $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()]; |
|
314 | + $studscore = $this->scorecache[$item->get_item_type().$item->get_id()]; |
|
315 | 315 | $scoredisplay = ScoreDisplay :: instance(); |
316 | 316 | $displaytype = SCORE_DIV_PERCENT; |
317 | 317 | if ($ignore_score_color) { |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | */ |
329 | 329 | private function build_mask_column($item, $ignore_score_color) |
330 | 330 | { |
331 | - $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()]; |
|
331 | + $studscore = $this->scorecache[$item->get_item_type().$item->get_id()]; |
|
332 | 332 | $scoredisplay = ScoreDisplay :: instance(); |
333 | 333 | $displaytype = SCORE_DIV_PERCENT; |
334 | 334 | if ($ignore_score_color) { |
@@ -362,12 +362,12 @@ discard block |
||
362 | 362 | if (isset ($this->categorycache) |
363 | 363 | && isset ($this->categorycache[$category_id])) { |
364 | 364 | return $this->categorycache[$category_id]; |
365 | - }else { |
|
365 | + } else { |
|
366 | 366 | $cat = Category::load($category_id); |
367 | - if (isset($cat)){ |
|
367 | + if (isset($cat)) { |
|
368 | 368 | $this->categorycache[$category_id] = $cat[0]; |
369 | 369 | return $cat[0]; |
370 | - }else |
|
370 | + } else |
|
371 | 371 | return null; |
372 | 372 | } |
373 | 373 | } |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | private function get_category_name_to_display($cat) |
380 | 380 | { |
381 | 381 | if (isset($cat)) { |
382 | - if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){ |
|
382 | + if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null) { |
|
383 | 383 | return ''; |
384 | 384 | } else { |
385 | 385 | return $cat->get_name(); |