Skip to content

Commit

Permalink
Merge pull request #131 from KQMATH/development
Browse files Browse the repository at this point in the history
v0.3.1
  • Loading branch information
andstor authored Jul 1, 2019
2 parents 07ae7f0 + be84c92 commit f0702ed
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
### Changed
-

## [0.3.1] - 2019-07-01
### Fixed
- Add some missing language strings

## [0.3.0] - 2019-06-27
### Added
- Added support for Moodle grading system
Expand Down Expand Up @@ -59,8 +63,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).

## 0.1.0 - 2018-09-28

[Unreleased]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.3.0...HEAD
[Unreleased]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.3.1...HEAD

[0.3.1]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.2.0...v0.3.0
[0.2.0]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.1.5...v0.2.0
[0.1.5]: https://github.com/KQMATH/moodle-mod_capquiz/compare/v0.1.4...v0.1.5
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Estimating question difficulty is known to be difficult. CAPQuiz automates this
## Documentation
Documentation is available [here](https://github.com/KQMATH/moodle-mod_capquiz/wiki), including [installation instructions](https://github.com/KQMATH/moodle-mod_capquiz/wiki/Installation-instructions).

## History:
## History
The idea of an adaptive learning system at NTNU in Ålesund (then Ålesund University College) was first conceived by Siebe van Albada. His efforts led to a prototype, known as [MathGen](https://github.com/MathGen/oppgavegenerator), written as a standalone server in python.

The first prototype was tested by several lecturers, and was well received by students. There were, however, many problems which we lacked the resources to handle. Most of these problems had already been solved by Moodle and the STACK question type, and it made sense to reimplement the adaptive quiz functionality in Moodle to take advantage of this.

## Credits:
## Credits
CAPQuiz includes the work of many [contributors](https://github.com/KQMATH/moodle-mod_capquiz/wiki/Credits).

**Project lead:** Hans Georg Schaathun: <hasc@ntnu.no>
Expand Down
4 changes: 2 additions & 2 deletions classes/form/view/grading_configuration_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ public function definition() {
$elements = [];
$elements[] = $form->createElement('text', $input, $text);
if ($star > 1) {
$elements[] = $form->createElement('submit', "delstarbutton$star", 'Delete star');
$elements[] = $form->createElement('submit', "delstarbutton$star", get_string('delete_star', 'capquiz'));
}
$form->addGroup($elements, $groupname, $text, [''], false);
$form->setType($input, PARAM_INT);
$form->setDefault($input, $qlist->star_rating($star));
}

$form->addElement('submit', 'addstarbutton', 'Add star');
$form->addElement('submit', 'addstarbutton', get_string('add_star', 'capquiz'));

$strstarstopass = get_string('stars_to_pass', 'capquiz');
$strstarstopassrequired = get_string('stars_to_pass_required', 'capquiz');
Expand Down
2 changes: 1 addition & 1 deletion classes/output/question_attempt_renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private function render_question_head_html() {
public function render() : string {
global $PAGE;
if (!$this->capquiz->is_published()) {
return 'Nothing here yet';
return get_string('nothing_here_yet', 'capquiz');
}
$PAGE->requires->js_call_amd('mod_capquiz/attempt', 'initialize', []);
$qengine = $this->capquiz->question_engine();
Expand Down
3 changes: 3 additions & 0 deletions lang/en/capquiz.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
$string['question_lists'] = 'Question lists';
$string['configure_grading'] = 'Configure grading';

$string['add_star'] = 'Add star';
$string['delete_star'] = 'Delete star';
$string['stars_to_pass'] = 'Number of stars required for passing grade';
$string['stars_to_pass_required'] = 'Stars for passing grade is required (0-5)';
$string['due_time_grading'] = 'Time for final grading';
Expand Down Expand Up @@ -91,6 +93,7 @@
$string['configure_capquiz'] = 'Configure CAPQuiz';
$string['create_question_list'] = 'Create question list';
$string['other_question_lists'] = 'Other question lists';
$string['nothing_here_yet'] = 'Nothing here yet';

$string['missing_question'] = '<b>This question is missing.</b>';

Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2019062700;
$plugin->version = 2019070100;
$plugin->requires = 2016120500;
$plugin->cron = 0;
$plugin->component = 'mod_capquiz';
Expand Down

0 comments on commit f0702ed

Please sign in to comment.