From 7a02d1f2e5379cea7b2d95d9e9e127bfffdfacb6 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 4 Jan 2010 17:45:03 +0000 Subject: [PATCH] Removed anonymity and hidegrades These will be controlled by capabilities, as suggested by Eloy. --- mod/workshop/db/install.xml | 12 ++++------ mod/workshop/lang/en_utf8/workshop.php | 11 +-------- mod/workshop/lib.php | 32 ++++++++++---------------- mod/workshop/mod_form.php | 13 ----------- mod/workshop/settings.php | 4 ---- 5 files changed, 18 insertions(+), 54 deletions(-) diff --git a/mod/workshop/db/install.xml b/mod/workshop/db/install.xml index dffd618068..271dfc46d8 100644 --- a/mod/workshop/db/install.xml +++ b/mod/workshop/db/install.xml @@ -1,5 +1,5 @@ - @@ -21,16 +21,14 @@ - - - + + - - - + + diff --git a/mod/workshop/lang/en_utf8/workshop.php b/mod/workshop/lang/en_utf8/workshop.php index a87b2fe835..61ab3f81c2 100644 --- a/mod/workshop/lang/en_utf8/workshop.php +++ b/mod/workshop/lang/en_utf8/workshop.php @@ -52,20 +52,13 @@ $string[''] = ''; $string[''] = ''; $string[''] = ''; $string[''] = ''; -$string[''] = ''; -$string[''] = ''; -$string['assessingsubmission'] = 'Assessing submission'; $string['accesscontrol'] = 'Access control'; $string['addmoredimensionsaccumulative'] = 'Blanks for $a more aspects'; $string['addmoredimensionsnoerrors'] = 'Blanks for $a more assertions'; $string['agreeassessments'] = 'Assessments must be agreed'; $string['agreeassessmentsdesc'] = 'Authors may comment assessments of their work and agree/disagree with it'; -$string['anonymity'] = 'Anonymity mode'; -$string['anonymityauthors'] = 'Reviewers can\'t see authors\' names'; -$string['anonymityboth'] = 'Fully anonymous'; -$string['anonymitynone'] = 'Not anonymous'; -$string['anonymityreviewers'] = 'Authors can\'t see reviewers\' names'; $string['assessallexamples'] = 'Assess all examples'; +$string['assessingsubmission'] = 'Assessing submission'; $string['assessmentcomps'] = 'Required level of assessments similarity'; $string['assessmentend'] = 'End of assessment phase'; $string['assessmentform'] = 'Assessment form'; @@ -104,8 +97,6 @@ $string['examplesvoluntary'] = 'Assessment of example submission is voluntary'; $string['gradeforassessment'] = 'Grade for assessment'; $string['gradeforsubmission'] = 'Grade for submission'; $string['gradingsettings'] = 'Grading settings'; -$string['hidegradesdesc'] = 'If assessments must be agreed, should the grades be hidden from the author? If grades are hidden, authors can see only comments'; -$string['hidegrades'] = 'Hide grades before agreement'; $string['introduction'] = 'Introduction'; $string['latesubmissionsdesc'] = 'Allow submitting the work after the deadline'; $string['latesubmissions'] = 'Late submissions'; diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 3b7a7b0810..0ab7d0143d 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -32,15 +32,6 @@ defined('MOODLE_INTERNAL') || die(); -/** - * The internal codes of the anonymity levels - */ -define('WORKSHOP_ANONYMITY_NONE', 0); /* not anonymous */ -define('WORKSHOP_ANONYMITY_AUTHORS', 1); /* authors hidden from reviewers */ -define('WORKSHOP_ANONYMITY_REVIEWERS', 2); /* reviewers hidden from authors */ -define('WORKSHOP_ANONYMITY_BOTH', 3); /* fully anonymous */ - - /** * The internal codes of the example assessment modes */ @@ -349,19 +340,20 @@ function workshop_get_strategies() { /** - * Return an array of available anonymity modes - * - * @return array Array 'anonymity DB code'=>'anonymity mode name' + * Return an array of the localized allocation names + * + * @access public + * @return array Array ['string' => 'string'] */ -function workshop_get_anonymity_modes() { - - $modes = array(); - $modes[WORKSHOP_ANONYMITY_NONE] = get_string('anonymitynone', 'workshop'); - $modes[WORKSHOP_ANONYMITY_AUTHORS] = get_string('anonymityauthors', 'workshop'); - $modes[WORKSHOP_ANONYMITY_REVIEWERS] = get_string('anonymityreviewers', 'workshop'); - $modes[WORKSHOP_ANONYMITY_BOTH] = get_string('anonymityboth', 'workshop'); +function workshop_get_allocations() { - return $modes; + $installed = get_list_of_plugins('mod/workshop/allocation'); + $forms = array(); + foreach ($installed as $allocation) { + $forms[$allocation] = get_string('allocation' . $allocation, 'workshop'); + } + + return $forms; } diff --git a/mod/workshop/mod_form.php b/mod/workshop/mod_form.php index 0c18937a69..8ead07b0b8 100644 --- a/mod/workshop/mod_form.php +++ b/mod/workshop/mod_form.php @@ -125,13 +125,6 @@ class mod_workshop_mod_form extends moodleform_mod { /// Assessment settings $mform->addElement('header', 'assessmentsettings', get_string('assessmentsettings', 'workshop')); - $options = workshop_get_anonymity_modes(); - $label = get_string('anonymity', 'workshop'); - $mform->addElement('select', 'anonymity', $label, $options); - $mform->setDefault('anonymity', $workshopconfig->anonymity); - $mform->setHelpButton('anonymity', array('anonymity', $label, 'workshop')); - $mform->disabledIf('anonymity', 'usepeerassessment'); - $label = get_string('nsassessments', 'workshop'); $options = workshop_get_numbers_of_assessments(); $mform->addElement('select', 'nsassessments', $label, $options); @@ -172,12 +165,6 @@ class mod_workshop_mod_form extends moodleform_mod { $mform->setHelpButton('agreeassessments', array('agreeassessments', $label, 'workshop')); $mform->setAdvanced('agreeassessments'); - $label = get_string('hidegrades', 'workshop'); - $text = get_string('hidegradesdesc', 'workshop'); - $mform->addElement('advcheckbox', 'hidegrades', $label, $text); - $mform->setHelpButton('hidegrades', array('hidegrades', $label, 'workshop')); - $mform->setAdvanced('hidegrades'); - $label = get_string('assessmentcomps', 'workshop'); $levels = array(); foreach (workshop_get_comparison_levels() as $code => $level) { diff --git a/mod/workshop/settings.php b/mod/workshop/settings.php index 7a6f127cb6..8f1412234f 100644 --- a/mod/workshop/settings.php +++ b/mod/workshop/settings.php @@ -46,10 +46,6 @@ $settings->add(new admin_setting_configselect('workshop/maxbytes', get_string('m $settings->add(new admin_setting_configselect('workshop/strategy', get_string('strategy', 'workshop'), get_string('configstrategy', 'workshop'), 'accumulative', workshop_get_strategies())); -$options = workshop_get_anonymity_modes(); -$settings->add(new admin_setting_configselect('workshop/anonymity', get_string('anonymity', 'workshop'), - get_string('configanonymity', 'workshop'), WORKSHOP_ANONYMITY_NONE, $options)); - $options = workshop_get_numbers_of_assessments(); $settings->add(new admin_setting_configselect('workshop/nsassessments', get_string('nsassessments', 'workshop'), get_string('confignsassessments', 'workshop'), 3, $options)); -- 2.39.5