';
@@ -228,8 +252,7 @@ if($total > COMPLETION_REPORT_PAGE) {
if ($curstart == $start) {
$pagingbar .= ' '.$curpage.' ';
- }
- else {
+ } else {
$pagingbar .= "
$curpage ";
}
@@ -248,7 +271,7 @@ if($total > COMPLETION_REPORT_PAGE) {
// Okay, let's draw the table of progress info,
// Start of table
-if(!$csv) {
+if (!$csv) {
print '
'; // ugh
print $pagingbar;
@@ -266,7 +289,7 @@ if(!$csv) {
$sistring = "&silast={$silast}&sifirst={$sifirst}";
- if($firstnamesort) {
+ if ($firstnamesort) {
print
get_string('firstname')." /
id}{$sistring}\">".
get_string('lastname').'';
@@ -277,12 +300,12 @@ if(!$csv) {
}
print '';
- if($idnumbers) {
+ if ($idnumbers) {
print '
'.get_string('idnumber').' | ';
}
} else {
- if($idnumbers) {
+ if ($idnumbers) {
print $sep;
}
}
@@ -292,7 +315,7 @@ foreach($activities as $activity) {
$activity->datepassed = $activity->completionexpected && $activity->completionexpected <= time();
$activity->datepassedclass=$activity->datepassed ? 'completion-expired' : '';
- if($activity->completionexpected) {
+ if ($activity->completionexpected) {
$datetext=userdate($activity->completionexpected,get_string('strftimedate','langconfig'));
} else {
$datetext='';
@@ -301,7 +324,7 @@ foreach($activities as $activity) {
// Some names (labels) come URL-encoded and can be very long, so shorten them
$activity->name = shorten_text($activity->name);
- if($csv) {
+ if ($csv) {
print $sep.csv_quote(strip_tags($activity->name)).$sep.csv_quote($datetext);
} else {
print '
'.
@@ -310,14 +333,14 @@ foreach($activities as $activity) {
'.') '.
format_string($activity->name).'';
- if($activity->completionexpected) {
+ if ($activity->completionexpected) {
print ''.$datetext.' ';
}
print ' | ';
}
}
-if($csv) {
+if ($csv) {
print $line;
} else {
print '';
@@ -326,15 +349,15 @@ if($csv) {
// Row for each user
foreach($progress as $user) {
// User name
- if($csv) {
+ if ($csv) {
print csv_quote(fullname($user));
- if($idnumbers) {
+ if ($idnumbers) {
print $sep.csv_quote($user->idnumber);
}
} else {
print '
| '.fullname($user).' | ';
- if($idnumbers) {
+ if ($idnumbers) {
print ''.htmlspecialchars($user->idnumber).' | ';
}
}
@@ -343,7 +366,7 @@ foreach($progress as $user) {
foreach($activities as $activity) {
// Get progress information and state
- if(array_key_exists($activity->id,$user->progress)) {
+ if (array_key_exists($activity->id,$user->progress)) {
$thisprogress=$user->progress[$activity->id];
$state=$thisprogress->completionstate;
$date=userdate($thisprogress->timemodified);
@@ -372,7 +395,7 @@ foreach($progress as $user) {
$a->activity=strip_tags($activity->name);
$fulldescribe=get_string('progress-title','completion',$a);
- if($csv) {
+ if ($csv) {
print $sep.csv_quote($describe).$sep.csv_quote($date);
} else {
print ''.
@@ -381,14 +404,14 @@ foreach($progress as $user) {
}
}
- if($csv) {
+ if ($csv) {
print $line;
} else {
print ' |
|---|
';
}
}
-if($csv) {
+if ($csv) {
exit;
}
print '';
diff --git a/report/progress/lang/en/report_progress.php b/report/progress/lang/en/report_progress.php
index bf8adf16775..621680e3357 100644
--- a/report/progress/lang/en/report_progress.php
+++ b/report/progress/lang/en/report_progress.php
@@ -1,5 +1,4 @@
.
/**
- * Strings for component 'coursereport_progress', language 'en', branch 'MOODLE_20_STABLE'
+ * Lang strings
*
- * @package coursereport_progress
- * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package report
+ * @subpackage progress
+ * @copyright 2008 Sam Marshall
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Activity completion';
diff --git a/report/progress/lib.php b/report/progress/lib.php
index d677248ad21..b56f6adfad3 100644
--- a/report/progress/lib.php
+++ b/report/progress/lib.php
@@ -1,5 +1,4 @@
libdir.'/completionlib.php');
+defined('MOODLE_INTERNAL') || die;
/**
* This function extends the navigation with the report items
@@ -35,8 +35,10 @@ require_once($CFG->libdir.'/completionlib.php');
function report_progress_extend_navigation_course($navigation, $course, $context) {
global $CFG, $OUTPUT;
+ require_once($CFG->libdir.'/completionlib.php');
+
$showonnavigation = has_capability('report/progress:view', $context);
- $group=groups_get_course_group($course,true); // Supposed to verify group
+ $group = groups_get_course_group($course,true); // Supposed to verify group
if($group===0 && $course->groupmode==SEPARATEGROUPS) {
$showonnavigation = ($showonnavigation && has_capability('moodle/site:accessallgroups', $context));
}
diff --git a/report/progress/styles.css b/report/progress/styles.css
new file mode 100644
index 00000000000..c58e9cc2b58
--- /dev/null
+++ b/report/progress/styles.css
@@ -0,0 +1,7 @@
+#page-report-progress-index th,
+#page-report-progress-index td {padding:2px 4px;font-weight:normal;border-right: 1px solid #EEE;}
+#page-report-progress-index .progress-actions {text-align:center;}
+#page-report-progress-index .completion_pagingbar {margin:1em 0;text-align:center;}
+#page-report-progress-index .completion_prev {display:inline;margin-right:2em;}
+#page-report-progress-index .completion_pagingbar p {display:inline;margin:0;}
+#page-report-progress-index .completion_next {display:inline;margin-left:2em;}
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 62a5bfe860d..b063edd08c0 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -364,13 +364,6 @@ table.mod_index {width:100%;}
.completion-sortchoice {font-size:0.75em;vertical-align:bottom;}
.completion-progresscell {text-align:right;}
.completion-expired .completion-expected {font-weight:bold;}
-#page-course-report-progress-index th,
-#page-course-report-progress-index td {padding:2px 4px;font-weight:normal;border-right: 1px solid #EEE;}
-#page-course-report-progress-index .progress-actions {text-align:center;}
-#page-course-report-progress-index .completion_pagingbar {margin:1em 0;text-align:center;}
-#page-course-report-progress-index .completion_prev {display:inline;margin-right:2em;}
-#page-course-report-progress-index .completion_pagingbar p {display:inline;margin:0;}
-#page-course-report-progress-index .completion_next {display:inline;margin-left:2em;}
/**
* Tags