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

MDL-15107 feedback dml conversion

Browse Source
This commit is contained in:
skodak
2008-06-07 22:22:06 +00:00
parent 2230061c5b
commit 0085fff8b2
26 changed files with 454 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/analysis.php
+4 -4
View File
@@ -31,11 +31,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -114,14 +114,14 @@
$completedscount = feedback_get_completeds_group_count($feedback, $mygroupid);
//show the group, if available
if($mygroupid and $group = get_record('groups', 'id', $mygroupid)) {
if($mygroupid and $group = $DB->get_record('groups', array('id'=>$mygroupid))) {
echo '<b>'.get_string('group').': '.$group->name. '</b><br />';
}
//show the count
echo '<b>'.get_string('completed_feedbacks', 'feedback').': '.$completedscount. '</b><br />';
// get the items of the feedback
$items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
$items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1), 'position');
//show the count
if(is_array($items)){
echo '<b>'.get_string('questions', 'feedback').': ' .sizeof($items). ' </b><hr />';
mod/feedback/analysis_course.php
+10 -11
View File
@@ -31,11 +31,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -88,7 +88,7 @@
echo '<b>'.get_string('completed_feedbacks', 'feedback').': '.$completedscount. '</b><br />';
// get the items of the feedback
$items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
$items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1), 'position');
//show the count
if(is_array($items)){
echo '<b>'.get_string('questions', 'feedback').': ' .sizeof($items). ' </b><hr />';
@@ -104,14 +104,13 @@
if ($CFG->dbtype == 'postgres7') {
$avgvalue = 'avg(cast (value as integer))';
}
if ($courses = get_records_sql ('select fv.course_id, c.shortname, '.$avgvalue.' as avgvalue '.
'from '.$CFG->prefix.'feedback_value fv, '.$CFG->prefix.'course c, '.
$CFG->prefix.'feedback_item fi '.
'where fv.course_id = c.id '.
'and fi.id = fv.item and fi.typ = \''.$courseitemfiltertyp.'\' and fv.item = \''.
$courseitemfilter.'\' '.
'group by course_id, shortname order by avgvalue desc')) {
$item = get_record('feedback_item', 'id', $courseitemfilter);
if ($courses = $DB->get_records_sql ("SELECT fv.course_id, c.shortname, $avgvalue AS avgvalue
FROM {feedback_value} fv, {course} c, {feedback_item} fi
WHERE fv.course_id = c.id AND fi.id = fv.item AND fi.typ = ? AND fv.item = ?
GROUP BY course_id, shortname
ORDER BY avgvalue desc",
array($courseitemfiltertyp, $courseitemfilter))) {
$item = $DB->get_record('feedback_item', array('id'=>$courseitemfilter));
echo '<tr><th colspan="2">'.$item->name.'</th></tr>';
echo '<tr><td><table align="left">';
echo '<tr><th>Course</th><th>Average</th></tr>';
mod/feedback/analysis_to_excel.php
+8 -8
View File
@@ -21,11 +21,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -106,7 +106,7 @@
}
//get the questions (item-names)
$items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
$items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1, 'position'));
if(is_array($items)){
$rowOffset1++;
$worksheet1->write_string($rowOffset1, 0, $fstring->questions.': '. strval(sizeof($items)));
@@ -193,17 +193,17 @@
}
function feedback_excelprint_detailed_items(&$worksheet, $completed, $items, $rowOffset) {
global $fstring;
global $DB, $fstring;
if(!$items) return;
$colOffset = 0;
$courseid = 0;
$feedback = get_record('feedback', 'id', $completed->feedback);
$feedback = $DB->get_record('feedback', array('id'=>$completed->feedback));
//get the username
//anonymous users are separated automatically because the userid in the completed is "0"
$worksheet->setFormat('<l><f><ru2>');
if($user = get_record('user', 'id', $completed->userid)) {
if($user = $DB->get_record('user', array('id'=>$completed->userid))) {
if ($completed->anonymous_response == FEEDBACK_ANONYMOUS_NO) {
$worksheet->write_string($rowOffset, $colOffset, $user->idnumber);
$colOffset++;
@@ -229,7 +229,7 @@
$colOffset++;
foreach($items as $item) {
$value = get_record('feedback_value', 'item', $item->id, 'completed', $completed->id);
$value = $DB->get_record('feedback_value', array('item'=>$item->id, 'completed'=>$completed->id));
$itemclass = 'feedback_item_'.$item->typ;
$itemobj = new $itemclass();
@@ -248,7 +248,7 @@
}
$worksheet->write_number($rowOffset, $colOffset, $courseid);
$colOffset++;
if(isset($courseid) AND $course = get_record('course', 'id', $courseid)){
if(isset($courseid) AND $course = $DB->get_record('course', array('id'=>$courseid))) {
$worksheet->write_string($rowOffset, $colOffset, $course->shortname);
}
return $rowOffset + 1;
mod/feedback/backuplib.php
+23 -17
View File
@@ -28,12 +28,12 @@
//This function executes all the backup procedure about this mod
function feedback_backup_mods($bf,$preferences) {
global $CFG;
global $CFG, $DB;
$status = true;
//Iterate over feedback table
$feedbacks = get_records ("feedback","course",$preferences->backup_course,"id");
$feedbacks = $DB->get_records ("feedback", array("course"=>$preferences->backup_course), "id");
if ($feedbacks) {
foreach ($feedbacks as $feedback) {
if (backup_mod_selected($preferences,'feedback',$feedback->id)) {
@@ -45,10 +45,10 @@
}
function feedback_backup_one_mod($bf,$preferences,$feedback) {
global $CFG;
global $CFG, $DB;
if (is_numeric($feedback)) {
$feedback = get_record('feedback','id',$feedback);
$feedback = $DB->get_record('feedback', array('id'=>$feedback));
}
$status = true;
@@ -79,9 +79,10 @@
}
function feedback_backup_data($bf, $preferences, $feedbackid) {
global $CFG;
global $CFG, $DB;
$status = true;
$feedbackitems = get_records('feedback_item', 'feedback', $feedbackid);
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedbackid));
if(function_exists('backup_userdata_selected')) { //compatibility-hack for moodle 1.5.x
$backup_userdata = backup_userdata_selected($preferences,'feedback',$feedbackid);
}else {
@@ -104,7 +105,7 @@
if ($backup_userdata) {
//backup the values of items
$feedbackvalues = get_records('feedback_value', 'item', $feedbackitem->id);
$feedbackvalues = $DB->get_records('feedback_value', array('item'=>$feedbackitem->id));
if($feedbackvalues) {
$status =fwrite ($bf,start_tag("FBVALUES",6,true));
foreach($feedbackvalues as $feedbackvalue) {
@@ -130,7 +131,7 @@
if($backup_userdata) {
//backup of feedback-completeds
$feedbackcompleteds = get_records('feedback_completed', 'feedback', $feedbackid);
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedbackid));
if($feedbackcompleteds) {
fwrite ($bf,start_tag("COMPLETEDS",4,true));
foreach ($feedbackcompleteds as $feedbackcompleted) {
@@ -151,7 +152,7 @@
}
//backup of tracking-data
$feedbacktrackings = get_records('feedback_tracking', 'feedback', $feedbackid);
$feedbacktrackings = $DB->get_records('feedback_tracking', array('feedback'=>$feedbackid));
if($feedbacktrackings) {
fwrite ($bf,start_tag("TRACKINGS",4,true));
foreach ($feedbacktrackings as $feedbacktracking) {
@@ -175,9 +176,10 @@
function feedback_backup_template_data($bf, $templateid, $userinfo) {
global $CFG;
global $CFG, $DB;
$status = true;
$templateitems = get_records('feedback_item', 'template', $templateid);
$templateitems = $DB->get_records('feedback_item', array('template'=>$templateid));
if ($templateitems) {
$status =fwrite ($bf,start_tag("ITEMS",5,true));
@@ -228,6 +230,8 @@
////Return an array of info (name,value)
function feedback_check_backup_mods_instances($instance,$backup_unique_code) {
global $DB;
//First the course data
$info[$instance->id.'0'][0] = '<b>'.$instance->name.'</b>';
$info[$instance->id.'0'][1] = '';
@@ -235,7 +239,7 @@
//Now, if requested, the user_data
if (!empty($instance->userdata)) {
$info[$instance->id.'1'][0] = get_string("responses","feedback");
if ($responses_count = count_records ('feedback_completed', 'feedback', $instance->id)) {
if ($responses_count = $DB->count_records ('feedback_completed', array('feedback'=>$instance->id))) {
$info[$instance->id.'1'][1] = $responses_count;
} else {
$info[$instance->id.'1'][1] = 0;
@@ -251,18 +255,20 @@
//Returns an array of feedbacks ids
function feedback_count ($course) {
global $CFG;
return count_records('feedback', 'course', $course);
global $DB;
return $DB->count_records('feedback', array('course'=>$course));
}
function feedback_completed_count($course) {
global $CFG;
global $DB;
$count = 0;
//get all feedbacks
$feedbacks = get_records('feedback', 'course', $course);
$feedbacks = $DB->get_records('feedback', array('course'=>$course));
if($feedbacks) {
foreach($feedbacks as $feedback) {
$count += count_records('feedback_completed', 'feedback', $feedback->id);
$count += $DB->count_records('feedback_completed', array('feedback'=>$feedback->id));
}
}
return $count;
mod/feedback/complete.php
+13 -12
View File
@@ -60,11 +60,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -86,9 +86,9 @@
}
if($courseid AND $courseid != SITEID) {
$course2 = get_record('course', 'id', $courseid);
$course2 = $DB->get_record('course', array('id'=>$courseid));
require_course_login($course2); //this overwrites the object $course :-(
$course = get_record("course", "id", $cm->course); // the workaround
$course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
}
if(!$capabilities->complete) {
@@ -179,7 +179,7 @@
}else{
$feedbackcompleted = false;
}
$feedbackcompletedtmp = get_record('feedback_completedtmp', 'id', $completedid);
$feedbackcompletedtmp = $DB->get_record('feedback_completedtmp', array('id'=>$completedid));
//fake saving for switchrole
$is_switchrole = feedback_check_is_switchrole();
if($is_switchrole) {
@@ -194,11 +194,11 @@
feedback_send_email_anonym($cm, $feedback, $course, $userid);
}
//tracking the submit
$tracking = null;
$tracking = new object();
$tracking->userid = $USER->id;
$tracking->feedback = $feedback->id;
$tracking->completed = $new_completed_id;
insert_record('feedback_tracking', $tracking);
$DB->insert_record('feedback_tracking', $tracking);
unset($SESSION->feedback->is_started);
}else {
@@ -222,16 +222,16 @@
}
//get the feedbackitems after the last shown pagebreak
$feedbackitems = get_records_select('feedback_item', 'feedback = '.$feedback->id.' AND position > '.$startposition, 'position');
$feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position');
//get the first pagebreak
if($pagebreaks = get_records_select('feedback_item', "feedback = ".$feedback->id." AND typ = 'pagebreak'", 'position')) {
if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) {
$pagebreaks = array_values($pagebreaks);
$firstpagebreak = $pagebreaks[0];
}else {
$firstpagebreak = false;
}
$maxitemcount = count_records('feedback_item', 'feedback', $feedback->id);
$maxitemcount = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
//get the values of completeds before done. Anonymous user can not get these values.
if((!isset($SESSION->feedback->is_started)) AND (!isset($savereturn)) AND ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO)) {
@@ -267,6 +267,7 @@
}
}
if($feedback->site_after_submit) {
var_dump($feedback->site_after_submit);
print_continue(feedback_encode_target_url($feedback->site_after_submit));
}else {
if($courseid) {
@@ -304,13 +305,13 @@
break;
}
//check, if there exists required-elements
$countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
$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>';
}
unset($startitem);
$itemnr = count_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1 AND position < '.$startposition);
$itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
foreach($feedbackitems as $feedbackitem){
if(!isset($startitem)) {
//avoid showing double pagebreaks
mod/feedback/complete_guest.php
+11 -11
View File
@@ -58,11 +58,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -89,9 +89,9 @@
require_course_login($course);
if($courseid AND $courseid != SITEID) {
$course2 = get_record('course', 'id', $courseid);
$course2 = $DB->get_record('course', array('id'=>$courseid));
require_course_login($course2); //this overwrites the object $course :-(
$course = get_record("course", "id", $cm->course); // the workaround
$course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
}
if(!$capabilities->complete) {
@@ -136,7 +136,7 @@
//additional check for multiple-submit (prevent browsers back-button). the main-check is in view.php
$feedback_can_submit = true;
if($feedback->multiple_submit == 0 ) {
// if($multiple_count = get_record('feedback_tracking', 'userid', $USER->id, 'feedback', $feedback->id)) {
// if($multiple_count = $DB->get_record('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
if(feedback_is_already_submitted($feedback->id, $courseid)) {
$feedback_can_submit = false;
}
@@ -177,7 +177,7 @@
//exists there any pagebreak, so there are values in the feedback_valuetmp
$userid = $USER->id; //arb changed from 0 to $USER->id - no strict anonymous feedbacks - if it is a guest taking it then I want to know that it was a guest (at least in the data saved in the feedback tables)
$feedbackcompletedtmp = get_record('feedback_completedtmp', 'id', $completedid);
$feedbackcompletedtmp = $DB->get_record('feedback_completedtmp', array('id'=>$completedid));
//fake saving for switchrole
$is_switchrole = feedback_check_is_switchrole();
@@ -209,15 +209,15 @@
}
//get the feedbackitems after the last shown pagebreak
$feedbackitems = get_records_select('feedback_item', 'feedback = '.$feedback->id.' AND position > '.$startposition, 'position');
$feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position');
//get the first pagebreak
if($pagebreaks = get_records_select('feedback_item', "feedback = ".$feedback->id." AND typ = 'pagebreak'", 'position')) {
if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) {
$pagebreaks = array_values($pagebreaks);
$firstpagebreak = $pagebreaks[0];
}else {
$firstpagebreak = false;
}
$maxitemcount = count_records('feedback_item', 'feedback', $feedback->id);
$maxitemcount = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
$feedbackcompletedtmp = feedback_get_current_completed($feedback->id, true, $courseid, $USER->sesskey);
/// Print the main part of the page
@@ -280,13 +280,13 @@
&nbsp;
</td></tr>';
//check, if there exists required-elements
$countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
$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>';
}
unset($startitem);
$itemnr = count_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1 AND position < '.$startposition);
$itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
foreach($feedbackitems as $feedbackitem){
if(!isset($startitem)) {
//avoid showing double pagebreaks
mod/feedback/delete_completed.php
+3 -3
View File
@@ -24,11 +24,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -53,7 +53,7 @@
}
if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){
if($completed = get_record('feedback_completed', 'id', $completedid)) {
if($completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) {
feedback_delete_completed($completedid);
add_to_log($course->id, 'feedback', 'delete', 'view.php?id='.$cm->id, $feedback->id,$cm->id);
redirect('show_entries.php?id='.$id.'&do_show=showentries');
mod/feedback/delete_item.php
+2 -2
View File
@@ -20,11 +20,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
mod/feedback/delete_template.php
+2 -2
View File
@@ -34,11 +34,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
mod/feedback/edit.php
+9 -9
View File
@@ -33,11 +33,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -51,21 +51,21 @@
//move up/down items
if($moveupitem){
$item = get_record('feedback_item', 'id', $moveupitem);
$item = $DB->get_record('feedback_item', array('id'=>$moveupitem));
feedback_moveup_item($item);
}
if($movedownitem){
$item = get_record('feedback_item', 'id', $movedownitem);
$item = $DB->get_record('feedback_item', array('id'=>$movedownitem));
feedback_movedown_item($item);
}
//moving of items
if($movehere && isset($SESSION->feedback->moving->movingitem)){
$item = get_record('feedback_item', 'id', intval($SESSION->feedback->moving->movingitem));
$item = $DB->get_record('feedback_item', array('id'=>$SESSION->feedback->moving->movingitem));
feedback_move_item($item, intval($movehere));
}
if($moveitem){
$item = get_record('feedback_item', 'id', $moveitem);
$item = $DB->get_record('feedback_item', array('id'=>$moveitem));
$SESSION->feedback->moving->shouldmoving = 1;
$SESSION->feedback->moving->movingitem = $moveitem;
} else {
@@ -73,7 +73,7 @@
}
if($switchitemrequired) {
$item = get_record('feedback_item', 'id', $switchitemrequired);
$item = $DB->get_record('feedback_item', array('id'=>$switchitemrequired));
@feedback_switch_item_required($item);
redirect($ME.'?'.feedback_edit_get_default_query($id, $do_show));
exit;
@@ -110,7 +110,7 @@
//get the feedbackitems
$lastposition = 0;
$feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
if(is_array($feedbackitems)){
$feedbackitems = array_values($feedbackitems);
if(count($feedbackitems) > 0) {
@@ -219,7 +219,7 @@
print_box_start('generalbox boxaligncenter boxwidthwide');
//check, if there exists required-elements
$countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
$countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id), 'required', 1);
if($countreq > 0) {
// echo '<font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font>';
echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
mod/feedback/edit_item.php
+6 -6
View File
@@ -30,11 +30,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -55,7 +55,7 @@
//get the existing item or create it
// $formdata->itemid = isset($formdata->itemid) ? $formdata->itemid : NULL;
if($itemid and $item = get_record('feedback_item', 'id', $itemid)){
if($itemid and $item = $DB->get_record('feedback_item', array('id'=>$itemid))) {
$typ = $item->typ;
$position = $item->position;
}else {
@@ -82,7 +82,7 @@
if (!$newitemid = feedback_create_item($formdata)) {
$SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback');
}else {
$newitem = get_record('feedback_item', 'id', $newitemid);
$newitem = $DB->get_record('feedback_item', array('id'=>$newitemid));
if (!feedback_move_item($newitem, $newposition)){
$SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback');
}else {
@@ -148,7 +148,7 @@
$i_form->addElement('hidden', 'feedbackid', $feedback->id);
$lastposition = count_records('feedback_item', 'feedback', $feedback->id);
$lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
if($position == -1){
$i_formselect_last = $lastposition + 1;
$i_formselect_value = $lastposition + 1;
@@ -195,7 +195,7 @@
echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'" />';
//choose the position
$lastposition = count_records('feedback_item', 'feedback', $feedback->id);
$lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
echo get_string('position', 'feedback').'&nbsp;';
echo '<select name="position">';
//Dropdown-Items for choosing the position
mod/feedback/export.php
+5 -3
View File
@@ -20,11 +20,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -48,9 +48,11 @@
exit;
function feedback_get_xml_data($feedbackid) {
global $DB;
$space = ' ';
//get all items of the feedback
if(!$items = get_records('feedback_item', 'feedback', $feedbackid, 'position')) {
if(!$items = $DB->get_records('feedback_item', array('feedback'=>$feedbackid), 'position')) {
return false;
}
mod/feedback/import.php
+5 -5
View File
@@ -25,11 +25,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -155,7 +155,7 @@
}
function feedback_import_loaded_data(&$data, $feedbackid){
global $CFG;
global $CFG, $DB;
$deleteolditems = optional_param('deleteolditems', 0, PARAM_INT);
@@ -174,7 +174,7 @@
$position = 0;
} else {
//items will be add to the end of the existing items
$position = count_records('feedback_item', 'feedback', $feedbackid);
$position = $DB->count_records('feedback_item', array('feedback'=>$feedbackid));
}
foreach($data as $item) {
@@ -202,7 +202,7 @@
}
$newitem->required = intval($item['@']['REQUIRED']);
$newitem->position = $position;
if(!insert_record('feedback_item', $newitem)) {
if (!$DB->insert_record('feedback_item', $newitem)) {
$error->stat = false;
$error->msg[] = 'item ('.$newitem->name.') not imported';
}
mod/feedback/item/captcha/lib.php
+2 -2
View File
@@ -47,7 +47,7 @@ class feedback_item_captcha extends feedback_item_base {
}
function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){
global $SESSION, $CFG;
global $SESSION, $CFG, $DB;
$align = get_string('thisdirection') == 'ltr' ? 'left' : 'right';
@@ -58,7 +58,7 @@ class feedback_item_captcha extends feedback_item_base {
if(!$readonly) {
$feedbackid = $item->feedback;
if($feedbackid > 0) {
$feedback = get_record('feedback', 'id', $feedbackid);
$feedback = $DB->get_record('feedback', array('id'=>$feedbackid));
if($cm = get_coursemodule_from_instance("feedback", $feedback->id, $feedback->course)) {
$cmid = $cm->id;
}
mod/feedback/item/captcha/print_captcha.php
+2 -2
View File
@@ -8,11 +8,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
mod/feedback/item/numeric/lib.php
+3 -1
View File
@@ -38,10 +38,12 @@ class feedback_item_numeric extends feedback_item_base {
//liefert eine Struktur ->name, ->data = array(mit Antworten)
function get_analysed($item, $groupid = false, $courseid = false) {
global $DB;
$analysed = null;
$analysed->data = array();
$analysed->name = $item->name;
//$values = get_records('feedback_value', 'item', $item->id);
//$values = $DB->get_records('feedback_value', array('item'=>$item->id));
$values = feedback_get_group_values($item, $groupid, $courseid);
$avg = 0.0;
mod/feedback/item/textarea/lib.php
+3 -1
View File
@@ -36,10 +36,12 @@ class feedback_item_textarea extends feedback_item_base {
//liefert eine Struktur ->name, ->data = array(mit Antworten)
function get_analysed($item, $groupid, $courseid = false) {
global $DB;
$aVal = null;
$aVal->data = array();
$aVal->name = $item->name;
//$values = get_records('feedback_value', 'item', $item->id);
//$values = $DB->get_records('feedback_value', array('item'=>$item->id));
$values = feedback_get_group_values($item, $groupid, $courseid);
if($values) {
$data = array();
mod/feedback/item/textfield/lib.php
+3 -1
View File
@@ -36,10 +36,12 @@ class feedback_item_textfield extends feedback_item_base {
//liefert eine Struktur ->name, ->data = array(mit Antworten)
function get_analysed($item, $groupid = false, $courseid = false) {
global $DB;
$aVal = null;
$aVal->data = null;
$aVal->name = $item->name;
//$values = get_records('feedback_value', 'item', $item->id);
//$values = $DB->get_records('feedback_value', array('item'=>$item->id));
$values = feedback_get_group_values($item, $groupid, $courseid);
if($values) {
$data = array();
mod/feedback/lib.php
+302 -234
View File
File diff suppressed because it is too large Load Diff
mod/feedback/mapcourse.php
+7 -5
View File
@@ -29,11 +29,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -49,8 +49,10 @@
$map->feedbackid = $feedback->id;
$map->courseid = $coursefilter;
// insert a map only if it does exists yet
$sql = "select id, feedbackid from {$CFG->prefix}feedback_sitecourse_map where feedbackid = $map->feedbackid and courseid = $map->courseid";
if (!get_records_sql($sql) && !insert_record('feedback_sitecourse_map', $map)) {
$sql = "SELECT id, feedbackid
FROM {feedback_sitecourse_map}
WHERE feedbackid = ? AND courseid = ?";
if (!$DB->get_records_sql($sql, array($map->feedbackid, $map->courseid)) && !$DB->insert_record('feedback_sitecourse_map', $map)) {
error("Database problem, unable to map feedback = $feedback->id to course = $course->id");
}
}
@@ -64,7 +66,7 @@
// if ($course->category) {
// $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$course->id).'">'.$course->shortname.'</a> ->';
// }else if ($courseid > 0 AND $courseid != SITEID) {
// $usercourse = get_record('course', 'id', $courseid);
// $usercourse = $DB->get_record('course', array('id'=>$courseid));
// $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$usercourse->id).'">'.$usercourse->shortname.'</a> ->';
// $feedbackindex = '';
// }
mod/feedback/print.php
+3 -3
View File
@@ -20,11 +20,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -59,7 +59,7 @@
feedback_print_errors();
$feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
if(is_array($feedbackitems)){
$itemnr = 0;
mod/feedback/show_entries.php
+10 -10
View File
@@ -42,11 +42,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -77,8 +77,8 @@
////////////////////////////////////////////////////////
if($do_show == 'showoneentry') {
//get the feedbackitems
$feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
$feedbackcompleted = get_record_select('feedback_completed','feedback='.$feedback->id.' AND userid='.$formdata->userid.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO); //arb
$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
$feedbackcompleted = $DB->get_record('feedback_completed', array('feedback'=>$feedback->id, 'userid'=>$formdata->userid, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO)); //arb
}
/// Print the page header
@@ -174,13 +174,13 @@
}
} else{
echo print_string('non_anonymous_entries', 'feedback');
echo ' ('.count_records_select('feedback_completed', 'feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO).')<hr />';
echo ' ('.$DB->count_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO)).')<hr />';
foreach ($students as $student){
$completedCount = count_records_select('feedback_completed', 'userid = ' . $student->id . ' AND feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO);
$completedCount = $DB->count_records('feedback_completed', array('userid'=>$student->id, 'feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO));
if($completedCount > 0) {
// Are we assuming that there is only one response per user? Should westep through a feedbackcompleteds? I added the addition anonymous check to the select so that only non-anonymous submissions are retrieved.
$feedbackcompleted = get_record_select('feedback_completed','feedback='.$feedback->id.' AND userid='.$student->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO);
$feedbackcompleted = $DB->get_record('feedback_completed', array('feedback'=>$feedback->id, ' userid'=>$student->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO));
?>
<table width="100%">
<tr>
@@ -223,7 +223,7 @@
<table width="100%">
<tr>
<td align="left" colspan="2">
<?php print_string('anonymous_entries', 'feedback');?>&nbsp;(<?php echo count_records_select('feedback_completed', 'feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES);?>)
<?php print_string('anonymous_entries', 'feedback');?>&nbsp;(<?php echo $DB->count_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES));?>)
</td>
<td align="right">
<?php
@@ -250,7 +250,7 @@
//print the items
if(is_array($feedbackitems)){
$usr = get_record('user', 'id', $formdata->userid);
$usr = $DB->get_record('user', array('id'=>$formdata->userid));
if($feedbackcompleted) {
echo '<p align="center">'.UserDate($feedbackcompleted->timemodified).'<br />('.fullname($usr).')</p>';
} else {
@@ -264,7 +264,7 @@
$itemnr = 0;
foreach($feedbackitems as $feedbackitem){
//get the values
$value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
$value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
echo '<tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
mod/feedback/show_entries_anonym.php
+9 -9
View File
@@ -26,11 +26,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -45,18 +45,18 @@
//get the completeds
// if a new anonymous record has not been assigned a random response number
if ($feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND random_response=0 AND anonymous_response='.FEEDBACK_ANONYMOUS_YES, 'random_response')){ //arb
if ($feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'random_response'=>0, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response')){ //arb
//then get all of the anonymous records and go through them
$feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES,'id'); //arb
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'id'); //arb
shuffle($feedbackcompleteds);
$num = 1;
foreach($feedbackcompleteds as $compl){
$compl->random_response = $num;
update_record('feedback_completed', $compl);
$DB->update_record('feedback_completed', $compl);
$num++;
}
}
$feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES, 'random_response'); //arb
$feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response'); //arb
/// Print the page header
$strfeedbacks = get_string("modulenameplural", "feedback");
@@ -131,8 +131,8 @@
//print the items
if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_YES) {
//get the feedbackitems
$feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
$feedbackcompleted = get_record('feedback_completed', 'id', $formdata->completedid);
$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)){
if($feedbackcompleted) {
echo '<p align="center">'.get_string('chosen_feedback_response', 'feedback').'<br />('.get_string('anonymous', 'feedback').')</p>';//arb
@@ -147,7 +147,7 @@
$itemnr = 0;
foreach($feedbackitems as $feedbackitem){
//get the values
$value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
$value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
echo '<tr>';
if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
$itemnr++;
mod/feedback/unmapcourse.php
+3 -3
View File
@@ -19,11 +19,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -37,7 +37,7 @@
// cleanup all lost entries after deleting courses or feedbacks
feedback_clean_up_sitecourse_map();
if (delete_records('feedback_sitecourse_map', 'id', $cmapid)) {
if ($DB->delete_records('feedback_sitecourse_map', array('id'=>$cmapid))) {
redirect (htmlspecialchars('mapcourse.php?id='.$id));
} else {
error('Database problem, unable to unmap');
mod/feedback/use_templ.php
+3 -3
View File
@@ -25,11 +25,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -88,7 +88,7 @@
// print_simple_box_end();
print_box_end();
$templateitems = get_records('feedback_item', 'template', $templateid, 'position');
$templateitems = $DB->get_records('feedback_item', array('template'=>$templateid), 'position');
if(is_array($templateitems)){
$templateitems = array_values($templateitems);
}
mod/feedback/view.php
+3 -3
View File
@@ -21,11 +21,11 @@
error("Course Module ID was incorrect");
}
if (! $course = get_record("course", "id", $cm->course)) {
if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
error("Course is misconfigured");
}
if (! $feedback = get_record("feedback", "id", $cm->instance)) {
if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
error("Course module is incorrect");
}
}
@@ -96,7 +96,7 @@
}
if( (intval($feedback->publish_stats) == 1) AND !( $capabilities->viewreports) ) {
if($multiple_count = count_records('feedback_tracking', 'userid', $USER->id, 'feedback', $feedback->id)) {
if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
echo get_string('completed_feedbacks', 'feedback').'</a>';
echo '</div>';