moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIxed activity reporting for database activities

Browse source
This commit is contained in:
moodler 2006-04-07 07:02:53 +00:00
parent 5f4f608811
commit 63701c7802
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
mod/data/lib.php
View file

@ -727,13 +727,13 @@ function data_delete_instance($id) { //takes the dataid
************************************************************************/ ************************************************************************/
function data_user_outline($course, $user, $mod, $data) { function data_user_outline($course, $user, $mod, $data) {
global $USER, $CFG; global $CFG;
$sql = 'SELECT * from '.$CFG->prefix.'data_records WHERE dataid = "'.$data->id.'" AND userid = "'.$USER->id.'" ORDER BY timemodified DESC'; if ($countrecords = count_records('data_records', 'dataid', $data->id, 'userid', $user->id)) {
$result->info = get_string('numrecords', 'data', $countrecords);
if ($records = get_records_sql($sql)){ $lastrecord = get_record_sql('SELECT id,timemodified FROM '.$CFG->prefix.'data_records
$result->info = count($records).' '.get_string('numrecords', 'data'); WHERE dataid = '.$data->id.' AND userid = '.$user->id.'
$lastrecord = array_pop($records); ORDER BY timemodified DESC', true);
$result->time = $lastrecord->timemodified; $result->time = $lastrecord->timemodified;
return $result; return $result;
} }
@ -746,12 +746,8 @@ function data_user_outline($course, $user, $mod, $data) {
************************************************************************/ ************************************************************************/
function data_user_complete($course, $user, $mod, $data) { function data_user_complete($course, $user, $mod, $data) {
global $USER, $CFG; if ($records = get_records_select('data_records', 'dataid = '.$data->id.' AND userid = '.$user->id,
'timemodified DESC')) {
$sql = 'SELECT * from '.$CFG->prefix.'data_records WHERE dataid = "'.
$data->id.'" AND userid = "'.$USER->id.'" ORDER BY timemodified DESC';
if ($records = get_records_sql($sql)){
data_print_template('singletemplate', $records, $data); data_print_template('singletemplate', $records, $data);
@ -820,6 +816,13 @@ function data_print_template($template, $records, $data, $search='',$page=0, $re
static $fields = NULL; static $fields = NULL;
static $isteacher; static $isteacher;
static $dataid = NULL;
if (empty($dataid)) {
$dataid = $data->id;
} else if ($dataid != $data->id) {
$fields = NULL;
}
if (empty($fields)) { if (empty($fields)) {
$fieldrecords = get_records('data_fields','dataid', $data->id); $fieldrecords = get_records('data_fields','dataid', $data->id);
@ -1110,13 +1113,13 @@ function data_print_comments($data, $record, $page=0) {
} }
} }
echo '<div class="newcomment" align="center"><form method="post" action="comment.php">'; echo '<div class="newcomment" align="center"><form method="post" action="'.$CFG->wwwroot.'/mod/data/comment.php">';
echo '<input type="hidden" name="mode" value="add" />'; echo '<input type="hidden" name="mode" value="add" />';
echo '<input type="hidden" name="page" value="'.$page.'" />'; echo '<input type="hidden" name="page" value="'.$page.'" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'; echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="rid" value="'.$record->id.'" />'; echo '<input type="hidden" name="rid" value="'.$record->id.'" />';
echo '<textarea name="commentcontent"></textarea>'; echo '<textarea rows="8" cols="50" name="commentcontent"></textarea>';
echo '<br /><input type="submit" value="'.get_string('addcomment','data').'" />'; echo '<br /><input type="submit" value="'.get_string('addcomment','data').'" />';
echo '</form></div>'; echo '</form></div>';
} }