L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New function journal_count_entries() and more accurate counting of

Browse Source 
journal entries for different grouping scenarios
This commit is contained in:
moodler
2004-03-13 16:15:02 +00:00
parent 06b1db82d2
commit d5a2ccadb9
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/journal/lib.php
+38 -1
View File
@@ -38,11 +38,12 @@ function journal_user_complete($course, $user, $mod, $journal) {
}
}
function journal_user_complete_index($course, $user, $journal, $journalopen, $heading) {
/// Prints a journal, entry and feedback ... used on the journal index page.
if (isteacher($course->id)) {
$entrycount = count_records("journal_entries", "journal", $journal->id);
$entrycount = journal_count_entries($journal, get_current_group($course->id));
$entryinfo = "&nbsp;(<a href=\"report.php?id=$journal->coursemodule\">".get_string("viewallentries","journal", $entrycount)."</a>)";
} else {
$entryinfo = "";
@@ -318,6 +319,42 @@ function journal_get_users_done($journal) {
return(array_merge($studentjournals, $teacherjournals));
}
function journal_count_entries($journal, $groupid=0) {
/// Counts all the journal entries (optionally in a given group)
global $CFG, $db;
if ($groupid) { /// How many in a particular group?
return count_records_sql("SELECT COUNT(*)
FROM {$CFG->prefix}journal_entries j,
{$CFG->prefix}groups_members g
WHERE j.journal = $journal->id
AND g.groupid = '$groupid'
AND j.userid = g.userid");
} else { /// Count all the entries from the whole course
$studentjournals = count_records_sql("SELECT COUNT(*)
FROM {$CFG->prefix}journal_entries j,
{$CFG->prefix}user u,
{$CFG->prefix}user_students s
WHERE j.userid = u.id
AND s.userid = u.id
AND j.journal = $journal->id
AND s.course = $journal->course ");
$teacherjournals = count_records_sql("SELECT COUNT(*)
FROM {$CFG->prefix}journal_entries j,
{$CFG->prefix}user u,
{$CFG->prefix}user_teachers t
WHERE j.userid = u.id
AND t.userid = u.id
AND j.journal = $journal->id
AND t.course = $journal->course ");
return ($studentjournals + $teacherjournals);
}
}
function journal_get_unmailed_graded($cutofftime) {
global $CFG;
return get_records_sql("SELECT e.*, j.course, j.name
mod/journal/view.php
+12 -2
View File
@@ -37,8 +37,18 @@
update_module_button($cm->id, $course->id, $strjournal), navmenu($course, $cm));
if (isteacher($course->id)) {
$entrycount = count_records("journal_entries", "journal", $journal->id);
echo "<p align=right><a href=\"report.php?id=$cm->id\">".get_string("viewallentries","journal", $entrycount)."</a></p>";
$currentgroup = get_current_group($course->id);
if ($currentgroup and isteacheredit($course->id)) {
$group = get_record("groups", "id", $currentgroup);
$groupname = " ($group->name)";
} else {
$groupname = "";
}
$entrycount = journal_count_entries($journal, $currentgroup);
echo "<p align=right><a href=\"report.php?id=$cm->id\">".
get_string("viewallentries","journal", $entrycount)."</a>$groupname</p>";
} else if (!$cm->visible) {
notice(get_string("activityiscurrentlyhidden"));
}