Moved a couple of functions back to lib.php from locallib.php

This commit is contained in:
rkingdon 2004-06-18 14:18:02 +00:00
parent c8c6d4e0dc
commit de7200645a
2 changed files with 20 additions and 17 deletions

View file

@ -594,6 +594,24 @@ function exercise_get_participants($exerciseid) {
return ($st_submissions); return ($st_submissions);
} }
///////////////////////////////////////////////////////////////////////////////////////////////
// Non-standard Exercise functions
///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_file_area($exercise, $submission) {
return make_upload_directory( exercise_file_area_name($exercise, $submission) );
}
///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_file_area_name($exercise, $submission) {
// Creates a directory file name, suitable for make_upload_directory()
global $CFG;
return "$exercise->course/$CFG->moddata/exercise/$submission->id";
}
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_get_assess_logs($course, $timestart) { function exercise_get_assess_logs($course, $timestart) {
// get the "assess" entries for this user and add the first and last names... // get the "assess" entries for this user and add the first and last names...

View file

@ -24,8 +24,8 @@ function exercise_count_user_submissions($exercise, $user) {
function exercise_delete_submitted_files($exercise, $submission) { function exercise_delete_submitted_files($exercise, $submission) {
function exercise_delete_user_files($exercise, $user, $exception) { function exercise_delete_user_files($exercise, $user, $exception) {
function exercise_file_area($exercise, $submission) { function exercise_file_area($exercise, $submission) { <--- in lib.php
function exercise_file_area_name($exercise, $submission) { function exercise_file_area_name($exercise, $submission) { <--- in lib.php
function exercise_get_assess_logs($course, $timestart) { <--- in lib.php function exercise_get_assess_logs($course, $timestart) { <--- in lib.php
function exercise_get_assessments($submission) <--- in lib.php{ function exercise_get_assessments($submission) <--- in lib.php{
@ -399,21 +399,6 @@ function exercise_delete_user_files($exercise, $user, $exception) {
} }
///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_file_area($exercise, $submission) {
return make_upload_directory( exercise_file_area_name($exercise, $submission) );
}
///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_file_area_name($exercise, $submission) {
// Creates a directory file name, suitable for make_upload_directory()
global $CFG;
return "$exercise->course/$CFG->moddata/exercise/$submission->id";
}
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
function exercise_get_best_submission_grades($exercise) { function exercise_get_best_submission_grades($exercise) {
// Returns the grades of students' best submissions // Returns the grades of students' best submissions