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

MDL-18618 - browse feedbacks in a better way

Browse Source
This commit is contained in:
Andreas Grabs
2010-05-02 17:33:57 +00:00
parent d3dbc520c4
commit 8a23b38c16
5 changed files with 138 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/delete_completed.php
+14 -3
View File
@@ -14,6 +14,7 @@ require_once('delete_completed_form.php');
$id = required_param('id', PARAM_INT);
$completedid = optional_param('completedid', 0, PARAM_INT);
$return = optional_param('return', 'entries', PARAM_ALPHA);
if($completedid == 0){
print_error('no_complete_to_delete', 'feedback', 'show_entries.php?id='.$id.'&do_show=showentries');
@@ -45,19 +46,29 @@ $mform = new mod_feedback_delete_completed_form();
$newformdata = array('id'=>$id,
'completedid'=>$completedid,
'confirmdelete'=>'1',
'do_show'=>'edit');
'do_show'=>'edit',
'return'=>$return);
$mform->set_data($newformdata);
$formdata = $mform->get_data();
if ($mform->is_cancelled()) {
redirect('show_entries.php?id='.$id.'&do_show=showentries');
if($return == 'entriesanonym') {
redirect('show_entries_anonym.php?id='.$id);
}else {
redirect('show_entries.php?id='.$id.'&do_show=showentries');
}
}
if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){
if($completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) {
feedback_delete_completed($completedid);
add_to_log($course->id, 'feedback', 'delete', 'view.php?id='.$cm->id, $feedback->id,$cm->id);
redirect('show_entries.php?id='.$id.'&do_show=showentries');
if($return == 'entriesanonym') {
redirect('show_entries_anonym.php?id='.$id);
}else {
redirect('show_entries.php?id='.$id.'&do_show=showentries');
}
}
}
mod/feedback/delete_completed_form.php
+2
View File
@@ -25,6 +25,8 @@ class mod_feedback_delete_completed_form extends moodleform {
$mform->setType('do_show', PARAM_INT);
$mform->addElement('hidden', 'confirmdelete');
$mform->setType('confirmdelete', PARAM_INT);
$mform->addElement('hidden', 'return');
$mform->setType('return', PARAM_ALPHA);
//-------------------------------------------------------------------------------
// buttons
mod/feedback/lib.php
+1
View File
@@ -38,6 +38,7 @@ define('FEEDBACK_THOUSAND', ',');
define('FEEDBACK_RESETFORM_RESET', 'feedback_reset_data_');
define('FEEDBACK_RESETFORM_DROP', 'feedback_drop_feedback_');
define('FEEDBACK_MAX_PIX_LENGTH', '400'); //max. Breite des grafischen Balkens in der Auswertung
define('FEEDBACK_DEFAULT_PAGE_COUNT', 20);
/**
* @uses FEATURE_GROUPS
mod/feedback/show_entries.php
+2 -3
View File
@@ -15,7 +15,6 @@ require_once($CFG->libdir.'/tablelib.php');
////////////////////////////////////////////////////////
//get the params
////////////////////////////////////////////////////////
define('FEEDBACK_DEFAULT_PAGE_COUNT', 20);
$id = required_param('id', PARAM_INT);
$userid = optional_param('userid', false, PARAM_INT);
$do_show = required_param('do_show', PARAM_ALPHA);
@@ -105,8 +104,8 @@ if($do_show == 'showentries'){
$baseurl = new moodle_url('/mod/feedback/show_entries.php');
$baseurl->params(array('id'=>$id, 'do_show'=>$do_show, 'showall'=>$showall));
$tablecolumns = array('userpic', 'fullname', 'showresponse');
$tableheaders = array(get_string('userpic'), get_string('fullnameuser'), '');
$tablecolumns = array('userpic', 'fullname', 'timemodified');
$tableheaders = array(get_string('userpic'), get_string('fullnameuser'), get_string('date'));
if(has_capability('mod/feedback:deletesubmissions', $context)) {
$tablecolumns[] = 'deleteentry';
mod/feedback/show_entries_anonym.php
+119 -67
View File
@@ -10,23 +10,25 @@
require_once("../../config.php");
require_once("lib.php");
require_once($CFG->libdir.'/tablelib.php');
// $SESSION->feedback->current_tab = 'showoneentry';
$current_tab = 'showentries';
$id = required_param('id', PARAM_INT);
$userid = optional_param('userid', false, PARAM_INT);
// $userid = optional_param('userid', false, PARAM_INT);
$showcompleted = optional_param('showcompleted', false, PARAM_INT);
$do_show = optional_param('do_show', false, PARAM_ALPHA);
$perpage = optional_param('perpage', FEEDBACK_DEFAULT_PAGE_COUNT, PARAM_INT); // how many per page
$showall = optional_param('showall', false, PARAM_INT); // should we show all users
$current_tab = $do_show;
$url = new moodle_url('/mod/feedback/show_entries_anonym.php', array('id'=>$id));
if ($userid !== '') {
$url->param('userid', $userid);
}
// if ($userid !== '') {
// $url->param('userid', $userid);
// }
$PAGE->set_url($url);
if(($formdata = data_submitted()) AND !confirm_sesskey()) {
print_error('invalidsesskey');
}
if (! $cm = get_coursemodule_from_id('feedback', $id)) {
print_error('invalidcoursemodule');
}
@@ -47,21 +49,6 @@ require_login($course->id, true, $cm);
require_capability('mod/feedback:viewreports', $context);
//get the completeds
// if a new anonymous record has not been assigned a random response number
if ($feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'random_response'=>0, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response')){ //arb
//then get all of the anonymous records and go through them
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'id'); //arb
shuffle($feedbackcompleteds);
$num = 1;
foreach($feedbackcompleteds as $compl){
$compl->random_response = $num;
$DB->update_record('feedback_completed', $compl);
$num++;
}
}
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response'); //arb
/// Print the page header
$strfeedbacks = get_string("modulenameplural", "feedback");
$strfeedback = get_string("modulename", "feedback");
@@ -80,53 +67,118 @@ include('tabs.php');
echo $OUTPUT->heading(format_text($feedback->name));
$continueurl = new moodle_url('/mod/feedback/show_entries.php', array('id'=>$id, 'do_show'=>'showentries'));
echo $OUTPUT->continue_button($continueurl);
//print the list with anonymous completeds
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
$PAGE->requires->js('/mod/feedback/feedback.js');
?>
<div class="mdl-align">
<form action="<?php echo me();?>" method="post">
<fieldset>
<table>
<tr>
<td>
<input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
<select name="completedid" size="<?php echo (sizeof($feedbackcompleteds)>10)?10:5;?>">
<?php
if(is_array($feedbackcompleteds)) {
$num = 1;
foreach($feedbackcompleteds as $compl) {
$selected = (isset($formdata->completedid) AND $formdata->completedid == $compl->id)?'selected="selected"':'';
echo '<option value="'.$compl->id.'" '. $selected .'>'.get_string('response_nr', 'feedback').': '. $compl->random_response. '</option>';//arb
$num++;
}
}
?>
</select>
<input type="hidden" name="showanonym" value="<?php echo FEEDBACK_ANONYMOUS_YES;?>" />
<input type="hidden" name="id" value="<?php echo $id;?>" />
</td>
<td valign="top">
<button type="submit"><?php print_string('show_entry', 'feedback');?></button><br />
<button type="button" onclick="feedbackGo2delete(this.form);"><?php print_string('delete_entry', 'feedback');?></button>
</td>
</tr>
</table>
</fieldset>
</form>
</div>
<?php
echo $OUTPUT->box_end();
if(!isset($formdata->completedid)) {
$formdata = null;
if(!$showcompleted) {
//get the completeds
// if a new anonymous record has not been assigned a random response number
if ($feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'random_response'=>0, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response')){ //arb
//then get all of the anonymous records and go through them
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'id'); //arb
shuffle($feedbackcompleteds);
$num = 1;
foreach($feedbackcompleteds as $compl){
$compl->random_response = $num;
$DB->update_record('feedback_completed', $compl);
$num++;
}
}
$feedbackcompletedscount = $DB->count_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES));
// preparing the table for output
$baseurl = new moodle_url('/mod/feedback/show_entries_anonym.php');
$baseurl->params(array('id'=>$id, 'do_show'=>$do_show, 'showall'=>$showall));
$tablecolumns = array('response', 'showresponse');
$tableheaders = array('', '');
if(has_capability('mod/feedback:deletesubmissions', $context)) {
$tablecolumns[] = 'deleteentry';
$tableheaders[] = '';
}
$table = new flexible_table('feedback-showentryanonym-list-'.$course->id);
$table->define_columns($tablecolumns);
$table->define_headers($tableheaders);
$table->define_baseurl($baseurl);
$table->sortable(false);
$table->set_attribute('cellspacing', '0');
$table->set_attribute('id', 'showentryanonymtable');
$table->set_attribute('class', 'generaltable generalbox');
$table->set_control_variables(array(
TABLE_VAR_SORT => 'ssort',
TABLE_VAR_IFIRST => 'sifirst',
TABLE_VAR_ILAST => 'silast',
TABLE_VAR_PAGE => 'spage'
));
$table->setup();
$matchcount = $feedbackcompletedscount;
$table->initialbars(true);
if($showall) {
$startpage = false;
$pagecount = false;
}else {
$table->pagesize($perpage, $matchcount);
$startpage = $table->get_page_start();
$pagecount = $table->get_page_size();
}
$feedbackcompleteds = $DB->get_records('feedback_completed',
array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES),
'random_response',
'id,random_response',
$startpage,
$pagecount);
if(is_array($feedbackcompleteds)) {
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
foreach($feedbackcompleteds as $compl) {
$data = array();
$data[] = get_string('response_nr', 'feedback').': '. $compl->random_response;
//link to the entry
$showentryurl = new moodle_url($baseurl, array('showcompleted'=>$compl->id));
$showentrylink = '<a href="'.$showentryurl->out().'">'.get_string('show_entry', 'feedback').'</a>';
$data[] = $showentrylink;
//link to delete the entry
if(has_capability('mod/feedback:deletesubmissions', $context)) {
$deleteentryurl = new moodle_url($CFG->wwwroot.'/mod/feedback/delete_completed.php', array('id'=>$cm->id, 'completedid'=>$compl->id, 'do_show'=>'', 'return'=>'entriesanonym'));
$deleteentrylink = '<a href="'.$deleteentryurl->out().'">'.get_string('delete_entry', 'feedback').'</a>';
$data[] = $deleteentrylink;
}
$table->add_data($data);
}
$table->print_html();
$allurl = new moodle_url($baseurl);
if ($showall) {
$allurl->param('showall', 0);
echo $OUTPUT->container(html_writer::link($allurl, get_string('showperpage', '', FEEDBACK_DEFAULT_PAGE_COUNT)), array(), 'showall');
} else if ($matchcount > 0 && $perpage < $matchcount) {
$allurl->param('showall', 1);
echo $OUTPUT->container(html_writer::link($allurl, get_string('showall', '', $matchcount)), array(), 'showall');
}
echo $OUTPUT->box_end();
}
}
//print the items
if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_YES) {
// if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_YES) {
if($showcompleted) {
$continueurl = new moodle_url('/mod/feedback/show_entries_anonym.php', array('id'=>$id, 'do_show'=>''));
echo $OUTPUT->continue_button($continueurl);
//get the feedbackitems
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
$feedbackcompleted = $DB->get_record('feedback_completed', array('id'=>$formdata->completedid));
$feedbackcompleted = $DB->get_record('feedback_completed', array('id'=>$showcompleted));
if(is_array($feedbackitems)){
$align = right_to_left() ? 'right' : 'left';
@@ -135,7 +187,7 @@ if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_Y
echo get_string('chosen_feedback_response', 'feedback');
echo $OUTPUT->box_end();
echo $OUTPUT->box_start('feedback_info');
echo '('.get_string('anonymous', 'feedback').')';
echo get_string('response_nr', 'feedback').': '. $feedbackcompleted->random_response.' ('.get_string('anonymous', 'feedback').')';
echo $OUTPUT->box_end();
} else {
echo $OUTPUT->box_start('feedback_info');