diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php index 6418dbc0204..e0ad4ff2f8e 100644 --- a/mod/feedback/analysis_course.php +++ b/mod/feedback/analysis_course.php @@ -146,10 +146,10 @@ if ($courseitemfilter > 0) { echo ''; echo ''; echo html_writer::script('', $CFG->wwwroot.'/mod/feedback/feedback.js'); - $sql = 'select c.id, c.shortname from {course} c, '. + $sql = 'select DISTINCT c.id, c.shortname from {course} c, '. '{feedback_value} fv, {feedback_item} fi '. 'where c.id = fv.course_id and fv.item = fi.id '. - 'and fi.feedback = ?'. + 'and fi.feedback = ? '. 'and (c.shortname '.$DB->sql_ilike().' ? OR c.fullname '.$DB->sql_ilike().' ?)'; @@ -172,6 +172,7 @@ if ($courseitemfilter > 0) { //get the class from item-typ $itemclass = 'feedback_item_'.$item->typ; //get the instance of the item-class + require_once($CFG->dirroot.'/mod/feedback/item/'.$item->typ.'/lib.php'); $itemobj = new $itemclass(); $itemnr++; if($feedback->autonumbering) { diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php index c2beddd0257..4ab2181cbc5 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -296,9 +296,10 @@ if($feedback_can_submit) { ( has_capability('mod/feedback:viewanalysepage', $context)) AND !( has_capability('mod/feedback:viewreports', $context)) ) { if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) { - echo '
'; + echo $OUTPUT->box_start('mdl-align'); + echo ''; echo get_string('completed_feedbacks', 'feedback').''; - echo '
'; + echo $OUTPUT->box_end(); } } @@ -339,21 +340,25 @@ if($feedback_can_submit) { } }else { if(isset($savereturn) && $savereturn == 'failed') { - echo '
'.get_string('saving_failed','feedback').'
'; + echo $OUTPUT->box_start('mform error'); + echo get_string('saving_failed','feedback'); + echo $OUTPUT->box_end(); } if(isset($savereturn) && $savereturn == 'missing') { - echo '
'.get_string('saving_failed_because_missing_or_false_values','feedback').'
'; + echo $OUTPUT->box_start('mform error'); + echo get_string('saving_failed_because_missing_or_false_values','feedback'); + echo $OUTPUT->box_end(); } //print the items if(is_array($feedbackitems)){ // echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo '
'; + echo $OUTPUT->box_start('feedback_form'); echo '
'; echo '
'; echo ''; - echo ''; + echo $OUTPUT->box_end(); //check, if there exists required-elements $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1)); if($countreq > 0) { echo ''; } - echo ''; + echo $OUTPUT->box_end(); echo ''; echo ''; echo ''; @@ -440,9 +447,9 @@ if($feedback_can_submit) { echo '
'; echo '
'; - echo '
'; + echo $OUTPUT->box_end(); - echo '
'; + echo $OUTPUT->box_start('feedback_complete_cancel'); if($courseid) { echo '
'; }else{ @@ -458,7 +465,7 @@ if($feedback_can_submit) { echo ''; echo ''; echo '
'; - echo '
'; + echo $OUTPUT->box_end(); $SESSION->feedback->is_started = true; // echo $OUTPUT->box_end(); } diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php index cd6f80a02f9..c39a1fa1ef2 100644 --- a/mod/feedback/complete_guest.php +++ b/mod/feedback/complete_guest.php @@ -263,9 +263,9 @@ if($feedback_can_submit) { if( (intval($feedback->publish_stats) == 1) AND ( has_capability('mod/feedback:viewanalysepage', $context)) AND !( has_capability('mod/feedback:viewreports', $context)) ) { - echo '
'; - echo get_string('completed_feedbacks', 'feedback').''; - echo '
'; + echo $OUTPUT->box_start('mdl-align'); + echo ''.get_string('completed_feedbacks', 'feedback').''; + echo $OUTPUT->box_end(); } if(isset($savereturn) && $savereturn == 'saved') { @@ -300,61 +300,69 @@ if($feedback_can_submit) { } }else { if(isset($savereturn) && $savereturn == 'failed') { - echo '

'.get_string('saving_failed','feedback').'

'; + echo $OUTPUT->box_start('mform error'); + echo get_string('saving_failed','feedback'); + echo $OUTPUT->box_end(); } if(isset($savereturn) && $savereturn == 'missing') { - echo '

'.get_string('saving_failed_because_missing_or_false_values','feedback').'

'; + echo $OUTPUT->box_start('mform error'); + echo get_string('saving_failed_because_missing_or_false_values','feedback'); + echo $OUTPUT->box_end(); } //print the items if(is_array($feedbackitems)){ - echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo '
'; - echo ''; - echo ''; + // echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('feedback_form'); + echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; //check, if there exists required-elements $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1)); if($countreq > 0) { - echo '
'; + echo ''; } + echo $OUTPUT->box_start('feedback_items'); unset($startitem); $itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition)); $lastbreakposition = 0; + $align = right_to_left() ? 'right' : 'left'; + foreach($feedbackitems as $feedbackitem){ if(!isset($startitem)) { //avoid showing double pagebreaks - if($feedbackitem->typ == 'pagebreak') continue; + if($feedbackitem->typ == 'pagebreak') { + continue; + } $startitem = $feedbackitem; } - $value = ''; - //get the value - $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id; - if(isset($savereturn)) { - $value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL; - }else { - if(isset($feedbackcompletedtmp->id)) { - $value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, sesskey()); + echo $OUTPUT->box_start('feedback_item_box_'.$align); + $value = ''; + //get the value + $frmvaluename = $feedbackitem->typ . '_'. $feedbackitem->id; + if(isset($savereturn)) { + $value = isset($formdata->{$frmvaluename})?$formdata->{$frmvaluename}:NULL; + }else { + if(isset($feedbackcompletedtmp->id)) { + $value = feedback_get_item_value($feedbackcompletedtmp->id, $feedbackitem->id, sesskey()); + } } - } - echo ''; - if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { - $itemnr++; - echo ''; - } else { - echo ''; - } - if($feedbackitem->typ != 'pagebreak') { - feedback_print_item_complete($feedbackitem, $value, $highlightrequired); - } - echo ''; - echo ''; + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { + $itemnr++; + echo $OUTPUT->box_start('feedback_item_number_'.$align); + echo $itemnr; + echo $OUTPUT->box_end(); + } + if($feedbackitem->typ != 'pagebreak') { + echo $OUTPUT->box_start('box generalbox boxalign_'.$align); + feedback_print_item_complete($feedbackitem, $value, $highlightrequired); + echo $OUTPUT->box_end(); + } + echo $OUTPUT->box_end(); $lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak) if($feedbackitem->typ == 'pagebreak'){ @@ -363,7 +371,7 @@ if($feedback_can_submit) { $lastitem = $feedbackitem; } } - echo '
- - - -   -
(*)' . get_string('items_are_required', 'feedback') . '
' . $itemnr . '.  
 
'; + echo $OUTPUT->box_end(); echo ''; echo ''; echo ''; @@ -385,24 +393,28 @@ if($feedback_can_submit) { echo ''; } + echo ''; echo '
'; + echo $OUTPUT->box_end(); + echo $OUTPUT->box_start('feedback_complete_cancel'); if($courseid) { - echo '
'; + echo ''; }else{ if($course->id == SITEID) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } } + echo '
'; echo ''; echo ''; echo ''; + echo '
'; echo '
'; - echo '
'; - $SESSION->feedback->is_started = true; echo $OUTPUT->box_end(); + $SESSION->feedback->is_started = true; } } }else { diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index cb3bd1a5971..6aaf783105f 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -233,16 +233,16 @@ if($do_show == 'edit') { } //use list instead a table - echo '
'; + echo $OUTPUT->box_start('feedback_items'); if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) { $moveposition = 1; $movehereurl = new moodle_url($url, array('movehere'=>$moveposition)); - echo '
'; //only shown if shouldmoving = 1 + echo $OUTPUT->box_start('feedback_item_box_'.$align.' clipboard'); //only shown if shouldmoving = 1 $buttonlink = $movehereurl->out(); echo ' '.get_string('move_here','feedback').' '; - echo '
'; + echo $OUTPUT->box_end(); } //print the inserted items $itempos = 0; @@ -251,14 +251,14 @@ if($do_show == 'edit') { if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->movingitem == $feedbackitem->id){ //hiding the item to move continue; } - echo '
'; + echo $OUTPUT->box_start('feedback_item_box_'.$align); //items without value only are labels if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo ''; + echo $OUTPUT->box_start('feedback_item_number_'.$align) . $itemnr . $OUTPUT->box_end(); } - echo '
'; - echo ''; + echo $OUTPUT->box_end(); if($feedbackitem->typ != 'pagebreak') { - // echo ''; - echo '
'; + echo $OUTPUT->box_end(); + echo $OUTPUT->box_end(); if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) { $moveposition++; $movehereurl->param('movehere', $moveposition); - echo '
'; //only shown if shouldmoving = 1 + echo $OUTPUT->box_start('clipboard'); //only shown if shouldmoving = 1 $buttonlink = $movehereurl->out(); echo ' '.get_string('move_here','feedback').' '; - echo '
'; + echo $OUTPUT->box_end(); } echo '
 
'; } - echo '
'; - // echo $OUTPUT->box_end(); + echo $OUTPUT->box_end(); }else{ echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter'); } diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php index 0a29f0223fe..397ee7d9042 100644 --- a/mod/feedback/lib.php +++ b/mod/feedback/lib.php @@ -1932,7 +1932,7 @@ function feedback_get_current_completed($feedbackid, $tmp = false, $courseid = f $params['userid'] = $USER->id; } //if courseid is set the feedback is global. there can be more than one completed on one feedback - $sql = "SELECT fc.* + $sql = "SELECT DISTINCT fc.* FROM {feedback_value{$tmpstr}} fv, {feedback_completed{$tmpstr}} fc WHERE fv.course_id = :courseid AND fv.completed = fc.id diff --git a/mod/feedback/print.php b/mod/feedback/print.php index b6f550e685f..91cb6d2e000 100644 --- a/mod/feedback/print.php +++ b/mod/feedback/print.php @@ -15,8 +15,6 @@ $id = required_param('id', PARAM_INT); $PAGE->set_url('/mod/feedback/print.php', array('id'=>$id)); -$formdata = data_submitted(); - if (! $cm = get_coursemodule_from_id('feedback', $id)) { print_error('invalidcoursemodule'); } @@ -58,31 +56,38 @@ feedback_print_errors(); $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position'); if(is_array($feedbackitems)){ $itemnr = 0; + $align = right_to_left() ? 'right' : 'left'; - echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo '
'; + // echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); + echo $OUTPUT->box_start('feedback_items printview'); + //check, if there exists required-elements + $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1)); + if($countreq > 0) { + echo ''; + } //print the inserted items $itempos = 0; foreach($feedbackitems as $feedbackitem){ - $itempos++; - echo ''; - //Items without value only are labels - if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { - $itemnr++; - echo ''; - } else { - echo ''; - } - if($feedbackitem->typ != 'pagebreak') { - feedback_print_item_complete($feedbackitem, false, false); - }else { - echo ''; - } - echo ''; + echo $OUTPUT->box_start('feedback_item_box_'.$align); + $itempos++; + //Items without value only are labels + if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { + $itemnr++; + echo $OUTPUT->box_start('feedback_item_number_'.$align); + echo $itemnr; + echo $OUTPUT->box_end(); + } + echo $OUTPUT->box_start('box generalbox boxalign_'.$align); + if($feedbackitem->typ != 'pagebreak') { + feedback_print_item_complete($feedbackitem, false, false); + }else { + echo $OUTPUT->box_start('feedback_pagebreak'); + echo ''; + echo $OUTPUT->box_end(); + } + echo $OUTPUT->box_end(); + echo $OUTPUT->box_end(); } - echo '
' . $itemnr . '.  
'; - echo '(*)' . get_string('items_are_required', 'feedback') . ''; - echo '
'; echo $OUTPUT->box_end(); }else{ echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter boxwidthwide'); diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php index ca42ada5282..ce7731825a3 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -112,15 +112,15 @@ if($do_show == 'showentries'){ $completedFeedbackCount = feedback_get_completeds_group_count($feedback, $mygroupid); if($feedback->course == SITEID){ $analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid)); - echo '
'; - echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')'; + echo $OUTPUT->box_start('mdl-align'); + echo ''.get_string('course').' '.get_string('analysis', 'feedback').' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')'; echo $OUTPUT->help_icon('viewcompleted', 'feedback'); - echo '
'; + echo $OUTPUT->box_end(); }else { $analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid)); - echo '
'; - echo get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')'; - echo '
'; + echo $OUTPUT->box_start('mdl-align'); + echo ''.get_string('analysis', 'feedback').' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')'; + echo $OUTPUT->box_end(); } } @@ -130,7 +130,8 @@ if($do_show == 'showentries'){ echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); echo isset($groupselect) ? $groupselect : ''; echo '
'; - echo '
'; + echo $OUTPUT->box_start('mdl-align'); + echo '
'; if (!$students) { if($courseid != SITEID){ echo $OUTPUT->notification(get_string('noexistingstudents')); @@ -193,7 +194,8 @@ if($do_show == 'showentries'){
'; + echo ''; + echo $OUTPUT->box_end(); echo $OUTPUT->box_end(); } @@ -206,46 +208,42 @@ if($do_show == 'showoneentry') { //print the items if(is_array($feedbackitems)){ + $align = right_to_left() ? 'right' : 'left'; $usr = $DB->get_record('user', array('id'=>$userid)); + echo $OUTPUT->box_start('feedback_info'); if($feedbackcompleted) { - echo '

