ILB
/
moodle-mod_game
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix mod_form, show_answers: show numbers of entries in each glossary and question category

MOODLE_20_STABLE
bdaloukas 8 years ago
parent
8f25c8cb85
commit
2a82e9c5fd
3 changed files with 110 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 153
      mod_form.php
  2. 13
      showanswers.php
  3. 4
      version.php

153
mod_form.php
View File

@ -106,37 +106,7 @@ class mod_game_mod_form extends moodleform_mod {
$mform->addElement('select', 'glossaryid', get_string('sourcemodule_glossary', 'game'), $a);
$mform->disabledIf('glossaryid', 'sourcemodule', 'neq', 'glossary');
if (count( $a) == 0) {
$select = 'glossaryid=-1';
} else if (count( $a) == 1) {
$select = 'glossaryid='.$rec->id;
} else {
$select = '';
foreach ($recs as $rec) {
$select .= ','.$rec->id;
}
$select = 'g.id IN ('.substr( $select, 1).')';
}
$a = array();
$sql = "SELECT g.id, g.name, COUNT(*) as c ".
"FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}glossary g ".
"WHERE $select AND ge.glossaryid=g.id";
$recs = $DB->get_records_sql( $sql);
foreach( $recs as $rec) {
$a[ -$rec->id] = $rec->name.' -> ('.$rec->c.')';
}
$sql2 = "SELECT COUNT(*) ".
" FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}glossary_entries_categories gec".
" WHERE gec.categoryid=gc.id AND gec.entryid=ge.id";
$sql = "SELECT gc.id,gc.name,g.name as name2, ($sql2) as c ".
" FROM {$CFG->prefix}glossary_categories gc, {$CFG->prefix}glossary g".
" WHERE $select AND gc.glossaryid=g.id".
" ORDER BY g.name, gc.name";
if ($recs = $DB->get_records_sql( $sql)) {
foreach ($recs as $rec) {
$a[$rec->id] = $rec->name2.' -> '.$rec->name.' ('.$rec->c.')';
}
}
$a = $this->get_array_glossary_categories( $a);
$mform->addElement('select', 'glossarycategoryid', get_string('sourcemodule_glossarycategory', 'game'), $a);
$mform->disabledIf('glossarycategoryid', 'sourcemodule', 'neq', 'glossary');
@ -147,20 +117,7 @@ class mod_game_mod_form extends moodleform_mod {
// Question Category - Short Answer.
if ($gamekind != 'bookquiz') {
$context = game_get_context_course_instance( $COURSE->id);
$select = " contextid in ($context->id)";
$a = array();
if ($recs = $DB->get_records_select('question_categories', $select, null, 'id,name')) {
foreach ($recs as $rec) {
$s = $rec->name;
if (($count = $DB->count_records('question', array( 'category' => $rec->id))) != 0) {
$s .= " ($count)";
}
$a[$rec->id] = $s;
}
}
$a = $this->get_array_question_categories( $COURSE->id, $gamekind );
$mform->addElement('select', 'questioncategoryid', get_string('sourcemodule_questioncategory', 'game'), $a);
$mform->disabledIf('questioncategoryid', 'sourcemodule', 'neq', 'question');
@ -439,6 +396,92 @@ class mod_game_mod_form extends moodleform_mod {
$this->add_action_buttons();
}
/**
* Computes the categories of all glossaries of the current course;
*
* @param array $a array of id of glossaries to each name
*
* @return array of glossary categories
*/
public function get_array_glossary_categories( $a) {
global $CFG, $DB;
if (count( $a) == 0) {
$select = 'glossaryid=-1';
} else if (count($a) == 1) {
$select = 'glossaryid='.reset( $a);
} else {
$select = '';
foreach ($a as $id => $name) {
$select .= ','.$id;
}
$select = 'g.id IN ('.substr( $select, 1).')';
}
$a = array();
//Fills with the count of entries in each glossary.
$sql2 = "SELECT COUNT(*) FROM {$CFG->prefix}glossary_entries ge WHERE ge.glossaryid=g.id";
$sql = "SELECT id, name, ($sql2) as c FROM {$CFG->prefix}glossary g WHERE $select";
$recs = $DB->get_records_sql( $sql);
foreach( $recs as $rec) {
$a[ - $rec->id] = $rec->name.' -> ('.$rec->c.')';
}
//Fills with the count of entries in each category.
$sql2 = "SELECT COUNT(*) ".
" FROM {$CFG->prefix}glossary_entries ge, {$CFG->prefix}glossary_entries_categories gec".
" WHERE gec.categoryid=gc.id AND gec.entryid=ge.id";
$sql = "SELECT gc.id,gc.name,g.name as name2, ($sql2) as c ".
" FROM {$CFG->prefix}glossary_categories gc, {$CFG->prefix}glossary g".
" WHERE $select AND gc.glossaryid=g.id".
" ORDER BY g.name, gc.name";
if ($recs = $DB->get_records_sql( $sql)) {
foreach ($recs as $rec) {
$a[$rec->id] = $rec->name2.' -> '.$rec->name.' ('.$rec->c.')';
}
}
return $a;
}
/**
* Computes the categories of all question of the current course;
*
* @param int $courseid
*
* @return array of question categories
*/
public function get_array_question_categories( $courseid, $gamekind) {
global $CFG, $DB;
$context = game_get_context_course_instance( $courseid);
$a = array();
$table = "{$CFG->prefix}question q";
$select = '';
if( $gamekind == 'millionaire') {
if (game_get_moodle_version() < '02.06') {
$table = "{$CFG->prefix}question q, {$CFG->prefix}question_multichoice qmo";
$select = " AND q.qtype='multichoice' AND qmo.single = 1 AND qmo.question=q.id";
} else {
$table = "{$CFG->prefix}question q, {$CFG->prefix}qtype_multichoice_options qmo";
$select = " AND q.qtype='multichoice' AND qmo.single = 1 AND qmo.questionid=q.id";
}
} else if (($gamekind == 'hangman') or ($gamekind == 'cryptex') or ($gamekind == 'cross')) {
//Single answer questions.
$select = " AND q.qtype='shortanswer'";
}
$sql2 = "SELECT COUNT(*) FROM $table WHERE q.category = qc.id $select";
$sql = "SELECT id,name,($sql2) as c FROM {$CFG->prefix}question_categories qc WHERE contextid = $context->id";
if ($recs = $DB->get_records_sql( $sql)) {
foreach ($recs as $rec) {
$a[$rec->id] = $rec->name.' ('.$rec->c.')';
}
}
return $a;
}
/**
* validation
*
@ -458,15 +501,17 @@ class mod_game_mod_form extends moodleform_mod {
$errors['timeclose'] = get_string('closebeforeopen', 'quiz');
}
if( $data['glossarycategoryid'] != 0) {
$sql = "SELECT glossaryid FROM {$CFG->prefix}glossary_categories ".
" WHERE id=".$data[ 'glossarycategoryid'];
$rec = $DB->get_record_sql( $sql);
if( $rec != false) {
if( $data[ 'glossaryid'] != $rec->glossaryid) {
$s = get_string( 'different_glossary_category', 'game');
$errors['glossaryid'] = $s;
$errors['glossarycategoryid'] = $s;
if( array_key_exists( 'glossarycategoryid', $data)) {
if( $data['glossarycategoryid'] != 0) {
$sql = "SELECT glossaryid FROM {$CFG->prefix}glossary_categories ".
" WHERE id=".$data[ 'glossarycategoryid'];
$rec = $DB->get_record_sql( $sql);
if( $rec != false) {
if( $data[ 'glossaryid'] != $rec->glossaryid) {
$s = get_string( 'different_glossary_category', 'game');
$errors['glossaryid'] = $s;
$errors['glossarycategoryid'] = $s;
}
}
}
}

13
showanswers.php
View File

@ -223,16 +223,20 @@ function game_showanswers_question( $game, $context) {
$select .= ' AND hidden = 0 ';
$select .= game_showanswers_appendselect( $game);
$showcategories = ($game->gamekind == 'bookquiz');
$gamekind = $game->gamekind;
$showcategories = ($gamekind == 'bookquiz');
$order = ($showcategories ? 'category,questiontext' : 'questiontext');
$table = '{question} q';
if ($game->gamekind == 'millionaire') {
$select .= " AND q.qtype='multichoice' AND qmo.single=1 AND qmo.question=q.id";
if ($gamekind == 'millionaire') {
if (game_get_moodle_version() < '02.06') {
$table .= ',{question_multichoice} qmo';
$select .= " AND q.qtype='multichoice' AND qmo.single=1 AND qmo.question=q.id";
} else {
$table .= ',{qtype_multichoice_options} qmo';
$select .= " AND q.qtype='multichoice' AND qmo.single=1 AND qmo.questionid=q.id";
}
} else if ( ($gamekind == 'hangman') or ($gamekind == 'cryptex') or ($gamekind == 'cross')) {
$select .= " AND q.qtype = 'shortanswer'";
}
game_showanswers_question_select( $game, $table, $select, '*', $order, $showcategories, $game->course, $context);
}
@ -531,11 +535,12 @@ function game_showanswers_extra_millionaire( $game)
}
}
$select .= " AND qtype='multichoice' AND qmo.single <> 1 AND qmo.question=q.id";
if (game_get_moodle_version() < '02.06') {
$table = "{$CFG->prefix}question q, {$CFG->prefix}question_multichoice qmo";
$select .= " AND qtype='multichoice' AND qmo.single <> 1 AND qmo.question=q.id";
} else {
$table = "{$CFG->prefix}question q, {$CFG->prefix}qtype_multichoice_options qmo";
$select .= " AND qtype='multichoice' AND qmo.single <> 1 AND qmo.questionid=q.id";
}
$sql = "SELECT COUNT(*) as c FROM $table WHERE $select";

4
version.php
View File

@ -35,10 +35,10 @@ if (!isset( $plugin)) {
}
$plugin->component = 'mod_game'; // Full name of the plugin (used for diagnostics).
$plugin->version = 2017062902; // The current module version (Date: YYYYMMDDXX).
$plugin->version = 2017063001; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2010112400; // Requires Moodle 2.0.
$plugin->cron = 0; // Period for cron to check this module (secs).
$plugin->release = '2017-06-29';
$plugin->release = '2017-06-30';
$plugin->maturity = MATURITY_STABLE;
if ($useplugin != 2) {

Write Preview
Loading…
Cancel
Save