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

Start replacing tables with div-tags and css-classes

Browse Source
This commit is contained in:
Andreas Grabs
2010-04-30 23:02:30 +00:00
parent b2120945d7
commit afdb192056
14 changed files with 768 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/complete.php
+57 -41
View File
@@ -339,64 +339,75 @@ if($feedback_can_submit) {
}
}else {
if(isset($savereturn) && $savereturn == 'failed') {
echo '<p align="center"><b><font color="red">'.get_string('saving_failed','feedback').'</font></b></p>';
echo '<div class="mform error">'.get_string('saving_failed','feedback').'</div>';
}
if(isset($savereturn) && $savereturn == 'missing') {
echo '<p align="center"><b><font color="red">'.get_string('saving_failed_because_missing_or_false_values','feedback').'</font></b></p>';
echo '<div class="mform error">'.get_string('saving_failed_because_missing_or_false_values','feedback').'</div>';
}
//print the items
if(is_array($feedbackitems)){
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="mdl-align"><form name="frm" action="complete.php" method="post" onsubmit=" ">';
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
echo '<div class="feedback_form">';
echo '<form action="complete.php" method="post" onsubmit=" ">';
echo '<fieldset>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<table>';
echo '<div class="feedback_anonymousinfo">';
switch ($feedback->anonymous) {
case FEEDBACK_ANONYMOUS_YES:
echo '<tr><th colspan="3" align="center"><input type="hidden" name="anonymous" value="1" /><input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />'.get_string('mode', 'feedback').': '.get_string('anonymous', 'feedback').'</th></tr>'; //arb
echo '<input type="hidden" name="anonymous" value="1" />';
echo '<input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />';
echo get_string('mode', 'feedback').': '.get_string('anonymous', 'feedback');
break;
case FEEDBACK_ANONYMOUS_NO:
echo '<tr><th colspan="3" align="center"><input type="hidden" name="anonymous" value="0" /><input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_NO.'" />'.get_string('mode', 'feedback').': '.get_string('non_anonymous', 'feedback').'&nbsp;</td></tr>'; //arb
echo '<input type="hidden" name="anonymous" value="0" />';
echo '<input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_NO.'" />';
echo get_string('mode', 'feedback').': '.get_string('non_anonymous', 'feedback');
break;
}
echo '</div>';
//check, if there exists required-elements
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
if($countreq > 0) {
echo '<tr><td colspan="3"><font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font></td></tr>';
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
}
echo '<div class="feedback_items_complete">';
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, true);
echo '<div class="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, true);
}
}
}
echo '<tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
}
if($feedbackitem->typ != 'pagebreak') {
feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
}
echo '</tr>';
echo '<tr><td>&nbsp;</td></tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
}
if($feedbackitem->typ != 'pagebreak') {
echo '<div class="box generalbox boxalign_'.$align.'">';
feedback_print_item_complete($feedbackitem, $value, $highlightrequired);
echo '</div>';
}
echo '</div>';
$lastbreakposition = $feedbackitem->position; //last item-pos (item or pagebreak)
if($feedbackitem->typ == 'pagebreak'){
@@ -405,7 +416,7 @@ if($feedback_can_submit) {
$lastitem = $feedbackitem;
}
}
echo '</table>';
echo '</div>';
echo '<input type="hidden" name="id" value="'.$id.'" />';
echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'" />';
echo '<input type="hidden" name="lastpage" value="'.$gopage.'" />';
@@ -427,24 +438,29 @@ if($feedback_can_submit) {
echo '<input name="savevalues" type="submit" value="'.get_string('save_entries','feedback').'" />';
}
echo '</fieldset>';
echo '</form>';
if($courseid) {
echo '<form name="frm" action="'.$CFG->wwwroot.'/course/view.php?id='.$courseid.'" method="post" onsubmit=" ">';
}else{
if($course->id == SITEID) {
echo '<form name="frm" action="'.$CFG->wwwroot.'" method="post" onsubmit=" ">';
} else {
echo '<form name="frm" action="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'" method="post" onsubmit=" ">';
}
echo '</div>';
echo '<div class="feedback_complete_cancel">';
if($courseid) {
echo '<form action="'.$CFG->wwwroot.'/course/view.php?id='.$courseid.'" method="post" onsubmit=" ">';
}else{
if($course->id == SITEID) {
echo '<form action="'.$CFG->wwwroot.'" method="post" onsubmit=" ">';
} else {
echo '<form action="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'" method="post" onsubmit=" ">';
}
}
echo '<fieldset>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="courseid" value="'. $courseid . '" />';
echo '<button type="submit">'.get_string('cancel').'</button>';
echo '</fieldset>';
echo '</form>';
echo '</div>';
$SESSION->feedback->is_started = true;
echo $OUTPUT->box_end();
// echo $OUTPUT->box_end();
}
}
}else {
mod/feedback/edit.php
+131 -181
View File
@@ -214,6 +214,8 @@ if($do_show == 'edit') {
if(is_array($feedbackitems)){
$itemnr = 0;
$align = right_to_left() ? 'right' : 'left';
$helpbutton = $OUTPUT->help_icon('preview', 'feedback');
@@ -221,7 +223,7 @@ if($do_show == 'edit') {
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
echo $OUTPUT->heading('<a href="edit.php?id='.$id.'">'.get_string('cancel_moving', 'feedback').'</a>');
}
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
// echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
//check, if there exists required-elements
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=> 1));
@@ -230,189 +232,137 @@ if($do_show == 'edit') {
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
}
echo '<table>';
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition = 1;
$movehereurl = new moodle_url($url, array('movehere'=>$moveposition));
echo '<tr>'; //only shown if shouldmoving = 1
echo '<td>';
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
// echo '<form action="edit.php" method="post"><fieldset>';
// echo '<input title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" hspace="1" height="16" width="80" border="0" />';
// echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
echo '</td>';
echo '</tr>';
}
//print the inserted items
$itempos = 0;
foreach($feedbackitems as $feedbackitem){
$itempos++;
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->movingitem == $feedbackitem->id){ //hiding the item to move
continue;
}
echo '<tr>';
//items without value only are labels
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
}
if($feedbackitem->typ != 'pagebreak') {
feedback_print_item_preview($feedbackitem);
}else {
echo '<td class="feedback_pagebreak"><b>'.get_string('pagebreak', 'feedback').'</b></td><td><hr width="100%" size="8px" noshade="noshade" /></td>';
}
echo '<td>('.get_string('position', 'feedback').':'.$itempos .')</td>';
echo '<td>';
if($feedbackitem->position > 1){
$moveupurl = new moodle_url($url, array('moveupitem'=>$feedbackitem->id));
$buttonlink = $moveupurl->out();
echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->pix_url('t/up') . '" />
</a>';
//print the button to move-up the item
// echo '<form action="edit.php" method="post"><fieldset>';
// ///////echo '<input title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_moveup_button" title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" />';
// echo '<input type="hidden" name="moveupitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
}else{
echo '&nbsp;';
}
echo '</td>';
echo '<td>';
if($feedbackitem->position < $lastposition - 1){
$movedownurl = new moodle_url($url, array('movedownitem'=>$feedbackitem->id));
$buttonlink = $movedownurl->out();
echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->pix_url('t/down') . '" />
</a>';
//print the button to move-down the item
// echo '<form action="edit.php" method="post"><fieldset>';
// echo '<input title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_movedown_button" title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" />';
// echo '<input type="hidden" name="movedownitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
}else{
echo '&nbsp;';
}
echo '</td>';
echo '<td>';
$moveurl = new moodle_url($url, array('moveitem'=>$feedbackitem->id));
$buttonlink = $moveurl->out();
echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->pix_url('t/move') . '" />
</a>';
// echo '<form action="edit.php" method="post"><fieldset>';
// echo '<input title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_move_button" title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" />';
// echo '<input type="hidden" name="moveitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
echo '</td>';
echo '<td>';
//print the button to edit the item
if($feedbackitem->typ != 'pagebreak') {
$editurl = new moodle_url('/mod/feedback/edit_item.php');
$editurl->params(array('do_show'=>$do_show,
'cmid'=>$id,
'id'=>$feedbackitem->id,
'typ'=>$feedbackitem->typ));
// in edit_item.php the param id is used for the itemid and the cmid is the id to get the module
$buttonlink = $editurl->out();
echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->pix_url('t/edit') . '" />
</a>';
// echo '<form action="edit_item.php" method="post"><fieldset>';
// echo '<input title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_edit_button" title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" />';
// echo '<input type="hidden" name="itemid" value="'.$feedbackitem->id.'" />';
// echo '<input type="hidden" name="typ" value="'.$feedbackitem->typ.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
}else {
echo '&nbsp;';
}
echo '</td>';
echo '<td>';
//print the toggle-button to switch required yes/no
if($feedbackitem->hasvalue == 1) {
// echo '<form action="edit.php" method="post"><fieldset>';
if($feedbackitem->required == 1) {
// echo '<input title="'.get_string('switch_item_to_not_required','feedback').'" type="image" src="pics/required.gif" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_required_button" title="'.get_string('switch_item_to_not_required','feedback').'" type="image" src="pics/required.gif" />';
$buttontitle = get_string('switch_item_to_not_required','feedback');
$buttonimg = 'pics/required.gif';
} else {
// echo '<input title="'.get_string('switch_item_to_required','feedback').'" type="image" src="pics/notrequired.gif" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_required_button" title="'.get_string('switch_item_to_required','feedback').'" type="image" src="pics/notrequired.gif" />';
$buttontitle = get_string('switch_item_to_required','feedback');
$buttonimg = 'pics/notrequired.gif';
}
$requiredurl = new moodle_url($url, array('switchitemrequired'=>$feedbackitem->id));
$buttonlink = $requiredurl->out();
echo '<a class="icon feedback_switchrequired" title="'.$buttontitle.'" href="'.$buttonlink.'">
<img alt="'.$buttontitle.'" src="'.$buttonimg.'" />
</a>';
// echo '<input type="hidden" name="switchitemrequired" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
}else {
echo '&nbsp;';
}
echo '</td>';
echo '<td>';
$deleteitemurl = new moodle_url('/mod/feedback/delete_item.php');
$deleteitemurl->params(array('id'=>$id,
'do_show'=>$do_show,
'deleteitem'=>$feedbackitem->id));
$buttonlink = $deleteitemurl->out();
echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
</a>';
//print the button to drop the item
// echo '<form action="delete_item.php" method="post"><fieldset>';
// echo '<input class="feedback_delete_button" title="'.get_string('delete_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/delete') . '" />';
// echo '<input type="hidden" name="deleteitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
echo '</td>';
echo '</tr>';
//use list instead a table
echo '<div class="feedback_items_edit">';
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition++;
$movehereurl->param('movehere', $moveposition);
echo '<tr>'; //only shown if shouldmoving = 1
echo '<td>';
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
// echo '<form action="edit.php" method="post"><fieldset>';
// echo '<input class="feedback_movehere_button" title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" />';
// echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
// feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>';
echo '</td>';
echo '</tr>';
}else {
echo '<tr><td>&nbsp;</td></tr>';
$moveposition = 1;
$movehereurl = new moodle_url($url, array('movehere'=>$moveposition));
echo '<div class="feedback_item_box_'.$align.' clipboard">'; //only shown if shouldmoving = 1
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
echo '</div>';
}
//print the inserted items
$itempos = 0;
foreach($feedbackitems as $feedbackitem){
$itempos++;
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->movingitem == $feedbackitem->id){ //hiding the item to move
continue;
}
echo '<div class="feedback_item_box_'.$align.'">';
//items without value only are labels
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
}
echo '<div class="box generalbox boxalign_'.$align.'">';
echo '<div class="feedback_item_commands_'.$align.'">';
echo '<span class="feedback_item_commands">('.get_string('position', 'feedback').':'.$itempos .')</span>';
//print the moveup-button
if($feedbackitem->position > 1){
echo '<span class="feedback_item_command_moveup">';
$moveupurl = new moodle_url($url, array('moveupitem'=>$feedbackitem->id));
$buttonlink = $moveupurl->out();
echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->pix_url('t/up') . '" />
</a>';
echo '</span>';
}
//print the movedown-button
if($feedbackitem->position < $lastposition - 1){
echo '<span class="feedback_item_command_movedown">';
$movedownurl = new moodle_url($url, array('movedownitem'=>$feedbackitem->id));
$buttonlink = $movedownurl->out();
echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->pix_url('t/down') . '" />
</a>';
echo '</span>';
}
//print the move-button
echo '<span class="feedback_item_command_move">';
$moveurl = new moodle_url($url, array('moveitem'=>$feedbackitem->id));
$buttonlink = $moveurl->out();
echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->pix_url('t/move') . '" />
</a>';
echo '</span>';
//print the button to edit the item
if($feedbackitem->typ != 'pagebreak') {
echo '<span class="feedback_item_command_edit">';
$editurl = new moodle_url('/mod/feedback/edit_item.php');
$editurl->params(array('do_show'=>$do_show,
'cmid'=>$id,
'id'=>$feedbackitem->id,
'typ'=>$feedbackitem->typ));
// in edit_item.php the param id is used for the itemid and the cmid is the id to get the module
$buttonlink = $editurl->out();
echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->pix_url('t/edit') . '" />
</a>';
echo '</span>';
}
}
echo '</table>';
echo $OUTPUT->box_end();
//print the toggle-button to switch required yes/no
if($feedbackitem->hasvalue == 1) {
echo '<span class="feedback_item_command_toggle">';
// echo '<form action="edit.php" method="post"><fieldset>';
if($feedbackitem->required == 1) {
// echo '<input title="'.get_string('switch_item_to_not_required','feedback').'" type="image" src="pics/required.gif" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_required_button" title="'.get_string('switch_item_to_not_required','feedback').'" type="image" src="pics/required.gif" />';
$buttontitle = get_string('switch_item_to_not_required','feedback');
$buttonimg = 'pics/required.gif';
} else {
// echo '<input title="'.get_string('switch_item_to_required','feedback').'" type="image" src="pics/notrequired.gif" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_required_button" title="'.get_string('switch_item_to_required','feedback').'" type="image" src="pics/notrequired.gif" />';
$buttontitle = get_string('switch_item_to_required','feedback');
$buttonimg = 'pics/notrequired.gif';
}
$requiredurl = new moodle_url($url, array('switchitemrequired'=>$feedbackitem->id));
$buttonlink = $requiredurl->out();
echo '<a class="icon feedback_switchrequired" title="'.$buttontitle.'" href="'.$buttonlink.'">
<img alt="'.$buttontitle.'" src="'.$buttonimg.'" />
</a>';
echo '</span>';
}
//print the delete-button
echo '<span class="feedback_item_command_toggle">';
$deleteitemurl = new moodle_url('/mod/feedback/delete_item.php');
$deleteitemurl->params(array('id'=>$id,
'do_show'=>$do_show,
'deleteitem'=>$feedbackitem->id));
$buttonlink = $deleteitemurl->out();
echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
</a>';
echo '</span>';
echo '</div>';
if($feedbackitem->typ != 'pagebreak') {
// echo '<div class="feedback_item_'.$align.'">';
feedback_print_item_preview($feedbackitem);
}else {
echo '<div class="feedback_pagebreak">'.get_string('pagebreak', 'feedback').'<hr class="feedback_pagebreak" /></div>';
}
echo '</div>';
echo '</div>';
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {
$moveposition++;
$movehereurl->param('movehere', $moveposition);
echo '<div class="clipboard">'; //only shown if shouldmoving = 1
$buttonlink = $movehereurl->out();
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>';
echo '</div>';
}
echo '<div class="clearer">&nbsp;</div>';
}
echo '</div>';
// echo $OUTPUT->box_end();
}else{
echo $OUTPUT->box(get_string('no_items_available_yet','feedback'),'generalbox boxaligncenter');
}
mod/feedback/item/captcha/lib.php
+46 -46
View File
@@ -124,24 +124,23 @@ class feedback_item_captcha extends feedback_item_base {
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
$imglink = new moodle_url('/mod/feedback/item/captcha/print_captcha.php', array('id'=>$cmid));
?>
<img alt="<?php echo $this->type;?>" src="<?php echo $imglink->out();?>" />
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
?>
<input type="text" name="<?php echo $item->typ . '_' . $item->id;?>"
size="<?php echo $presentation;?>"
maxlength="<?php echo $presentation;?>"
value="" />
</td>
<?php
echo '<div class="feedback_item_captcha_img_'.$align.'">';
echo '<img alt="'.$this->type.'" src="'.$imglink->out().'" />';
echo '</div>';
echo '<div class="feedback_item_captcha_text_'.$align.'">';
echo '<input type="text" name="'.$item->typ.'_'.$item->id.'" size="'.$presentation.'" maxlength="'.$presentation.'" value="" />';
echo '</div>';
echo '</div>';
}
/**
@@ -185,26 +184,27 @@ class feedback_item_captcha extends feedback_item_base {
}
if(($highlightrequire AND $item->required AND !$checked) OR $falsevalue) {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<div class="feedback_item_captcha_img_'.$align.'">';
$imglink = new moodle_url('/mod/feedback/item/captcha/print_captcha.php', array('id'=>$cmid));
?>
<img alt="<?php echo $this->type;?>" src="<?php echo $imglink->out();?>" />
</td>
<td valign="top" align="<?php echo $align;?>">
<input type="text" name="<?php echo $item->typ . '_' . $item->id;?>"
size="<?php echo $presentation;?>"
maxlength="<?php echo $presentation;?>"
value="" />
</td>
<?php
echo '<img alt="'.$this->type.'" src="'.$imglink->out().'" />';
echo '</div>';
echo '<div class="feedback_item_captcha_text_'.$align.'">';
echo '<input type="text" name="'.$item->typ.'_'.$item->id.'" size="'.$presentation.'" maxlength="'.$presentation.'" value="" />';
echo '</div>';
echo '</div>';
}
/**
@@ -233,23 +233,23 @@ class feedback_item_captcha extends feedback_item_base {
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<div class="feedback_item_captcha_img_'.$align.'">';
$imglink = new moodle_url('/mod/feedback/item/captcha/print_captcha.php', array('id'=>$cmid));
?>
<img alt="<?php echo $this->type;?>" src="<?php echo $imglink->out();?>" />
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value ? $value : '&nbsp;';
echo $OUTPUT->box_end();
?>
</td>
<?php
echo '<img alt="'.$this->type.'" src="'.$imglink->out().'" />';
echo '</div>';
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value ? $value : '&nbsp;';
echo $OUTPUT->box_end();
echo '</div>';
}
mod/feedback/item/info/info_form.php
+2 -2
View File
@@ -23,8 +23,8 @@ class feedback_info_form extends feedback_item_form {
$options=array();
$options[1] = get_string('responsetime', 'feedback');
$options[2] = get_string('coursename', 'feedback');
$options[3] = get_string('coursecategory', 'feedback');
$options[2] = get_string('course');
$options[3] = get_string('coursecategory');
$this->infotype = &$mform->addElement('select', 'presentation', get_string('infotype', 'feedback'), $options);
////////////////////////////////////////////////////////////////////////
mod/feedback/item/info/lib.php
+68 -77
View File
@@ -163,38 +163,35 @@ class feedback_item_info extends feedback_item_base {
$presentation = $item->presentation;
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
$feedback = $DB->get_record('feedback', array('id'=>$item->feedback));
$course = $DB->get_record('course', array('id'=>$feedback->course));
$coursecategory = $DB->get_record('course_categories', array('id'=>$course->category));
switch($presentation) {
case 1:
$itemvalue = time();
$itemshowvalue = UserDate($itemvalue);
break;
case 2:
$itemvalue = $course->shortname;
$itemshowvalue = $itemvalue;
break;
case 3:
$itemvalue = $coursecategory->name;
$itemshowvalue = $itemvalue;
break;
}
?>
<input type="hidden" name="<?php echo $item->typ . '_' . $item->id;?>"
value="<?php echo $itemvalue;?>" />
<span><?php echo $itemshowvalue;?></span>
</td>
<?php
$feedback = $DB->get_record('feedback', array('id'=>$item->feedback));
$course = $DB->get_record('course', array('id'=>$feedback->course));
$coursecategory = $DB->get_record('course_categories', array('id'=>$course->category));
switch($presentation) {
case 1:
$itemvalue = time();
$itemshowvalue = UserDate($itemvalue);
break;
case 2:
$itemvalue = $course->shortname;
$itemshowvalue = $itemvalue;
break;
case 3:
$itemvalue = $coursecategory->name;
$itemshowvalue = $itemvalue;
break;
}
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<input type="hidden" name="'.$item->typ.'_'.$item->id.'" value="'.$itemvalue.'" />';
echo '<span class="feedback_item_info">'.$itemshowvalue.'</span>';
echo '</div>';
}
/**
@@ -212,42 +209,40 @@ class feedback_item_info extends feedback_item_base {
$presentation = $item->presentation;
if($highlightrequire AND $item->required AND strval($value) == '') {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
$feedback = $DB->get_record('feedback', array('id'=>$item->feedback));
$course = $DB->get_record('course', array('id'=>$feedback->course));
$coursecategory = $DB->get_record('course_categories', array('id'=>$course->category));
switch($presentation) {
case 1:
$itemvalue = time();
$itemshowvalue = UserDate($itemvalue);
break;
case 2:
$itemvalue = $course->shortname;
$itemshowvalue = $itemvalue;
break;
case 3:
$itemvalue = $coursecategory->name;
$itemshowvalue = $itemvalue;
break;
}
?>
<input type="hidden" name="<?php echo $item->typ . '_' . $item->id;?>"
value="<?php echo $itemvalue;?>" />
<span><?php echo $itemshowvalue;?></span>
</td>
<?php
$feedback = $DB->get_record('feedback', array('id'=>$item->feedback));
$course = $DB->get_record('course', array('id'=>$feedback->course));
$coursecategory = $DB->get_record('course_categories', array('id'=>$course->category));
switch($presentation) {
case 1:
$itemvalue = time();
$itemshowvalue = UserDate($itemvalue);
break;
case 2:
$itemvalue = $course->shortname;
$itemshowvalue = $itemvalue;
break;
case 3:
$itemvalue = $coursecategory->name;
$itemshowvalue = $itemvalue;
break;
}
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<input type="hidden" name="'.$item->typ.'_'.$item->id.'" value="'.$itemvalue.'" />';
echo '<span class="feedback_item_info">'.$itemshowvalue.'</span>';
echo '</div>';
}
/**
@@ -264,21 +259,17 @@ class feedback_item_info extends feedback_item_base {
$presentation = $item->presentation;
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value ? UserDate($value):'&nbsp;';
echo $OUTPUT->box_end();
?>
</td>
<?php
echo '</div>';
//print the presentation
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value ? UserDate($value):'&nbsp;';
echo $OUTPUT->box_end();
}
function check_value($value, $item) {
mod/feedback/item/label/lib.php
+2 -8
View File
@@ -116,14 +116,8 @@ class feedback_item_label extends feedback_item_base {
$item->presentationformat = FORMAT_HTML;
$item->presentationtrust = 1;
?>
<td colspan="2">
<?php
$output = file_rewrite_pluginfile_urls($item->presentation, 'pluginfile.php', $context->id, $filearea, $item->id);
echo format_text($output, FORMAT_HTML);
?>
</td>
<?php
$output = file_rewrite_pluginfile_urls($item->presentation, 'pluginfile.php', $context->id, $filearea, $item->id);
echo format_text($output, FORMAT_HTML);
}
/**
mod/feedback/item/multichoice/lib.php
+123 -167
View File
@@ -249,44 +249,37 @@ class feedback_item_multichoice extends feedback_item_base {
//test if required and no value is set so we have to mark this item
//we have to differ check and the other subtypes
if($info->subtype == 'c') {
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
echo '<td valign="top" align="'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false).'</td>';
echo '<td valign="top" align="'.$align.'">';
}else {
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
}
$requiredmark = ($item->required == 1) ? '<span class="feedback_required_mark">*</span>' : '';
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
$index = 1;
$checked = '';
//print the "not_selected" item on radiobuttons
if($info->subtype == 'r') {
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>">
<input type="radio" name="<?php echo $item->typ . '_' . $item->id ;?>" id="<?php echo $item->typ . '_' . $item->id.'_xxx';?>" value="" checked="checked" />
</td>
<td align="<?php echo $align;?>">
<label for="<?php echo $item->typ . '_' . $item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</td>
</tr></table>
<?php
echo '<ul>';
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
if($info->subtype != 'd') {
if($info->horizontal) {
echo '<table><tr>';
}
if($info->subtype == 'r') {
//print the "not_selected" item on radiobuttons
?>
<li class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<input type="radio" name="<?php echo $item->typ . '_' . $item->id ;?>" id="<?php echo $item->typ . '_' . $item->id.'_xxx';?>" value="" checked="checked" />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $item->typ . '_' . $item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</span>
</li>
<?php
}
switch($info->subtype) {
@@ -300,20 +293,8 @@ class feedback_item_multichoice extends feedback_item_base {
$this->print_item_dropdown($presentation, $item, false, $info, $align);
break;
}
if($info->subtype != 'd') {
if($info->horizontal) {
echo '</tr></table>';
}
}
/*
if($item->required == 1) {
echo '<input type="hidden" name="'.$item->typ . '_' . $item->id.'" value="1" />';
}
*/
?>
</td>
<?php
echo '</ul>';
echo '</div>';
}
/**
@@ -342,53 +323,47 @@ class feedback_item_multichoice extends feedback_item_base {
$values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value);
}
if($highlightrequire AND $item->required AND $values[0] == '') {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
echo '<td '.$highlight.' valign="top" align="'.$align.'">';
echo format_text($item->name.$requiredmark, true, false, false).'</td>';
echo '<td valign="top" align="'.$align.'">';
}else {
if($highlightrequire AND $item->required AND intval($value) <= 0) {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
}
$index = 1;
$checked = '';
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
echo '<ul>';
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
//print the "not_selected" item on radiobuttons
if($info->subtype == 'r') {
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $item->typ . '_' . $item->id ;?>"
id="<?php echo $item->typ . '_' . $item->id.'_xxx';?>"
value="" <?php echo $value ? '' : 'checked="checked"';?> />
</td>
<td align="<?php echo $align;?>">
<label for="<?php echo $item->typ . '_' . $item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</td>
</tr></table>
<li class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<input type="radio" name="<?php echo $item->typ.'_'.$item->id ;?>" id="<?php echo $item->typ . '_' . $item->id.'_xxx';?>" value="" <?php echo $value ? '' : 'checked="checked"';?> />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $item->typ.'_'.$item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</span>
</li>
<?php
}
if($info->subtype != 'd') {
if($info->horizontal) {
echo '<table><tr>';
}
}
switch($info->subtype) {
case 'r':
@@ -401,20 +376,8 @@ class feedback_item_multichoice extends feedback_item_base {
$this->print_item_dropdown($presentation, $item, $value, $info, $align);
break;
}
if($info->subtype != 'd') {
if($info->horizontal) {
echo '</tr></table>';
}
}
/*
if($item->required == 1) {
echo '<input type="hidden" name="'.$item->typ . '_' . $item->id.'" value="1" />';
}
*/
?>
</td>
<?php
echo '</ul>';
echo '</div>';
}
/**
@@ -442,31 +405,27 @@ class feedback_item_multichoice extends feedback_item_base {
$values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value);
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
echo '<td valign="top" align="'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false).'</td>';
echo '<td valign="top" align="'.$align.'">';
}else {
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
}
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
$index = 1;
$checked = '';
if($info->subtype == 'c') {
echo $OUTPUT->box_start('generalbox boxalign'.$align);
foreach($presentation as $pres){
foreach($values as $val) {
if($val == $index){
echo text_to_html($pres . '<br />', true, false, false);
echo '<div class="feedback_item_multianswer">';
echo text_to_html($pres, true, false, false);
echo '</div>';
break;
}
}
@@ -484,9 +443,7 @@ class feedback_item_multichoice extends feedback_item_base {
$index++;
}
}
?>
</td>
<?php
echo '</div>';
}
function check_value($value, $item) {
@@ -573,6 +530,13 @@ class feedback_item_multichoice extends feedback_item_base {
function print_item_radio($presentation, $item, $value, $info, $align) {
$index = 1;
$checked = '';
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
foreach($presentation as $radio){
if($value == $index){
$checked = 'checked="checked"';
@@ -581,28 +545,16 @@ class feedback_item_multichoice extends feedback_item_base {
}
$inputname = $item->typ . '_' . $item->id;
$inputid = $inputname.'_'.$index;
if($info->horizontal) {
?>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $inputname;?>"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td>
<td align="<?php echo $align;?>">
<li class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<input type="radio" name="<?php echo $inputname;?>" id="<?php echo $inputid;?>" value="<?php echo $index;?>" <?php echo $checked;?> />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $inputid;?>"><?php echo text_to_html($radio, true, false, false);?>&nbsp;</label>
</td>
</span>
</li>
<?php
}else {
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $inputname;?>"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td><td align="<?php echo $align;?>"><label for="<?php echo $inputid;?>"><?php echo text_to_html($radio, true, false, false);?>&nbsp;</label>
</td></tr></table>
<?php
}
$index++;
}
}
@@ -614,6 +566,12 @@ class feedback_item_multichoice extends feedback_item_base {
}else {
$values = explode(FEEDBACK_MULTICHOICE_LINE_SEP, $value);
}
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
$index = 1;
$checked = '';
@@ -628,50 +586,48 @@ class feedback_item_multichoice extends feedback_item_base {
}
$inputname = $item->typ. '_' . $item->id;
$inputid = $item->typ. '_' . $item->id.'_'.$index;
if($info->horizontal) {
?>
<td valign="top" align="<?php echo $align;?>"><input type="checkbox"
name="<?php echo $inputname;?>[]"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td><td align="<?php echo $align;?>"><label for="<?php echo $inputid;?>"><?php echo text_to_html($check, true, false, false);?>&nbsp;</label>
</td>
<li class="feedback_item_check_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_check_<?php echo $hv.'_'.$align;?>">
<input type="checkbox" name="<?php echo $inputname;?>[]" id="<?php echo $inputid;?>" value="<?php echo $index;?>" <?php echo $checked;?> />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $inputid;?>"><?php echo text_to_html($check, true, false, false);?>&nbsp;</label>
</span>
</li>
<?php
}else {
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>"><input type="checkbox"
name="<?php echo $inputname;?>[]"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td><td align="<?php echo $align;?>"><label for="<?php echo $inputid;?>"><?php echo text_to_html($check, true, false, false);?>&nbsp;</label>
</td></tr></table>
<?php
}
$index++;
}
}
function print_item_dropdown($presentation, $item, $value, $info, $align) {
?>
<select name="<?php echo $item->typ .'_' . $item->id;?>" size="1">
<option value="0">&nbsp;</option>
<?php
$index = 1;
$checked = '';
foreach($presentation as $dropdown){
if($value == $index){
$selected = 'selected="selected"';
}else{
$selected = '';
}
?>
<option value="<?php echo $index;?>" <?php echo $selected;?>><?php echo text_to_html($dropdown, true, false, false);?></option>
<?php
$index++;
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
?>
</select>
<li class="feedback_item_select_<?php echo $hv.'_'.$align;?>">
<select name="<?php echo $item->typ .'_' . $item->id;?>" size="1">
<option value="0">&nbsp;</option>
<?php
$index = 1;
$checked = '';
foreach($presentation as $dropdown){
if($value == $index){
$selected = 'selected="selected"';
}else{
$selected = '';
}
?>
<option value="<?php echo $index;?>" <?php echo $selected;?>><?php echo text_to_html($dropdown, true, false, false);?></option>
<?php
$index++;
}
?>
</select>
</li>
<?php
}
mod/feedback/item/multichoicerated/lib.php
+91 -105
View File
@@ -236,17 +236,14 @@ class feedback_item_multichoicerated extends feedback_item_base {
$lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
$index = 1;
$checked = '';
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
switch($info->subtype) {
case 'r':
$this->print_item_radio($item, false, $info, $align, true, $lines);
@@ -255,9 +252,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
$this->print_item_dropdown($item, false, $info, $align, true, $lines);
break;
}
?>
</td>
<?php
echo '</div>';
}
/**
@@ -277,20 +272,18 @@ class feedback_item_multichoicerated extends feedback_item_base {
$lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
if($highlightrequire AND $item->required AND intval($value) <= 0) {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
$index = 1;
$checked = '';
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
switch($info->subtype) {
case 'r':
$this->print_item_radio($item, $value, $info, $align, false, $lines);
@@ -299,9 +292,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
$this->print_item_dropdown($item, $value, $info, $align, false, $lines);
break;
}
?>
</td>
<?php
echo '</div>';
}
/**
@@ -319,17 +310,16 @@ class feedback_item_multichoicerated extends feedback_item_base {
$lines = explode (FEEDBACK_MULTICHOICERATED_LINE_SEP, $info->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
$index = 1;
$checked = '';
foreach($lines as $line){
if($value == $index){
$item_value = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line);
@@ -340,9 +330,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
}
$index++;
}
?>
</td>
<?php
echo '</div>';
}
function check_value($value, $item) {
@@ -409,21 +397,23 @@ class feedback_item_multichoicerated extends feedback_item_base {
function print_item_radio($item, $value, $info, $align, $showrating, $lines) {
$index = 1;
$checked = '';
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $item->typ . '_' . $item->id ;?>"
id="<?php echo $item->typ.'_'.$item->id.'_xxx';?>"
value="" <?php echo $value ? '' : 'checked="checked"';?> />
</td>
<td align="<?php echo $align;?>">
<label for="<?php echo $item->typ.'_'.$item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</td>
</tr></table>
<?php
if($info->horizontal) {
echo '<table><tr>';
$hv = 'h';
}else {
$hv = 'v';
}
echo '<ul>';
?>
<li class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<input type="radio" name="<?php echo $item->typ . '_' . $item->id ;?>" id="<?php echo $item->typ . '_' . $item->id.'_xxx';?>" value="" checked="checked" />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $item->typ . '_' . $item->id.'_xxx';?>"><?php print_string('not_selected', 'feedback');?>&nbsp;</label>
</span>
</li>
<?php
foreach($lines as $line){
if($value == $index){
$checked = 'checked="checked"';
@@ -433,66 +423,62 @@ class feedback_item_multichoicerated extends feedback_item_base {
$radio_value = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line);
$inputname = $item->typ . '_' . $item->id;
$inputid = $inputname.'_'.$index;
if($info->horizontal) {
?>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $inputname;?>"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td><td align="<?php echo $align;?>"><label for="<?php echo $inputid;?>"><?php
if($showrating) {
echo text_to_html('('.$radio_value[0].') '.$radio_value[1], true, false, false);
}else {
echo text_to_html($radio_value[1], true, false, false);
}
?>&nbsp;</label>
</td>
?>
<li class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<span class="feedback_item_radio_<?php echo $hv.'_'.$align;?>">
<input type="radio" name="<?php echo $inputname;?>" id="<?php echo $inputid;?>" value="<?php echo $index;?>" <?php echo $checked;?> />
</span>
<span class="feedback_item_radiolabel_<?php echo $hv.'_'.$align;?>">
<label for="<?php echo $inputid;?>">
<?php
if($showrating) {
echo text_to_html('('.$radio_value[0].') '.$radio_value[1], true, false, false);
}else {
echo text_to_html($radio_value[1], true, false, false);
}
?>
</label>
</span>
</li>
<?php
}else {
?>
<table><tr>
<td valign="top" align="<?php echo $align;?>"><input type="radio"
name="<?php echo $inputname;?>"
id="<?php echo $inputid;?>"
value="<?php echo $index;?>" <?php echo $checked;?> />
</td><td align="<?php echo $align;?>"><label for="<?php echo $inputid;?>"><?php
if($showrating) {
echo text_to_html('('.$radio_value[0].') '.$radio_value[1], true, false, false);
}else {
echo text_to_html($radio_value[1], true, false, false);
}
?>&nbsp;</label>
</td></tr></table>
<?php
}
$index++;
}
if($info->horizontal) {
echo '</tr></table>';
}
echo '</ul>';
}
function print_item_dropdown($item, $value, $info, $align, $showrating, $lines) {
echo '<select name="'. $item->typ . '_' . $item->id . '">';
echo '<option value="0">&nbsp;</option>';
$index = 1;
$checked = '';
foreach($lines as $line){
if($value == $index){
$selected = 'selected="selected"';
}else{
$selected = '';
}
$dropdown_value = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line);
if($showrating) {
echo '<option value="'. $index.'" '. $selected.'>'. clean_text('('.$dropdown_value[0].') '.$dropdown_value[1]).'</option>';
}else {
echo '<option value="'. $index.'" '. $selected.'>'. clean_text($dropdown_value[1]).'</option>';
}
$index++;
if($info->horizontal) {
$hv = 'h';
}else {
$hv = 'v';
}
echo '</select>';
echo '<ul>';
?>
<li class="feedback_item_select_<?php echo $hv.'_'.$align;?>">
<select name="<?php echo $item->typ.'_'.$item->id;?>'">
<option value="0">&nbsp;</option>
<?php
$index = 1;
$checked = '';
foreach($lines as $line){
if($value == $index){
$selected = 'selected="selected"';
}else{
$selected = '';
}
$dropdown_value = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $line);
if($showrating) {
echo '<option value="'.$index.'" '.$selected.'>'.clean_text('('.$dropdown_value[0].') '.$dropdown_value[1]).'</option>';
}else {
echo '<option value="'.$index.'" '.$selected.'>'.clean_text($dropdown_value[1]).'</option>';
}
$index++;
}
?>
</select>
</li>
<?php
echo '</ul>';
}
function prepare_presentation_values($linesep1, $linesep2, $valuestring, $valuesep1, $valuesep2) {
mod/feedback/item/numeric/lib.php
+78 -73
View File
@@ -194,30 +194,33 @@ class feedback_item_numeric extends feedback_item_base {
//get the max-value
$range_to = (isset($range_from_to[1]) AND is_numeric($range_from_to[1])) ? floatval($range_from_to[1]) : 0;
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<input type="text" name="<?php echo $item->typ.'_'.$item->id; ?>" size="10" maxlength="10" value="" />
</td>
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
echo '<span class="feedback_item_numinfo">';
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
echo '</span>';
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<span class="feedback_item_textfield">';
echo '<input type="text" name="'.$item->typ.'_'.$item->id.'" size="10" maxlength="10" value="" />';
echo '</span>';
echo '</div>';
}
/**
@@ -240,34 +243,38 @@ class feedback_item_numeric extends feedback_item_base {
//get the max-value
$range_to = (isset($range_from_to[1]) AND is_numeric($range_from_to[1])) ? floatval($range_from_to[1]) : 0;
if($highlightrequire AND (!$this->check_value($value, $item))) {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<input type="text" name="<?php echo $item->typ.'_'.$item->id; ?>" size="10" maxlength="10" value="<?php echo $value ? $value : ''; ?>" />
</td>
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name . $requiredmark, true, false, false);
echo '<span class="feedback_item_numinfo">';
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
echo '</span>';
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
echo '<span class="feedback_item_textfield">';
echo '<input type="text" name="'.$item->typ.'_'.$item->id.'" size="10" maxlength="10" value="'.($value ? $value : '').'" />';
echo '</span>';
echo '</div>';
}
/**
@@ -289,34 +296,32 @@ class feedback_item_numeric extends feedback_item_base {
//get the max-value
$range_to = (isset($range_from_to[1]) AND is_numeric($range_from_to[1])) ? floatval($range_from_to[1]) : 0;
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
switch(true) {
case ($range_from === '-' AND is_numeric($range_to)):
echo ' ('.get_string('maximal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
case (is_numeric($range_from) AND $range_to === '-'):
echo ' ('.get_string('minimal', 'feedback').': '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).')';
break;
case ($range_from === '-' AND $range_to === '-'):
break;
default:
echo ' ('.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_from).' - '.str_replace(FEEDBACK_DECIMAL, $this->sep_dec, $range_to).')';
break;
}
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo (is_numeric($value)) ? number_format($value, 2, $this->sep_dec, $this->sep_thous) : '&nbsp;';
echo $OUTPUT->box_end();
?>
</td>
<?php
echo '</div>';
}
function check_value($value, $item) {
mod/feedback/item/textarea/lib.php
+30 -35
View File
@@ -157,19 +157,18 @@ class feedback_item_textarea extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<textarea name="<?php echo $item->typ . '_' . $item->id;?>"
cols="<?php echo $presentation[0];?>"
rows="<?php echo $presentation[1];?>"></textarea>
</td>
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<span class="feedback_item_textarea">';
echo '<textarea name="'.$item->typ.'_'.$item->id.'" cols="'.$presentation[0].'" rows="'.$presentation[1].'"></textarea>';
echo '</span>';
echo '</div>';
}
/**
@@ -187,23 +186,23 @@ class feedback_item_textarea extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
if($highlightrequire AND $item->required AND strval($value) == '') {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<textarea name="<?php echo $item->typ . '_' . $item->id;?>"
cols="<?php echo $presentation[0];?>"
rows="<?php echo $presentation[1];?>"><?php echo $value?htmlspecialchars($value):'';?></textarea>
</td>
<?php
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
echo '<span class="feedback_item_textarea">';
echo '<textarea name="'.$item->typ.'_'.$item->id.'" cols="'.$presentation[0].'" rows="'.$presentation[1].'">'.($value ? htmlspecialchars($value) : '').'</textarea>';
echo '</span>';
echo '</div>';
}
/**
@@ -220,21 +219,17 @@ class feedback_item_textarea extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '</div>';
//print the presentation
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value?str_replace("\n",'<br />',$value):'&nbsp;';
echo $OUTPUT->box_end();
?>
</td>
<?php
}
function check_value($value, $item) {
mod/feedback/item/textfield/lib.php
+30 -33
View File
@@ -154,17 +154,18 @@ class feedback_item_textfield extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<input type="text" name="<?php echo $item->typ . '_' . $item->id;?>" size="<?php echo $presentation[0];?>" maxlength="<?php echo $presentation[1];?>" value="" />
</td>
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.'">';
echo '<span class="feedback_item_textfield">';
echo '<input type="text" name="'.$item->typ . '_' . $item->id.'" size="'.$presentation[0].'" maxlength="'.$presentation[1].'" value="" />';
echo '</span>';
echo '</div>';
}
/**
@@ -182,21 +183,23 @@ class feedback_item_textfield extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
if($highlightrequire AND $item->required AND strval($value) == '') {
$highlight = 'bgcolor="#FFAAAA" class="missingrequire"';
$highlight = ' missingrequire';
}else {
$highlight = '';
}
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<input type="text" name="<?php echo $item->typ . '_' . $item->id;?>" size="<?php echo $presentation[0];?>" maxlength="<?php echo $presentation[1];?>" value="<?php echo $value ? htmlspecialchars($value) : '';?>" />
</td>
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.$highlight.'">';
echo format_text($item->name.$requiredmark, true, false, false);
echo '</div>';
//print the presentation
echo '<div class="feedback_item_presentation_'.$align.$highlight.'">';
echo '<span class="feedback_item_textfield">';
echo '<input type="text" name="'.$item->typ.'_'.$item->id.'" size="'.$presentation[0].'" maxlength="'.$presentation[1].'" value="'.($value ? htmlspecialchars($value) : '').'" />';
echo '</span>';
echo '</div>';
}
/**
@@ -213,21 +216,15 @@ class feedback_item_textfield extends feedback_item_base {
$presentation = explode ("|", $item->presentation);
$requiredmark = ($item->required == 1)?'<span class="feedback_required_mark">*</span>':'';
?>
<td <?php echo $highlight;?> valign="top" align="<?php echo $align;?>">
<?php
//print the question and label
echo '<div class="feedback_item_label_'.$align.'">';
echo '('.$item->label.') ';
echo format_text($item->name . $requiredmark, true, false, false);
?>
</td>
<td valign="top" align="<?php echo $align;?>">
<?php
echo '</div>';
echo $OUTPUT->box_start('generalbox boxalign'.$align);
echo $value?$value:'&nbsp;';
echo $value ? $value : '&nbsp;';
echo $OUTPUT->box_end();
?>
</td>
<?php
}
function check_value($value, $item) {
mod/feedback/lib.php
+2 -2
View File
@@ -717,7 +717,7 @@ function feedback_get_complete_users($cm, $group = false) {
print_error('badcontext');
}
$params = array($cm->instance);
$params = array(FEEDBACK_ANONYMOUS_NO, $cm->instance);
$fromgroup = '';
$wheregroup = '';
@@ -727,7 +727,7 @@ function feedback_get_complete_users($cm, $group = false) {
$params[] = $group;
}
$sql = 'SELECT DISTINCT u.* FROM {user} u, {feedback_completed} c'.$fromgroup.'
WHERE u.id = c.userid AND c.feedback = ?
WHERE anonymous_response = ? AND u.id = c.userid AND c.feedback = ?
'.$wheregroup.'
ORDER BY u.lastname';
return $DB->get_records_sql($sql, $params);
mod/feedback/show_entries_anonym.php
+48 -43
View File
@@ -87,32 +87,34 @@ echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
$PAGE->requires->js('/mod/feedback/feedback.js');
?>
<div class="mdl-align">
<form name="frm" action="<?php echo me();?>" method="post">
<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++;
<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>
?>
</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
@@ -126,39 +128,42 @@ if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_Y
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
$feedbackcompleted = $DB->get_record('feedback_completed', array('id'=>$formdata->completedid));
if(is_array($feedbackitems)){
$align = right_to_left() ? 'right' : 'left';
if($feedbackcompleted) {
echo '<p align="center">'.get_string('chosen_feedback_response', 'feedback').'<br />('.get_string('anonymous', 'feedback').')</p>';//arb
echo '<div class="feedback_info">';
echo get_string('chosen_feedback_response', 'feedback');
echo '</div>';
echo '<div class="feedback_info">';
echo '('.get_string('anonymous', 'feedback').')';
echo '</div>';
} else {
echo '<p align="center">'.get_string('not_completed_yet','feedback').'</p>';
echo '<div class="feedback_info">';
echo get_string('not_completed_yet','feedback');
echo '</div>';
}
echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
echo '<form>';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<table width="100%">';
echo '<div class="feedback_items_show">';
// 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 '<tr>';
echo '<div class="feedback_item_box_'.$align.'">';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
} else {
echo '<td>&nbsp;</td>';
echo '<div class="feedback_item_number_'.$align.'">' . $itemnr . '</div>';
}
if($feedbackitem->typ != 'pagebreak') {
echo '<div class="box generalbox boxalign_'.$align.'">';
$itemvalue = isset($value->value) ? $value->value : false;
feedback_print_item_show_value($feedbackitem, $itemvalue);
}else {
echo '<td colspan="2"><hr /></td>';
echo '</div>';
}
echo '</tr>';
echo '</div>';
}
echo '<tr><td colspan="2" align="center">';
echo '</td></tr>';
echo '</table>';
echo '</form>';
echo $OUTPUT->box_end();
// echo $OUTPUT->box_end();
echo '</div>';
}
}
/// Finish the page
mod/feedback/styles.css
+60
View File
@@ -6,4 +6,64 @@
.feedback_switchrequired img{
}
div.missingrequire {
background:#FFAAAA;
}
div.feedback_item_box_left, div.feedback_item_box_right {
}
div.feedback_item_number_left, div.feedback_item_left {
float:left;
}
div.feedback_item_number_right, div.feedback_item_right {
float:right;
}
div.feedback_item_commands_left {
float:right;
text-align:right;
}
div.feedback_item_commands_right {
float:left;
text-align:left;
}
li.feedback_item_check_h_left,
li.feedback_item_check_h_right,
li.feedback_item_select_h_left,
li.feedback_item_select_h_right,
li.feedback_item_radio_h_left,
li.feedback_item_radio_h_right{
list-style-type:none;
display:inline;
}
li.feedback_item_check_v_left,
li.feedback_item_check_v_right,
li.feedback_item_select_v_left,
li.feedback_item_select_v_right,
li.feedback_item_radio_v_left,
li.feedback_item_radio_v_right{
list-style-type:none;
display:block;
}
div.feedback_item_captcha_text_left,
div.feedback_item_captcha_img_left {
display:inline;
margin: 5px;
}
div.feedback_item_captcha_text_right,
div.feedback_item_captcha_img_right {
display:inline;
margin: 5px;
}
hr.feedback_pagebreak {
height:8px;
color:#aaaaaa;
background-color:#aaaaaa;
border:0px;
}