'.UserDate($feedbackcompleted->timemodified).'
('.fullname($usr).')

'; + echo UserDate($feedbackcompleted->timemodified).'
('.fullname($usr).')'; } else { - echo '

'.get_string('not_completed_yet','feedback').'

'; + echo get_string('not_completed_yet','feedback'); } - echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal'); - echo '
'; - echo ''; - echo ''; + echo $OUTPUT->box_end(); + + echo $OUTPUT->box_start('feedback_items'); $itemnr = 0; foreach($feedbackitems as $feedbackitem){ //get the values $value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id)); - echo ''; + echo $OUTPUT->box_start('feedback_item_box_'.$align); if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) { $itemnr++; - echo ''; - } else { - echo ''; + echo $OUTPUT->box_start('feedback_item_number_'.$align); + echo $itemnr; + echo $OUTPUT->box_end(); } if($feedbackitem->typ != 'pagebreak') { + echo $OUTPUT->box_start('box generalbox boxalign_'.$align); if(isset($value->value)) { feedback_print_item_show_value($feedbackitem, $value->value); }else { feedback_print_item_show_value($feedbackitem, false); } - }else { - echo ''; + echo $OUTPUT->box_end(); } - echo ''; + echo $OUTPUT->box_end(); } - echo ''; - echo '
' . $itemnr . '.  
'; - echo '
'; - echo '
'; echo $OUTPUT->box_end(); } - // echo $OUTPUT->continue_button(htmlspecialchars('show_entries.php?id='.$id.'&do_show=showentries')); echo $OUTPUT->continue_button(new moodle_url($url, array('do_show'=>'showentries'))); } /// Finish the page diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php index a54ce080ed4..d6d886852bb 100644 --- a/mod/feedback/show_entries_anonym.php +++ b/mod/feedback/show_entries_anonym.php @@ -131,39 +131,41 @@ if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_Y $align = right_to_left() ? 'right' : 'left'; if($feedbackcompleted) { - echo '
'; + echo $OUTPUT->box_start('feedback_info'); echo get_string('chosen_feedback_response', 'feedback'); - echo '
'; - echo '
'; + echo $OUTPUT->box_end(); + echo $OUTPUT->box_start('feedback_info'); echo '('.get_string('anonymous', 'feedback').')'; - echo '
'; + echo $OUTPUT->box_end(); } else { - echo '
'; + echo $OUTPUT->box_start('feedback_info'); echo get_string('not_completed_yet','feedback'); - echo '
'; + echo $OUTPUT->box_end(); } - echo '
'; + echo $OUTPUT->box_start('feedback_items'); // echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal'); $itemnr = 0; foreach($feedbackitems as $feedbackitem){ //get the values $value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id)); - echo ''; + echo $OUTPUT->box_end(); } // echo $OUTPUT->box_end(); - echo '
'; + echo $OUTPUT->box_end(); } } /// Finish the page diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php index 5b4e98d56dd..f7c82393c2a 100644 --- a/mod/feedback/use_templ.php +++ b/mod/feedback/use_templ.php @@ -80,7 +80,7 @@ echo $OUTPUT->header(); /////////////////////////////////////////////////////////////////////////// echo $OUTPUT->heading(format_text($feedback->name)); -echo $OUTPUT->box_start('generalbox errorboxcontent boxaligncenter boxwidthnormal'); +echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal'); echo $OUTPUT->heading(get_string('confirmusetemplate', 'feedback')); $mform->display(); @@ -94,26 +94,28 @@ if(is_array($templateitems)){ if(is_array($templateitems)){ $itemnr = 0; - echo '

'.get_string('preview', 'feedback').'

'; - echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide'); - echo '
'; + $align = right_to_left() ? 'right' : 'left'; + echo $OUTPUT->box_start('feedback_items'); foreach($templateitems as $templateitem){ - echo ''; - if($templateitem->hasvalue == 1 AND $feedback->autonumbering) { - $itemnr++; - echo ''; - } else { - echo ''; - } - if($templateitem->typ != 'pagebreak') { - feedback_print_item_preview($templateitem); - }else { - echo ''; - } - echo ''; - echo ''; + echo $OUTPUT->box_start('feedback_item_box_'.$align); + if($templateitem->hasvalue == 1 AND $feedback->autonumbering) { + $itemnr++; + echo $OUTPUT->box_start('feedback_item_number_'.$align); + echo $itemnr; + echo $OUTPUT->box_end(); + } + echo $OUTPUT->box_start('box generalbox boxalign_'.$align); + if($templateitem->typ != 'pagebreak') { + // echo '
' . $itemnr . '.  
'.get_string('pagebreak', 'feedback').'
 
'; echo $OUTPUT->box_end(); }else{ echo $OUTPUT->box(get_string('no_items_available_at_this_template','feedback'),'generalbox boxaligncenter boxwidthwide'); diff --git a/mod/feedback/use_templ_form.php b/mod/feedback/use_templ_form.php index 46eff30624f..ad7834cf338 100644 --- a/mod/feedback/use_templ_form.php +++ b/mod/feedback/use_templ_form.php @@ -17,8 +17,8 @@ class mod_feedback_use_templ_form extends moodleform { $mform->addElement('header', 'general', ''); // visible elements - $mform->addElement('radio', 'deleteolditems', get_string('delete_old_items', 'feedback'), '', 1); - $mform->addElement('radio', 'deleteolditems', get_string('append_new_items', 'feedback'), '', 0); + $mform->addElement('radio', 'deleteolditems', '1)', get_string('delete_old_items', 'feedback'), 1); + $mform->addElement('radio', 'deleteolditems', '2)', get_string('append_new_items', 'feedback'), 0); $mform->setType('deleteolditems', PARAM_INT); // hidden elements