@@ -15,7 +15,7 @@ |
||
15 | 15 | Display::return_message(get_lang('SkillNotFound'), 'error') |
16 | 16 | ); |
17 | 17 | |
18 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
18 | + header('Location: '.api_get_path(WEB_PATH)); |
|
19 | 19 | exit; |
20 | 20 | } |
21 | 21 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0; |
13 | 13 | |
14 | 14 | if (!isset($_GET['user'], $_GET['skill'])) { |
15 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
15 | + header('Location: '.api_get_path(WEB_PATH)); |
|
16 | 16 | exit; |
17 | 17 | } |
18 | 18 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | Display::return_message(get_lang('NoResults'), 'error') |
26 | 26 | ); |
27 | 27 | |
28 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
28 | + header('Location: '.api_get_path(WEB_PATH)); |
|
29 | 29 | exit; |
30 | 30 | } |
31 | 31 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | Display::return_message(get_lang('TheUserXNotYetAchievedTheSkillX'), 'error') |
41 | 41 | ); |
42 | 42 | |
43 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
43 | + header('Location: '.api_get_path(WEB_PATH)); |
|
44 | 44 | exit; |
45 | 45 | } |
46 | 46 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | 'date_issued' => api_format_date($userSkillDate, DATE_TIME_FORMAT_LONG) |
79 | 79 | ]; |
80 | 80 | |
81 | - $assertionUrl = api_get_path(WEB_CODE_PATH) . "badge/assertion.php?"; |
|
81 | + $assertionUrl = api_get_path(WEB_CODE_PATH)."badge/assertion.php?"; |
|
82 | 82 | $assertionUrl .= http_build_query(array( |
83 | 83 | 'user' => $user->getId(), |
84 | 84 | 'skill' => $skill->getId(), |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | $backpack = $configBackpack; |
101 | 101 | } |
102 | 102 | |
103 | - $htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>'; |
|
103 | + $htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>'; |
|
104 | 104 | } |
105 | 105 | $objSkill = new Skill(); |
106 | 106 | $skills = $objSkill->get($skillId); |
107 | -$unbakedBadge = api_get_path(SYS_UPLOAD_PATH) . "badges/".$skills['icon']; |
|
107 | +$unbakedBadge = api_get_path(SYS_UPLOAD_PATH)."badges/".$skills['icon']; |
|
108 | 108 | |
109 | 109 | $unbakedBadge = file_get_contents($unbakedBadge); |
110 | 110 | $badgeInfoError = false; |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | mkdir($bakedBadge, api_get_permissions_for_new_directories(), true); |
120 | 120 | } |
121 | 121 | $skillRelUserId = $userSkills[0]->getId(); |
122 | - if (!file_exists($bakedBadge . "/badge_" . $skillRelUserId)) { |
|
123 | - file_put_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png", $bakedInfo); |
|
122 | + if (!file_exists($bakedBadge."/badge_".$skillRelUserId)) { |
|
123 | + file_put_contents($bakedBadge."/badge_".$skillRelUserId.".png", $bakedInfo); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | //Process to validate a baked badge |
127 | - $badgeContent = file_get_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png"); |
|
127 | + $badgeContent = file_get_contents($bakedBadge."/badge_".$skillRelUserId.".png"); |
|
128 | 128 | $verifyBakedBadge = $png->extractBadgeInfo($badgeContent); |
129 | 129 | if (!is_array($verifyBakedBadge)) { |
130 | 130 | $badgeInfoError = true; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | if (!$badgeInfoError) { |
134 | 134 | $personalBadge = UserManager::getUserPathById($userId, "web"); |
135 | - $personalBadge = $personalBadge."badges/badge_" . $skillRelUserId . ".png"; |
|
135 | + $personalBadge = $personalBadge."badges/badge_".$skillRelUserId.".png"; |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 |
@@ -53,10 +53,10 @@ |
||
53 | 53 | $table_header[] = array('tag', true); |
54 | 54 | $table_header[] = array('attributes', false); |
55 | 55 | foreach ($tags as $tag => & $attributes) { |
56 | - $row = array(); |
|
57 | - $row[] = '<kbd>'.$tag.'</kbd>'; |
|
58 | - $row[] = '<kbd> '.implode(', ', array_keys($attributes)).'</kbd>'; |
|
59 | - $table_data[] = $row; |
|
56 | + $row = array(); |
|
57 | + $row[] = '<kbd>'.$tag.'</kbd>'; |
|
58 | + $row[] = '<kbd> '.implode(', ', array_keys($attributes)).'</kbd>'; |
|
59 | + $table_data[] = $row; |
|
60 | 60 | } |
61 | 61 | Display::display_sortable_table($table_header, $table_data, array(), array(), array('fullpage' => intval($_GET['fullpage']))); |
62 | 62 | ?> |
@@ -41,9 +41,9 @@ |
||
41 | 41 | $form->display(); |
42 | 42 | } |
43 | 43 | } else { |
44 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | - $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
|
46 | - echo $faq_content; |
|
44 | + $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | + $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
|
46 | + echo $faq_content; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | Display::display_footer(); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | $form = new FormValidator('set_faq', 'post', 'faq.php?edit=true'); |
24 | 24 | $form->addHtmlEditor('faq_content', null, false, false, array('ToolbarSet' => 'FAQ', 'Width' => '100%', 'Height' => '300')); |
25 | 25 | $form->addButtonSave(get_lang('Ok'), 'faq_submit'); |
26 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html'); |
|
26 | + $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html'); |
|
27 | 27 | $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
28 | 28 | $form->setDefaults(array('faq_content' => $faq_content)); |
29 | 29 | if ($form->validate()) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $form->display(); |
42 | 42 | } |
43 | 43 | } else { |
44 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
44 | + $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | 45 | $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
46 | 46 | echo $faq_content; |
47 | 47 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | |
15 | 15 | // load templates |
16 | 16 | function reports_loadTemplates() { |
17 | - global $reports_enabled_templates, $reports_template; |
|
18 | - foreach ($reports_enabled_templates as $t) |
|
19 | - require_once 'templates/'.$t.'.reports.php'; |
|
17 | + global $reports_enabled_templates, $reports_template; |
|
18 | + foreach ($reports_enabled_templates as $t) |
|
19 | + require_once 'templates/'.$t.'.reports.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
@@ -149,18 +149,18 @@ discard block |
||
149 | 149 | */ |
150 | 150 | // return tools ID (parametre is a constant from main_api |
151 | 151 | function reports_getToolId($tool) { |
152 | - $tools = array_flip(api_get_tools_lists()); |
|
153 | - if (array_key_exists($tool, $tools)) |
|
154 | - return $tools[$tool]; |
|
155 | - else |
|
156 | - return null; |
|
152 | + $tools = array_flip(api_get_tools_lists()); |
|
153 | + if (array_key_exists($tool, $tools)) |
|
154 | + return $tools[$tool]; |
|
155 | + else |
|
156 | + return null; |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 160 | // current user is authorized to reed |
161 | 161 | function reports_getVisibilitySQL () { |
162 | - return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
|
163 | - // fixme sessions |
|
162 | + return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
|
163 | + // fixme sessions |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | // this function execute keys_query (SQL statement) |
@@ -3,11 +3,11 @@ discard block |
||
3 | 3 | require_once '../inc/global.inc.php'; |
4 | 4 | |
5 | 5 | |
6 | -define ('REPORTS_PROGRESS_COMPLETED', 1); |
|
6 | +define('REPORTS_PROGRESS_COMPLETED', 1); |
|
7 | 7 | |
8 | 8 | $reports_modules = array(); |
9 | 9 | |
10 | -$reports_enabled_modules = array('quiz','course','scorm'); |
|
10 | +$reports_enabled_modules = array('quiz', 'course', 'scorm'); |
|
11 | 11 | |
12 | 12 | $reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate'); |
13 | 13 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 160 | // current user is authorized to reed |
161 | -function reports_getVisibilitySQL () { |
|
161 | +function reports_getVisibilitySQL() { |
|
162 | 162 | return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
163 | 163 | // fixme sessions |
164 | 164 | } |
@@ -15,9 +15,10 @@ discard block |
||
15 | 15 | // load templates |
16 | 16 | function reports_loadTemplates() { |
17 | 17 | global $reports_enabled_templates, $reports_template; |
18 | - foreach ($reports_enabled_templates as $t) |
|
19 | - require_once 'templates/'.$t.'.reports.php'; |
|
20 | -} |
|
18 | + foreach ($reports_enabled_templates as $t) { |
|
19 | + require_once 'templates/'.$t.'.reports.php'; |
|
20 | + } |
|
21 | + } |
|
21 | 22 | |
22 | 23 | |
23 | 24 | // clear all reporting data |
@@ -150,11 +151,12 @@ discard block |
||
150 | 151 | // return tools ID (parametre is a constant from main_api |
151 | 152 | function reports_getToolId($tool) { |
152 | 153 | $tools = array_flip(api_get_tools_lists()); |
153 | - if (array_key_exists($tool, $tools)) |
|
154 | - return $tools[$tool]; |
|
155 | - else |
|
156 | - return null; |
|
157 | -} |
|
154 | + if (array_key_exists($tool, $tools)) { |
|
155 | + return $tools[$tool]; |
|
156 | + } else { |
|
157 | + return null; |
|
158 | + } |
|
159 | + } |
|
158 | 160 | |
159 | 161 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 162 | // current user is authorized to reed |
@@ -134,14 +134,14 @@ |
||
134 | 134 | <select class="input_field_12em link required" name="type" id="type"> |
135 | 135 | <?php |
136 | 136 | foreach ($reports_template as $key => $value) { |
137 | - echo '<option value="'.$key.'">'.$value['description'].'</option>'; |
|
137 | + echo '<option value="'.$key.'">'.$value['description'].'</option>'; |
|
138 | 138 | } |
139 | 139 | ?> |
140 | 140 | </select><br /> |
141 | 141 | </span> |
142 | 142 | <?php |
143 | 143 | foreach ($reports_template as $key => $value) { |
144 | - echo $value['wizard']; |
|
144 | + echo $value['wizard']; |
|
145 | 145 | } |
146 | 146 | ?> |
147 | 147 | <span id="format" class="step submit_step"> |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $this_section = SECTION_REPORTS; |
23 | 23 | |
24 | 24 | // setting the name of the tool |
25 | -$tool_name=get_lang('Reports'); |
|
25 | +$tool_name = get_lang('Reports'); |
|
26 | 26 | |
27 | 27 | // Displaying the header |
28 | 28 | foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) |
@@ -25,8 +25,9 @@ |
||
25 | 25 | $tool_name=get_lang('Reports'); |
26 | 26 | |
27 | 27 | // Displaying the header |
28 | -foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) |
|
28 | +foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) { |
|
29 | 29 | $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n"; |
30 | +} |
|
30 | 31 | |
31 | 32 | // FIXME |
32 | 33 | $htmlHeadXtra[] = ' <style type="text/css"> |
@@ -2,62 +2,62 @@ |
||
2 | 2 | |
3 | 3 | // get fields informations |
4 | 4 | function multiquery_query($array) { |
5 | - $result = array(); |
|
6 | - $field = 0; |
|
7 | - for ($i = 0; $i <sizeof($array); $i++) { |
|
8 | - // mysql handler |
|
9 | - $result[$i]['mysql'] = mysql_query($array[$i]); |
|
10 | - |
|
11 | - if (! $result[$i]['mysql']) |
|
12 | - die("error in query $i : ".$array[$i]); |
|
13 | - |
|
14 | - // fields |
|
15 | - $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']); |
|
16 | - for ($j = 0; $j < $result[$i]['num_fields']; $j++) { |
|
17 | - $name = mysql_field_name($result[$i]['mysql'], $j); |
|
18 | - $result['field'][$field]['query']=$i; |
|
19 | - $result['field'][$field]['name']=$name; |
|
20 | - $result['field'][$field]['id']=$j; |
|
21 | - $result['field_assoc'][$name][$field]; |
|
22 | - $field++; |
|
23 | - } |
|
24 | - } |
|
25 | - $result['num_queries'] = sizeof($array); |
|
26 | - // rows |
|
27 | - $numberOfResult = mysql_num_rows($result[0]['mysql']); |
|
28 | - for ($i = 1; $i <$result['num_queries']; $i++) |
|
29 | - if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
30 | - die("wrong number of row: $numberOfResult vs ". |
|
31 | - mysql_num_rows($result[$i]['mysql'])." on query $i"); |
|
32 | - |
|
33 | - $result['num_rows'] = $numberOfResult; |
|
34 | - $result['num_fields'] = $field; |
|
35 | - |
|
36 | - return $result; |
|
5 | + $result = array(); |
|
6 | + $field = 0; |
|
7 | + for ($i = 0; $i <sizeof($array); $i++) { |
|
8 | + // mysql handler |
|
9 | + $result[$i]['mysql'] = mysql_query($array[$i]); |
|
10 | + |
|
11 | + if (! $result[$i]['mysql']) |
|
12 | + die("error in query $i : ".$array[$i]); |
|
13 | + |
|
14 | + // fields |
|
15 | + $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']); |
|
16 | + for ($j = 0; $j < $result[$i]['num_fields']; $j++) { |
|
17 | + $name = mysql_field_name($result[$i]['mysql'], $j); |
|
18 | + $result['field'][$field]['query']=$i; |
|
19 | + $result['field'][$field]['name']=$name; |
|
20 | + $result['field'][$field]['id']=$j; |
|
21 | + $result['field_assoc'][$name][$field]; |
|
22 | + $field++; |
|
23 | + } |
|
24 | + } |
|
25 | + $result['num_queries'] = sizeof($array); |
|
26 | + // rows |
|
27 | + $numberOfResult = mysql_num_rows($result[0]['mysql']); |
|
28 | + for ($i = 1; $i <$result['num_queries']; $i++) |
|
29 | + if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
30 | + die("wrong number of row: $numberOfResult vs ". |
|
31 | + mysql_num_rows($result[$i]['mysql'])." on query $i"); |
|
32 | + |
|
33 | + $result['num_rows'] = $numberOfResult; |
|
34 | + $result['num_fields'] = $field; |
|
35 | + |
|
36 | + return $result; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | function multiquery_num_rows(&$mq_h) { |
40 | - return $mq_h['num_rows']; |
|
40 | + return $mq_h['num_rows']; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | function multiquery_num_fields(&$mq_h) { |
44 | - return $mq_h['num_fields']; |
|
44 | + return $mq_h['num_fields']; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | function multiquery_field_name(&$mq_h, $id) { |
48 | - return $mq_h['field'][$id]['name']; |
|
48 | + return $mq_h['field'][$id]['name']; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | function multiquery_fetch_row(&$mq_h) { |
52 | - $result = array(); |
|
53 | - $pos = 0; |
|
54 | - for ($i = 0; $i < $mq_h['num_queries']; $i++) { |
|
55 | - $row = mysql_fetch_row($mq_h[$i]['mysql']); |
|
56 | - if (!$row) return false; // last line |
|
57 | - for ($j = 0; $j < sizeof($row); $j++) { |
|
58 | - $result[$pos] = $row[$j]; |
|
59 | - $pos++; |
|
60 | - } |
|
61 | - } |
|
62 | - return $result; |
|
52 | + $result = array(); |
|
53 | + $pos = 0; |
|
54 | + for ($i = 0; $i < $mq_h['num_queries']; $i++) { |
|
55 | + $row = mysql_fetch_row($mq_h[$i]['mysql']); |
|
56 | + if (!$row) return false; // last line |
|
57 | + for ($j = 0; $j < sizeof($row); $j++) { |
|
58 | + $result[$pos] = $row[$j]; |
|
59 | + $pos++; |
|
60 | + } |
|
61 | + } |
|
62 | + return $result; |
|
63 | 63 | } |
@@ -4,20 +4,20 @@ discard block |
||
4 | 4 | function multiquery_query($array) { |
5 | 5 | $result = array(); |
6 | 6 | $field = 0; |
7 | - for ($i = 0; $i <sizeof($array); $i++) { |
|
7 | + for ($i = 0; $i < sizeof($array); $i++) { |
|
8 | 8 | // mysql handler |
9 | 9 | $result[$i]['mysql'] = mysql_query($array[$i]); |
10 | 10 | |
11 | - if (! $result[$i]['mysql']) |
|
11 | + if (!$result[$i]['mysql']) |
|
12 | 12 | die("error in query $i : ".$array[$i]); |
13 | 13 | |
14 | 14 | // fields |
15 | 15 | $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']); |
16 | 16 | for ($j = 0; $j < $result[$i]['num_fields']; $j++) { |
17 | 17 | $name = mysql_field_name($result[$i]['mysql'], $j); |
18 | - $result['field'][$field]['query']=$i; |
|
19 | - $result['field'][$field]['name']=$name; |
|
20 | - $result['field'][$field]['id']=$j; |
|
18 | + $result['field'][$field]['query'] = $i; |
|
19 | + $result['field'][$field]['name'] = $name; |
|
20 | + $result['field'][$field]['id'] = $j; |
|
21 | 21 | $result['field_assoc'][$name][$field]; |
22 | 22 | $field++; |
23 | 23 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $result['num_queries'] = sizeof($array); |
26 | 26 | // rows |
27 | 27 | $numberOfResult = mysql_num_rows($result[0]['mysql']); |
28 | - for ($i = 1; $i <$result['num_queries']; $i++) |
|
28 | + for ($i = 1; $i < $result['num_queries']; $i++) |
|
29 | 29 | if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
30 | 30 | die("wrong number of row: $numberOfResult vs ". |
31 | 31 | mysql_num_rows($result[$i]['mysql'])." on query $i"); |
@@ -8,8 +8,9 @@ discard block |
||
8 | 8 | // mysql handler |
9 | 9 | $result[$i]['mysql'] = mysql_query($array[$i]); |
10 | 10 | |
11 | - if (! $result[$i]['mysql']) |
|
12 | - die("error in query $i : ".$array[$i]); |
|
11 | + if (! $result[$i]['mysql']) { |
|
12 | + die("error in query $i : ".$array[$i]); |
|
13 | + } |
|
13 | 14 | |
14 | 15 | // fields |
15 | 16 | $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']); |
@@ -25,10 +26,11 @@ discard block |
||
25 | 26 | $result['num_queries'] = sizeof($array); |
26 | 27 | // rows |
27 | 28 | $numberOfResult = mysql_num_rows($result[0]['mysql']); |
28 | - for ($i = 1; $i <$result['num_queries']; $i++) |
|
29 | - if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
29 | + for ($i = 1; $i <$result['num_queries']; $i++) { |
|
30 | + if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
30 | 31 | die("wrong number of row: $numberOfResult vs ". |
31 | 32 | mysql_num_rows($result[$i]['mysql'])." on query $i"); |
33 | + } |
|
32 | 34 | |
33 | 35 | $result['num_rows'] = $numberOfResult; |
34 | 36 | $result['num_fields'] = $field; |
@@ -53,7 +55,10 @@ discard block |
||
53 | 55 | $pos = 0; |
54 | 56 | for ($i = 0; $i < $mq_h['num_queries']; $i++) { |
55 | 57 | $row = mysql_fetch_row($mq_h[$i]['mysql']); |
56 | - if (!$row) return false; // last line |
|
58 | + if (!$row) { |
|
59 | + return false; |
|
60 | + } |
|
61 | + // last line |
|
57 | 62 | for ($j = 0; $j < sizeof($row); $j++) { |
58 | 63 | $result[$pos] = $row[$j]; |
59 | 64 | $pos++; |
@@ -7,27 +7,27 @@ |
||
7 | 7 | } |
8 | 8 | |
9 | 9 | function reports_modules_quiz_init_forEachCourses($course_code, $course_id, $course_db) { |
10 | - global $reports_modules; |
|
10 | + global $reports_modules; |
|
11 | 11 | |
12 | - $reports_modules_quiz_toolid = reports_getToolId(TOOL_QUIZ); |
|
12 | + $reports_modules_quiz_toolid = reports_getToolId(TOOL_QUIZ); |
|
13 | 13 | |
14 | - array_push($reports_modules['quiz'], |
|
15 | - array('keys_query' => |
|
16 | - 'select '.$course_id.' as course_id, '. |
|
17 | - $reports_modules_quiz_toolid.' as tool_id, '. |
|
18 | - 'q.id as child_id, q.title as child_name, '. |
|
19 | - "'".$course_code."'".' as course_code from '.Database::get_course_table(TABLE_QUIZ_TEST).' q ', |
|
20 | - 'values_query_function' => 'reports_modules_quiz_quizVal')); |
|
14 | + array_push($reports_modules['quiz'], |
|
15 | + array('keys_query' => |
|
16 | + 'select '.$course_id.' as course_id, '. |
|
17 | + $reports_modules_quiz_toolid.' as tool_id, '. |
|
18 | + 'q.id as child_id, q.title as child_name, '. |
|
19 | + "'".$course_code."'".' as course_code from '.Database::get_course_table(TABLE_QUIZ_TEST).' q ', |
|
20 | + 'values_query_function' => 'reports_modules_quiz_quizVal')); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | function reports_modules_quiz_quizVal($quiz, $key_id) { |
24 | - $courseId = api_get_course_int_id($quiz['course_code']); |
|
25 | - return array('type'=> 'sql', 'sql' => |
|
26 | - 'select '.$key_id.', exe_user_id as uid, '. |
|
27 | - 'session_id, -1 as attempt, exe_result as score, '. |
|
28 | - REPORTS_PROGRESS_COMPLETED.' as progress, '. |
|
29 | - 'exe_duration as time, exe_date as ts from '. |
|
30 | - Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES). |
|
31 | - ' where c_id = ' . $courseId . |
|
32 | - ' and exe_exo_id='.$quiz['child_id']); |
|
24 | + $courseId = api_get_course_int_id($quiz['course_code']); |
|
25 | + return array('type'=> 'sql', 'sql' => |
|
26 | + 'select '.$key_id.', exe_user_id as uid, '. |
|
27 | + 'session_id, -1 as attempt, exe_result as score, '. |
|
28 | + REPORTS_PROGRESS_COMPLETED.' as progress, '. |
|
29 | + 'exe_duration as time, exe_date as ts from '. |
|
30 | + Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES). |
|
31 | + ' where c_id = ' . $courseId . |
|
32 | + ' and exe_exo_id='.$quiz['child_id']); |
|
33 | 33 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$reports_modules['quiz'] = array (); |
|
3 | +$reports_modules['quiz'] = array(); |
|
4 | 4 | |
5 | 5 | |
6 | 6 | function reports_modules_quiz_init() { |
@@ -28,6 +28,6 @@ discard block |
||
28 | 28 | REPORTS_PROGRESS_COMPLETED.' as progress, '. |
29 | 29 | 'exe_duration as time, exe_date as ts from '. |
30 | 30 | Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES). |
31 | - ' where c_id = ' . $courseId . |
|
31 | + ' where c_id = '.$courseId. |
|
32 | 32 | ' and exe_exo_id='.$quiz['child_id']); |
33 | 33 | } |
@@ -7,117 +7,117 @@ |
||
7 | 7 | } |
8 | 8 | |
9 | 9 | function reports_modules_scorm_init_forEachCourses($course_code, $course_id, $course_db) { |
10 | - global $reports_modules; |
|
10 | + global $reports_modules; |
|
11 | 11 | |
12 | - $reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH); |
|
12 | + $reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH); |
|
13 | 13 | |
14 | - // package level |
|
15 | - array_push($reports_modules['scorm'], |
|
16 | - array('keys_query' => |
|
17 | - 'select '.$course_id.' as course_id, '. |
|
18 | - $reports_modules_scorm_toolid.' as tool_id, '. |
|
19 | - 'lp.id as child_id, lp.name as child_name, '. |
|
20 | - "'".$course_db."'".' as course_db from '. |
|
21 | - Database::get_course_table(TABLE_LP_MAIN).' lp', |
|
22 | - 'values_query_function' => 'reports_modules_scorm_packageVal')); |
|
14 | + // package level |
|
15 | + array_push($reports_modules['scorm'], |
|
16 | + array('keys_query' => |
|
17 | + 'select '.$course_id.' as course_id, '. |
|
18 | + $reports_modules_scorm_toolid.' as tool_id, '. |
|
19 | + 'lp.id as child_id, lp.name as child_name, '. |
|
20 | + "'".$course_db."'".' as course_db from '. |
|
21 | + Database::get_course_table(TABLE_LP_MAIN).' lp', |
|
22 | + 'values_query_function' => 'reports_modules_scorm_packageVal')); |
|
23 | 23 | |
24 | - // sco level |
|
25 | - array_push($reports_modules['scorm'], |
|
26 | - array('keys_query' => |
|
27 | - 'select '.$course_id.' as course_id, '. |
|
28 | - $reports_modules_scorm_toolid.' as tool_id, '. |
|
29 | - 'lp.id as child_id, lp.name as child_name, '. |
|
30 | - 'lpi.id as subchild_id, lpi.title as subchild_name, '. |
|
31 | - "'".$course_db."'".' as course_db from '. |
|
32 | - Database::get_course_table(TABLE_LP_MAIN, $course_db). |
|
33 | - ' lp,'. |
|
34 | - Database::get_course_table(TABLE_LP_ITEM, $course_db). |
|
35 | - ' lpi where lp.id = lpi.lp_id', |
|
36 | - 'values_query_function' => 'reports_modules_scorm_scoVal')); |
|
24 | + // sco level |
|
25 | + array_push($reports_modules['scorm'], |
|
26 | + array('keys_query' => |
|
27 | + 'select '.$course_id.' as course_id, '. |
|
28 | + $reports_modules_scorm_toolid.' as tool_id, '. |
|
29 | + 'lp.id as child_id, lp.name as child_name, '. |
|
30 | + 'lpi.id as subchild_id, lpi.title as subchild_name, '. |
|
31 | + "'".$course_db."'".' as course_db from '. |
|
32 | + Database::get_course_table(TABLE_LP_MAIN, $course_db). |
|
33 | + ' lp,'. |
|
34 | + Database::get_course_table(TABLE_LP_ITEM, $course_db). |
|
35 | + ' lpi where lp.id = lpi.lp_id', |
|
36 | + 'values_query_function' => 'reports_modules_scorm_scoVal')); |
|
37 | 37 | |
38 | - // objectives level |
|
39 | - array_push($reports_modules['scorm'], |
|
40 | - array('keys_query' => |
|
41 | - 'select distinct '.$course_id.' as course_id, '. |
|
42 | - $reports_modules_scorm_toolid.' as tool_id, '. |
|
43 | - 'lp.id as child_id, lp.name as child_name, '. |
|
44 | - 'lpi.id as subchild_id, '. |
|
45 | - 'lpi.title as subchild_name, '. |
|
46 | - 'null as subsubchild_id, '. |
|
47 | - 'lpivo.objective_id as subsubchild_name, '. |
|
48 | - "'".$course_db."'".' as course_db from '. |
|
49 | - Database::get_course_table(TABLE_LP_MAIN, $course_db). |
|
50 | - ' lp,'. |
|
51 | - Database::get_course_table(TABLE_LP_ITEM, $course_db). |
|
52 | - ' lpi, '. |
|
53 | - Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db). |
|
54 | - ' lpiv, '. |
|
55 | - Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db). |
|
56 | - ' lpivo '. |
|
57 | - 'where lp.id = lpi.lp_id '. |
|
58 | - 'and lpi.id = lpiv.lp_item_id '. |
|
59 | - 'and lpiv.id = lpivo.lp_iv_id ', |
|
60 | - 'values_query_function' => 'reports_modules_scorm_objVal')); |
|
38 | + // objectives level |
|
39 | + array_push($reports_modules['scorm'], |
|
40 | + array('keys_query' => |
|
41 | + 'select distinct '.$course_id.' as course_id, '. |
|
42 | + $reports_modules_scorm_toolid.' as tool_id, '. |
|
43 | + 'lp.id as child_id, lp.name as child_name, '. |
|
44 | + 'lpi.id as subchild_id, '. |
|
45 | + 'lpi.title as subchild_name, '. |
|
46 | + 'null as subsubchild_id, '. |
|
47 | + 'lpivo.objective_id as subsubchild_name, '. |
|
48 | + "'".$course_db."'".' as course_db from '. |
|
49 | + Database::get_course_table(TABLE_LP_MAIN, $course_db). |
|
50 | + ' lp,'. |
|
51 | + Database::get_course_table(TABLE_LP_ITEM, $course_db). |
|
52 | + ' lpi, '. |
|
53 | + Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db). |
|
54 | + ' lpiv, '. |
|
55 | + Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db). |
|
56 | + ' lpivo '. |
|
57 | + 'where lp.id = lpi.lp_id '. |
|
58 | + 'and lpi.id = lpiv.lp_item_id '. |
|
59 | + 'and lpiv.id = lpivo.lp_iv_id ', |
|
60 | + 'values_query_function' => 'reports_modules_scorm_objVal')); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | function reports_modules_scorm_packageVal($scorm, $key_id) { |
64 | - return array('type'=> 'sql', 'sql' => |
|
65 | - 'select '.$key_id.', user_id as uid, '. |
|
66 | - 'session_id, view_count as attempt, null as score, '. |
|
67 | - 'progress as progress, '. |
|
68 | - 'null as time, null as ts from '. |
|
69 | - Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
70 | - ' where lp_id = '.$scorm['child_id']); |
|
64 | + return array('type'=> 'sql', 'sql' => |
|
65 | + 'select '.$key_id.', user_id as uid, '. |
|
66 | + 'session_id, view_count as attempt, null as score, '. |
|
67 | + 'progress as progress, '. |
|
68 | + 'null as time, null as ts from '. |
|
69 | + Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
70 | + ' where lp_id = '.$scorm['child_id']); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | function reports_modules_scorm_scoVal($scorm, $key_id) { |
74 | - return array('type'=> 'sql', 'sql' => |
|
75 | - 'select '.$key_id.', lpv.user_id as uid, '. |
|
76 | - 'lpv.session_id, lpiv.view_count as attempt, '. |
|
77 | - 'lpiv.score as score, '. |
|
78 | - '(case lpiv.status '. |
|
79 | - 'when "incomplete" then 0 '. |
|
80 | - 'when "completed" then 1 '. |
|
81 | - 'when "passed" then 2 '. |
|
82 | - 'when "failed" then 3 '. |
|
83 | - 'when "browsed" then 4 '. |
|
84 | - 'when "not attempted" then 5 '. |
|
85 | - 'else 6 '. |
|
86 | - 'end) as progress, '. |
|
87 | - 'lpiv.total_time as time, null as ts from '. |
|
88 | - Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
89 | - ' lpv, '. |
|
90 | - Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']). |
|
91 | - ' lpiv '. |
|
92 | - ' where lpv.lp_id = '.$scorm['child_id']. |
|
93 | - ' and lpiv.lp_item_id = '.$scorm['subchild_id']. |
|
94 | - ' and lpiv.lp_view_id = lpv.id'); |
|
74 | + return array('type'=> 'sql', 'sql' => |
|
75 | + 'select '.$key_id.', lpv.user_id as uid, '. |
|
76 | + 'lpv.session_id, lpiv.view_count as attempt, '. |
|
77 | + 'lpiv.score as score, '. |
|
78 | + '(case lpiv.status '. |
|
79 | + 'when "incomplete" then 0 '. |
|
80 | + 'when "completed" then 1 '. |
|
81 | + 'when "passed" then 2 '. |
|
82 | + 'when "failed" then 3 '. |
|
83 | + 'when "browsed" then 4 '. |
|
84 | + 'when "not attempted" then 5 '. |
|
85 | + 'else 6 '. |
|
86 | + 'end) as progress, '. |
|
87 | + 'lpiv.total_time as time, null as ts from '. |
|
88 | + Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
89 | + ' lpv, '. |
|
90 | + Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']). |
|
91 | + ' lpiv '. |
|
92 | + ' where lpv.lp_id = '.$scorm['child_id']. |
|
93 | + ' and lpiv.lp_item_id = '.$scorm['subchild_id']. |
|
94 | + ' and lpiv.lp_view_id = lpv.id'); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | function reports_modules_scorm_objVal($scorm, $key_id) { |
98 | - return array('type'=> 'sql', 'sql' => |
|
99 | - 'select '.$key_id.', lpv.user_id as uid, '. |
|
100 | - 'lpv.session_id, lpiv.view_count as attempt, '. |
|
101 | - 'lpivo.score_raw as score, '. |
|
102 | - '(case lpivo.status '. |
|
103 | - 'when "incomplete" then 0 '. |
|
104 | - 'when "completed" then 1 '. |
|
105 | - 'when "passed" then 2 '. |
|
106 | - 'when "failed" then 3 '. |
|
107 | - 'when "browsed" then 4 '. |
|
108 | - 'when "not attempted" then 5 '. |
|
109 | - 'else 6 '. |
|
110 | - 'end) as progress, '. |
|
111 | - 'null as time, null as ts from '. |
|
112 | - Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
113 | - ' lpv, '. |
|
114 | - Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']). |
|
115 | - ' lpiv, '. |
|
116 | - Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']). |
|
117 | - ' lpivo '. |
|
118 | - ' where lpv.lp_id = '.$scorm['child_id']. |
|
119 | - ' and lpiv.lp_item_id = '.$scorm['subchild_id']. |
|
120 | - ' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '. |
|
121 | - ' and lpiv.lp_view_id = lpv.id'. |
|
122 | - ' and lpivo.lp_iv_id=lpiv.id'); |
|
98 | + return array('type'=> 'sql', 'sql' => |
|
99 | + 'select '.$key_id.', lpv.user_id as uid, '. |
|
100 | + 'lpv.session_id, lpiv.view_count as attempt, '. |
|
101 | + 'lpivo.score_raw as score, '. |
|
102 | + '(case lpivo.status '. |
|
103 | + 'when "incomplete" then 0 '. |
|
104 | + 'when "completed" then 1 '. |
|
105 | + 'when "passed" then 2 '. |
|
106 | + 'when "failed" then 3 '. |
|
107 | + 'when "browsed" then 4 '. |
|
108 | + 'when "not attempted" then 5 '. |
|
109 | + 'else 6 '. |
|
110 | + 'end) as progress, '. |
|
111 | + 'null as time, null as ts from '. |
|
112 | + Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']). |
|
113 | + ' lpv, '. |
|
114 | + Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']). |
|
115 | + ' lpiv, '. |
|
116 | + Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']). |
|
117 | + ' lpivo '. |
|
118 | + ' where lpv.lp_id = '.$scorm['child_id']. |
|
119 | + ' and lpiv.lp_item_id = '.$scorm['subchild_id']. |
|
120 | + ' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '. |
|
121 | + ' and lpiv.lp_view_id = lpv.id'. |
|
122 | + ' and lpivo.lp_iv_id=lpiv.id'); |
|
123 | 123 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$reports_modules['scorm'] = array (); |
|
3 | +$reports_modules['scorm'] = array(); |
|
4 | 4 | |
5 | 5 | |
6 | 6 | function reports_modules_scorm_init() { |