.travis.yml | 78 + DEVELOPER.txt | 21 +- README.md | 73 + README.txt | 71 - images/arrow-right_808080_64.png | Bin 906 -> 0 bytes images/check_008000_64.png | Bin 745 -> 0 bytes images/check_808080_64.png | Bin 750 -> 0 bytes images/check_ffff00_64.png | Bin 658 -> 0 bytes images/circle-o_808080_64.png | Bin 1419 -> 0 bytes images/circle_808080_64.png | Bin 937 -> 0 bytes images/times_808080_64.png | Bin 869 -> 0 bytes images/times_ff0000_64.png | Bin 641 -> 0 bytes includes/views/defaults/questions_by_quiz.view.inc | 58 +- .../defaults/questions_by_quiz_version.view.inc | 107 +- includes/views/defaults/quiz.view.inc | 170 + includes/views/defaults/quiz_by_author.view.inc | 18 +- includes/views/defaults/quiz_by_taker.view.inc | 78 +- includes/views/defaults/quiz_results.view.inc | 20 +- includes/views/defaults/quiz_user_results.view.inc | 34 +- .../quiz_views_handler_argument_quiz_nid.inc | 158 - .../quiz_views_handler_argument_quiz_qid.inc | 160 + .../quiz_views_handler_field_node_link_take.inc | 2 +- .../quiz_views_handler_field_number_questions.inc | 18 +- .../handlers/quiz_views_handler_field_time.inc | 6 +- .../quiz_views_handler_filter_quiz_nid.inc | 142 - .../quiz_views_handler_filter_quiz_qid.inc | 143 + .../quiz_views_handler_relationship_quiz_nid.inc | 10 - .../quiz_views_handler_relationship_quiz_qid.inc | 10 + includes/views/quiz.views.inc | 208 +- js/quiz.auto-title.js | 31 - js/quiz.jumper.js | 10 - misc/images/arrow-right_808080_64.png | Bin 0 -> 906 bytes misc/images/check_008000_64.png | Bin 0 -> 745 bytes misc/images/check_808080_64.png | Bin 0 -> 750 bytes misc/images/check_ffff00_64.png | Bin 0 -> 658 bytes misc/images/circle-o_808080_64.png | Bin 0 -> 1419 bytes misc/images/circle_808080_64.png | Bin 0 -> 937 bytes misc/images/times_808080_64.png | Bin 0 -> 869 bytes misc/images/times_ff0000_64.png | Bin 0 -> 641 bytes misc/js/quiz.admin.categorized-form.js | 20 + misc/js/quiz.answering.confirm.js | 16 + misc/js/quiz.auto-title.js | 31 + misc/js/quiz.entity-form.js | 32 + misc/js/quiz.jumper.js | 17 + misc/js/quiz.take.count-down.js | 26 + misc/js/quiz_take.js | 19 + misc/quiz.css | 356 + modules/ajax_quiz/ajax_quiz.admin.inc | 58 - modules/ajax_quiz/ajax_quiz.info | 8 - modules/ajax_quiz/ajax_quiz.js | 113 - modules/ajax_quiz/ajax_quiz.module | 71 - .../long_answer/long_answer.admin.inc | 186 + .../long_answer/long_answer.classes.inc | 394 + .../question_types/long_answer/long_answer.info | 9 + .../question_types/long_answer/long_answer.install | 139 + .../question_types/long_answer/long_answer.module | 309 + .../long_answer/tests/LongAnswerUnitTest.test | 97 + .../theme/long-answer-answering-form.tpl.php | 12 + .../long_answer/theme/long_answer.theme.inc | 47 + .../question_types/matching/matching.classes.inc | 560 ++ modules/question_types/matching/matching.info | 9 + modules/question_types/matching/matching.install | 185 + modules/question_types/matching/matching.module | 125 + .../matching/tests/MatchingUnitTest.test | 60 + .../matching/theme/matching-answering-form.tpl.php | 12 + .../matching/theme/matching.theme.inc | 99 + modules/question_types/multichoice/README.txt | 45 + .../multichoice/js/multichoice.alternative.js | 25 + .../question_types/multichoice/js/multichoice.js | 91 + .../multichoice/multichoice.classes.inc | 1024 +++ .../question_types/multichoice/multichoice.info | 9 + .../question_types/multichoice/multichoice.install | 231 + .../question_types/multichoice/multichoice.module | 197 + .../multichoice/multichoice.views.inc | 244 + .../multichoice/multichoice_update_6400.inc | 402 + .../multichoice/tests/MultichoiceTestCase.test | 175 + .../theme/multichoice-alternative-creation.js | 34 + .../theme/multichoice-alternative-creation.tpl.php | 39 + .../theme/multichoice-alternative.tpl.php | 36 + .../theme/multichoice-answering-form.tpl.php | 11 + .../multichoice/theme/multichoice.theme.inc | 140 + .../question_types/quiz_ddlines/js/colorwheel.js | 310 + .../question_types/quiz_ddlines/js/quiz_ddlines.js | 1650 ++++ .../question_types/quiz_ddlines/js/raphael-min.js | 10 + modules/question_types/quiz_ddlines/js/raphael.js | 7955 ++++++++++++++++++++ .../quiz_ddlines/quiz_ddlines.classes.inc | 565 ++ .../question_types/quiz_ddlines/quiz_ddlines.info | 10 + .../quiz_ddlines/quiz_ddlines.install | 218 + .../quiz_ddlines/quiz_ddlines.module | 183 + .../quiz_ddlines/theme/images/close.png | Bin 0 -> 1119 bytes .../quiz_ddlines/theme/images/icon_ok.gif | Bin 0 -> 263 bytes .../quiz_ddlines/theme/images/icon_wrong.gif | Bin 0 -> 258 bytes .../quiz_ddlines/theme/images/icons.png | Bin 0 -> 3484 bytes .../quiz_ddlines/theme/quiz_ddlines.css | 147 + .../quiz_ddlines/theme/quiz_ddlines.theme.inc | 37 + .../quiz_directions/quiz_directions.classes.inc | 176 + .../quiz_directions/quiz_directions.info | 9 + .../quiz_directions/quiz_directions.install | 14 + .../quiz_directions/quiz_directions.module | 52 + .../theme/quiz-directions-answering-form.tpl.php | 12 + .../question_types/quiz_page/quiz_page.classes.inc | 135 + modules/question_types/quiz_page/quiz_page.info | 9 + modules/question_types/quiz_page/quiz_page.install | 14 + modules/question_types/quiz_page/quiz_page.module | 38 + .../quiz_page/tests/QuizPageTestCase.test | 102 + modules/question_types/scale/README.txt | 44 + modules/question_types/scale/scale.classes.inc | 638 ++ modules/question_types/scale/scale.info | 9 + modules/question_types/scale/scale.install | 193 + modules/question_types/scale/scale.js | 28 + modules/question_types/scale/scale.module | 391 + .../question_types/scale/tests/ScaleTestCase.test | 85 + .../scale/theme/scale-answering-form.tpl.php | 12 + modules/question_types/scale/theme/scale.theme.inc | 49 + .../short_answer/short_answer.admin.inc | 179 + .../short_answer/short_answer.classes.inc | 485 ++ .../question_types/short_answer/short_answer.info | 9 + .../short_answer/short_answer.install | 161 + .../short_answer/short_answer.module | 252 + .../short_answer/tests/ShortAnswerTestCase.test | 197 + .../theme/short-answer-answering-form.tpl.php | 12 + .../short_answer/theme/short_answer.theme.inc | 64 + .../truefalse/tests/TrueFalseUnitTest.test | 106 + .../theme/truefalse-answering-form.tpl.php | 12 + .../question_types/truefalse/truefalse.classes.inc | 314 + modules/question_types/truefalse/truefalse.info | 9 + modules/question_types/truefalse/truefalse.install | 137 + modules/question_types/truefalse/truefalse.module | 94 + modules/quiz_question/quiz_question.hooks.inc | 387 + modules/quiz_question/quiz_question.info | 7 + modules/quiz_question/quiz_question.install | 125 + modules/quiz_question/quiz_question.module | 446 ++ modules/quiz_question/quiz_question.pages.inc | 267 + modules/quiz_question/src/QuizQuestion.php | 495 ++ modules/quiz_question/src/QuizQuestionResponse.php | 437 ++ .../quiz_question/tests/QuizQuestionTestCase.test | 36 + modules/quiz_stats/quiz_stats.admin.inc | 361 +- modules/quiz_stats/quiz_stats.module | 131 +- .../src/Controller/RevisionListingController.php | 51 + .../src/Controller/RevisionStatsController.php | 201 + modules/quiz_stats/theme/quiz_stats_charts.tpl.php | 9 +- plugins/content_types/quiztake_pane.inc | 50 +- plugins/page_manager/tasks/quiztake.inc | 50 +- question_types/long_answer/long_answer.admin.inc | 184 - question_types/long_answer/long_answer.classes.inc | 383 - question_types/long_answer/long_answer.info | 9 - question_types/long_answer/long_answer.install | 139 - question_types/long_answer/long_answer.module | 307 - question_types/long_answer/long_answer.test | 107 - .../theme/long-answer-answering-form.tpl.php | 12 - .../long_answer/theme/long_answer.theme.inc | 47 - question_types/matching/matching.classes.inc | 557 -- question_types/matching/matching.info | 9 - question_types/matching/matching.install | 185 - question_types/matching/matching.module | 125 - question_types/matching/matching.test | 65 - .../matching/theme/matching-answering-form.tpl.php | 12 - question_types/matching/theme/matching.theme.inc | 99 - question_types/multichoice/README.txt | 45 - question_types/multichoice/multichoice.classes.inc | 1022 --- question_types/multichoice/multichoice.info | 8 - question_types/multichoice/multichoice.install | 233 - question_types/multichoice/multichoice.js | 89 - question_types/multichoice/multichoice.module | 195 - question_types/multichoice/multichoice.test | 184 - question_types/multichoice/multichoice.views.inc | 244 - .../multichoice/multichoice_update_6400.inc | 404 - .../theme/multichoice-alternative-creation.js | 34 - .../theme/multichoice-alternative-creation.tpl.php | 42 - .../theme/multichoice-alternative.tpl.php | 63 - .../theme/multichoice-answering-form.tpl.php | 12 - .../multichoice/theme/multichoice.theme.inc | 140 - question_types/quiz_ddlines/js/colorwheel.js | 310 - question_types/quiz_ddlines/js/quiz_ddlines.js | 1650 ---- question_types/quiz_ddlines/js/raphael-min.js | 10 - question_types/quiz_ddlines/js/raphael.js | 7955 -------------------- .../quiz_ddlines/quiz_ddlines.classes.inc | 562 -- question_types/quiz_ddlines/quiz_ddlines.info | 8 - question_types/quiz_ddlines/quiz_ddlines.install | 218 - question_types/quiz_ddlines/quiz_ddlines.module | 183 - question_types/quiz_ddlines/theme/images/close.png | Bin 1119 -> 0 bytes .../quiz_ddlines/theme/images/icon_ok.gif | Bin 263 -> 0 bytes .../quiz_ddlines/theme/images/icon_wrong.gif | Bin 258 -> 0 bytes question_types/quiz_ddlines/theme/images/icons.png | Bin 3484 -> 0 bytes question_types/quiz_ddlines/theme/quiz_ddlines.css | 147 - .../quiz_ddlines/theme/quiz_ddlines.theme.inc | 37 - .../quiz_directions/quiz_directions.classes.inc | 167 - .../quiz_directions/quiz_directions.info | 10 - .../quiz_directions/quiz_directions.install | 14 - .../quiz_directions/quiz_directions.module | 52 - .../theme/quiz-directions-answering-form.tpl.php | 12 - question_types/quiz_page/QuizPageTestCase.test | 105 - question_types/quiz_page/quiz_page.classes.inc | 132 - question_types/quiz_page/quiz_page.info | 8 - question_types/quiz_page/quiz_page.install | 14 - question_types/quiz_page/quiz_page.module | 38 - .../quiz_question/quiz_question.core.inc | 888 --- question_types/quiz_question/quiz_question.info | 8 - question_types/quiz_question/quiz_question.install | 143 - question_types/quiz_question/quiz_question.module | 1173 --- .../quiz_question/quiz_question.pages.inc | 247 - question_types/quiz_question/quiz_question.test | 43 - .../quiz_question/quiz_question.theme.inc | 25 - question_types/scale/README.txt | 44 - question_types/scale/scale.classes.inc | 635 -- question_types/scale/scale.info | 9 - question_types/scale/scale.install | 193 - question_types/scale/scale.js | 28 - question_types/scale/scale.module | 391 - question_types/scale/scale.test | 93 - .../scale/theme/scale-answering-form.tpl.php | 12 - question_types/scale/theme/scale.theme.inc | 49 - question_types/short_answer/short_answer.admin.inc | 174 - .../short_answer/short_answer.classes.inc | 482 -- question_types/short_answer/short_answer.info | 9 - question_types/short_answer/short_answer.install | 161 - question_types/short_answer/short_answer.module | 252 - question_types/short_answer/short_answer.test | 220 - .../theme/short-answer-answering-form.tpl.php | 12 - .../short_answer/theme/short_answer.theme.inc | 64 - .../theme/truefalse-answering-form.tpl.php | 12 - question_types/truefalse/truefalse.classes.inc | 309 - question_types/truefalse/truefalse.info | 9 - question_types/truefalse/truefalse.install | 139 - question_types/truefalse/truefalse.module | 95 - question_types/truefalse/truefalse.test | 119 - quiz.admin.inc | 1588 ---- quiz.api.php | 42 +- quiz.css | 367 - quiz.help.inc | 30 - quiz.hooks.inc | 561 ++ quiz.info | 28 +- quiz.install | 981 +-- quiz.module | 4167 +--------- quiz.pages.inc | 682 +- quiz_datetime.inc | 99 - .../Admin/QuizAdminSettingsController.php | 337 + .../Admin/QuizQuestionAdminController.php | 71 + .../Admin/QuizResultsAdminController.php | 13 + .../Admin/QuizRevisionsAdminController.php | 43 + src/Controller/Legacy/QuizTakeLegacyController.php | 62 + src/Controller/QuizEntityAddController.php | 24 + src/Controller/QuizEntityViewController.php | 14 + src/Controller/QuizMyResultsController.php | 14 + src/Controller/QuizQuestionFeedbackController.php | 54 + src/Controller/QuizResultBaseController.php | 174 + src/Controller/QuizResultController.php | 45 + src/Controller/QuizTakeController.php | 216 + src/Controller/QuizTakeQuestionController.php | 116 + src/Controller/QuizUserResultController.php | 65 + src/Entity/AnswerMetadataController.php | 23 + src/Entity/QuizEntity.php | 107 + src/Entity/QuizEntity/DefaultPropertiesIO.php | 157 + src/Entity/QuizEntity/QuestionLoader.php | 258 + src/Entity/QuizEntityController.php | 164 + src/Entity/QuizEntityMetadataController.php | 35 + src/Entity/QuizEntityType.php | 29 + src/Entity/QuizTypeEntityController.php | 47 + src/Entity/QuizTypeUIController.php | 18 + src/Entity/QuizUIController.php | 184 + src/Entity/QuizViewsController.php | 33 + src/Entity/RelationshipMetadataController.php | 21 + src/Entity/Result.php | 87 + src/Entity/Result/ScoreCalculator.php | 85 + src/Entity/ResultController.php | 108 + src/Entity/ResultMetadataController.php | 32 + src/Entity/Views/QuizEntityDeleteLink.php | 17 + src/Entity/Views/QuizEntityEditLink.php | 17 + src/Entity/Views/QuizEntityLink.php | 19 + src/Form/QuizAdminEntityForm.php | 66 + src/Form/QuizAnsweringForm.php | 209 + src/Form/QuizAnsweringForm/FormSubmission.php | 296 + src/Form/QuizCategorizedForm.php | 303 + src/Form/QuizEntityForm.php | 86 + src/Form/QuizEntityForm/FormDefinition.php | 488 ++ src/Form/QuizEntityForm/FormValidation.php | 123 + src/Form/QuizQuestionsForm.php | 555 ++ src/Form/QuizReportForm.php | 218 + src/Form/QuizTypeForm.php | 82 + src/Helper/FormHelper.php | 92 + src/Helper/HookImplementation.php | 96 + src/Helper/HookImplementation/HookEntityInfo.php | 123 + .../HookImplementation/HookFieldExtraFields.php | 76 + src/Helper/HookImplementation/HookMenu.php | 106 + src/Helper/HookImplementation/HookQuizScored.php | 68 + src/Helper/HookImplementation/HookUserCancel.php | 29 + src/Helper/MailHelper.php | 68 + src/Helper/Node/NodeHelper.php | 112 + src/Helper/Node/NodeInsertHelper.php | 41 + src/Helper/Node/NodeUpdateHelper.php | 92 + src/Helper/Node/NodeValidateHelper.php | 98 + src/Helper/NodeHelper.php | 72 + src/Helper/Quiz/AccessHelper.php | 175 + src/Helper/Quiz/BaseForm.php | 43 + src/Helper/Quiz/FeedbackHelper.php | 76 + src/Helper/Quiz/ResultHelper.php | 164 + src/Helper/Quiz/TakeJumperHelper.php | 80 + src/Helper/Quiz/TakingHelper.php | 20 + src/Helper/QuizHelper.php | 724 ++ src/Quiz.php | 178 + tests/QuizCreation.test | 110 - tests/QuizEntityFeedbackTestCase.test | 136 + tests/QuizEntityNavigationTestCase.test | 175 + tests/QuizEntityTakingTestCase.test | 167 + tests/QuizEntityTestCase.test | 174 + tests/QuizFeedback.test | 139 - tests/QuizNavigation.test | 188 - tests/QuizResult.test | 212 - tests/QuizResultTestCase.test | 111 + tests/QuizTaking.test | 197 - tests/QuizTestCase.test | 159 +- tests/QuizTimer.test | 59 - tests/QuizTimerTestCase.test | 50 + theme/question_bg.png | Bin 3789 -> 0 bytes theme/quiz-report-form.tpl.php | 30 +- theme/quiz_confirm.js | 13 - theme/quiz_node_form.js | 24 - theme/quiz_take.js | 19 - 318 files changed, 34130 insertions(+), 32169 deletions(-) 318 files changed, 34130 insertions(+), 32169 deletions(-) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fdad84a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,78 @@ +language: php +php: + - 5.3 + - 5.4 + - 5.5 + +mysql: + database: drupal + username: root + encoding: utf8 + +install: + # --------------------- + # Install Drush + # --------------------- + - export PATH="$HOME/.composer/vendor/bin:$PATH" + - composer global require drush/drush:dev-master + + # --------------------- + # Setup DB + # --------------------- + - mysql -e 'SET GLOBAL wait_timeout = 5400;' + - mysql -e 'create database drupal;' + +before_script: + # --------------------- + # Install apache server + # --------------------- + - sudo apt-get install apache2 libapache2-mod-fastcgi + - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf + - sudo a2enmod rewrite actions fastcgi alias + - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm + - wget https://cdn.rawgit.com/backdrop/backdrop/fe6e16b6114995eed008596aa7c733bc907a8fca/core/misc/travis-ci/vhost.conf -O /tmp/vhost.conf + - sudo cp -f /tmp/vhost.conf /etc/apache2/sites-available/default + + # --------------------- + # Variables + # --------------------- + - cd .. + - export VENDOR=`pwd` + - cd .. + - export DRUPAL=`pwd`'/drupal-7.x/' + + # --------------------- + # Download the codebase + # --------------------- + - wget https://github.com/drupal/drupal/archive/7.x.zip -O drupal.zip + - unzip -qq drupal.zip + - cd $DRUPAL + - drush si testing --db-url=mysql://root:@localhost/drupal --yes + - mv $VENDOR/* sites/all/modules/ + + # --------------------- + # Change doc-root + # --------------------- + - sudo sed -i -e "s,/var/www,$DRUPAL,g" /etc/apache2/sites-available/default + - sudo service apache2 restart + + # --------------------- + # Prepare env for the module + # --------------------- + - drush vset --yes file_temporary_path /tmp + - drush en -y simpletest long_answer matching multichoice quiz_ddlines quiz_directions quiz_page quiz_question scale short_answer truefalse + - drush vset --yes simpletest_verbose FALSE + + # --------------------- + # No cache data! + # --------------------- + - drush cc all + +script: + - drush test-run --dirty --field-labels=0 'Quiz' --uri=http://localhost:80 + +notifications: + email: false + hipchat: 76d833fa0b6bae8860f279a0e7dba0@me.Andy + flowdock: 8e80a6538fa73fda0f7dd60bf2d44356 diff --git a/DEVELOPER.txt b/DEVELOPER.txt index 8bdde5b..eccecd0 100644 --- a/DEVELOPER.txt +++ b/DEVELOPER.txt @@ -19,34 +19,32 @@ Here are the steps: 3. Make sure you module implements hook_quiz_question_info() 4. Define classes that extends QuizQuestion and QuizQuestionResponse. For a complete example, see multichoice.classes.inc. - - - + ================================================== How to clean up the database during development ================================================== # see what questions are deleted but still in quizzes -SELECT qnr.* FROM quiz_node_relationship qnr -LEFT JOIN node n ON qnr.child_nid = n.nid +SELECT qnr.* FROM quiz_relationship qnr +LEFT JOIN node n ON qnr.question_nid = n.nid WHERE n.nid IS NULL # delete questions that are deleted but still in quizzes DELETE qnr -FROM quiz_node_relationship qnr -LEFT JOIN node n ON qnr.child_nid = n.nid +FROM quiz_relationship qnr +LEFT JOIN node n ON qnr.question_nid = n.nid WHERE n.nid IS NULL # see what quizzes are deleted but still have questions -SELECT qnr.* FROM quiz_node_relationship qnr -LEFT JOIN node n ON qnr.parent_nid = n.nid +SELECT qnr.* FROM quiz_relationship qnr +LEFT JOIN node n ON qnr.quiz_qid = n.nid WHERE n.nid IS NULL # delete quizzes that are deleted but still have questions DELETE qnr -FROM quiz_node_relationship qnr -LEFT JOIN node n ON qnr.parent_nid = n.nid +FROM quiz_relationship qnr +LEFT JOIN node n ON qnr.quiz_qid = n.nid WHERE n.nid IS NULL # see what revisions are stored for nodes that are deleted @@ -59,4 +57,3 @@ DELETE nr FROM node_revisions nr LEFT JOIN node n ON nr.nid = n.nid WHERE n.nid IS NULL - diff --git a/README.md b/README.md new file mode 100644 index 0000000..c9eb18d --- /dev/null +++ b/README.md @@ -0,0 +1,73 @@ +Quiz.module [![Build Status](https://travis-ci.org/v3kwip/quiz.svg?branch=dev-master)](https://travis-ci.org/v3kwip/quiz) +==== + +Overview +-------- +The quiz.module is a framework which allows you to create interactive quizzes +for your visitors. It allows for the creation of questions of varying types, and +to collect those questions into quizzes. + + +Requirements +------------ +Drupal 6.x +PHP 5.1 (for OOP code introduced in Quiz 3.0) +MySQL 5 + +The module consists of two types of modules: the Quiz module itself +(quiz.module), and various question types (example: multichoice.module). The +main Quiz module, the Quiz Question module and at least one question type module +are required to be both installed and enabled for this module to function properly. + + +Features +-------- +This list isn't complete(not even close) + + - Administrative features: + o Assign feedback to responses to help point out places for further study + o Supports multiple answers to quiz questions (on supporting question types) + o Limit the number of takes users are allowed + o Extensibility allows for additional question types to be added + o Permissions (create/edit) + o Randomize questions during the quiz + o Assign only specific questions from the question bank + + - User features: + o Can create/edit own quizzes if have 'create quizzes' permission + o Can take a quiz if have 'view quizzes' permissions, and receive score + + +Installation +------------ +Please refer to the INSTALL file for installation directions. + + +Support +------- +- Visit the Quiz group at http://groups.drupal.org/quiz + + +Credits +------- +- Specification: Robert Douglass +- Original author: Károly Négyesi +- Update to Drupal 5: Wim Mostrey and riverfr0zen +- Maintainers: Angela Byron, westwesterson, mbutcher, sivaji, turadg, falcon + + +Acknowledgements +---------------- +I'd like to extend a heart-felt thank you to the folks at Google for their +Summer of Code program, without which my working on this module would not have +been possible. I'd also like to extend my thanks to Robert Douglass as my mentor +on this project, for his tireless patience and faith in my abilities, and the +entire Drupal development community for their support while I struggled with +foreign concepts like 'node' and 'taxonomy.' You guys all provided me with +support, encouragement, and fun times and I sincerely hope to remain a part of +the Drupal community for a long time to come! + +Also huge thanks go to Ejovi Nuwere of http://www.securitylab.net/ for +sponsoring further module development after Summer of Code. + +-Angela Byron/'webchick' diff --git a/README.txt b/README.txt deleted file mode 100644 index 16a90f2..0000000 --- a/README.txt +++ /dev/null @@ -1,71 +0,0 @@ - -Overview --------- -The quiz.module is a framework which allows you to create interactive quizzes -for your visitors. It allows for the creation of questions of varying types, and -to collect those questions into quizzes. - - -Requirements ------------- -Drupal 6.x -PHP 5.1 (for OOP code introduced in Quiz 3.0) -MySQL 5 - -The module consists of two types of modules: the Quiz module itself -(quiz.module), and various question types (example: multichoice.module). The -main Quiz module, the Quiz Question module and at least one question type module -are required to be both installed and enabled for this module to function properly. - - -Features --------- -This list isn't complete(not even close) - - - Administrative features: - o Assign feedback to responses to help point out places for further study - o Supports multiple answers to quiz questions (on supporting question types) - o Limit the number of takes users are allowed - o Extensibility allows for additional question types to be added - o Permissions (create/edit) - o Randomize questions during the quiz - o Assign only specific questions from the question bank - - - User features: - o Can create/edit own quizzes if have 'create quizzes' permission - o Can take a quiz if have 'view quizzes' permissions, and receive score - - -Installation ------------- -Please refer to the INSTALL file for installation directions. - - -Support -------- -- Visit the Quiz group at http://groups.drupal.org/quiz - - -Credits -------- -- Specification: Robert Douglass -- Original author: Kroly Ngyesi -- Update to Drupal 5: Wim Mostrey and riverfr0zen -- Maintainers: Angela Byron, westwesterson, mbutcher, sivaji, turadg, falcon - - -Acknowledgements ----------------- -I'd like to extend a heart-felt thank you to the folks at Google for their -Summer of Code program, without which my working on this module would not have -been possible. I'd also like to extend my thanks to Robert Douglass as my mentor -on this project, for his tireless patience and faith in my abilities, and the -entire Drupal development community for their support while I struggled with -foreign concepts like 'node' and 'taxonomy.' You guys all provided me with -support, encouragement, and fun times and I sincerely hope to remain a part of -the Drupal community for a long time to come! - -Also huge thanks go to Ejovi Nuwere of http://www.securitylab.net/ for -sponsoring further module development after Summer of Code. - --Angela Byron/'webchick' diff --git a/images/arrow-right_808080_64.png b/images/arrow-right_808080_64.png deleted file mode 100644 index f410b1d29a3abe2c7ac1c57f3025b747710637b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmV;519kj~P))_IrmvKK0at#uthYXhxS8^BiV$2893eT-K2FiSN7yo-;q4!7V=ynGi z;B!1&$;&L&0I&nwd-Pd`FYr)#JF`_9z*~BU?`RqJsSKecfP3(IpJS?5LP-G6;)Vgn zEf*j>nAgtSDhXg|!r0})*WrOoUZN@q;HSj#RUniEuou52&apy(FqZ5lqLKhE;RWHT zFGVZxr9u!&FN4Ri8Gj|t)2W2DsfPZq8V^E8ut_?E5up;YLa6m9d_O|;}Je6>}0O7ttCun&jcF+(& zXniJlP}ns6ojA{^0U@*o00)Fh$OYlveg<^|FoKUTiJ8LJe%#!T@rXw8l|CTc82NlD zzLxOg(omgBcoM(#>Kv86oZ3YBnow@xttcV)NJMt5Kj zZi;n?0f_xJT#FjR^RdQZSO#n8@mRw`0T9(f0q{+%AqL>zLPlEXGR7^zATQ5bpfE!ZRGp;5vLJeLH+Xxbvs_8Ppm;&hQ)b8J@NPa)tk0 z2>-(%gIfU@itw}nkURXzlu2p>$Q6DPPfH9>T>!bmpGbD39)R58zfX2_MKu8A3jc@9 z;VBQ`F+&`lvH+F{yUJYQze{#Bhe`r?4yzL9n8HSd!c!JN>dOnA@W<1w#8nbN%BwJc z3gN%aKt-Zhuw&5k=m6(e-hY#_nF8|z=R_%X*cU`%LMy<~T go9jA&)&^SZKUP$-sHDN@fdBvi07*qoM6N<$g2G{|NdN!< diff --git a/images/check_008000_64.png b/images/check_008000_64.png deleted file mode 100644 index 408fd2b7805513c83a7e50428b47143d302dedd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVDuSL2^VyqtK9O6hfk>Kon>+f(0_vu2$6mut<;dY@+(YxcWl!g)(N%VHN0JH3F|1;kD-Aa((< z(+h}QKA^M&2nqk$U>Eq6o@lFpX<^}a<44wH5dk~! z8b9$7M=O_>ooU<*^sJHak~u@(1ltzv=cGzw2X0f%uP%QNOq;A-L0veP&` z;{}X@PjV7ha+j8!DDaFHaL53DMULm3!sR>*W+Wv17X{!MF5n;@$OoU~G%gjm9;Sqa z-=zRN*#b7>=H!Scw1pZsV8VV=$(O6yyt$?SVv%zr^S_4mghogyvSE=!LS_DtI z)_2}47{KnwW`ke;34YhOX5kELi7lD5_4|Ov(hG=PKZYiz00000NkvXXu0mjf`)gKX diff --git a/images/check_808080_64.png b/images/check_808080_64.png deleted file mode 100644 index aee7c23a4c048ace00c49a33a519db9ed26ff57c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmV^z(%U;ighZi6!L7^fclt@&F2o;-X z&~2rXh$!w(B$L^D=i$tp89Tq^Hs{Qo`G3E+ICKB!t{MymR&rLyE+BS#0kI2+onAof z0%E5Z5W9fb=>^0tAa?#20SEB{U-1|_^4|DA2$;n)?7>zX!dpWrW7Bm3v$&oyz7CJ% zkkDlT%fTm^kV8UO1&o7FGFCzt1>}WKl1Mm^HQ6-*Gm60{nZQGANl$c1zzl9wxPK!~ zrU$zspelTl&FO(I2nYoa@6!Wq7Z4Ku6Ks3!lh-W zad^fH7zLl?G_K?>Ejv-*87<(5A^h4L>zu*mJP*uBNcb-bz_Yx7!+0Pce3G-cRN#7; z5*B{10`O!D*oM1`!6%uMU&0h_m3T&0O2LyY-~`rJC}s{9$6V72c(Mg-s#48T&f&r` zbFG0VTfm#Li=}cNgVb27;K>$nM>q-d{z+&ZJlO(%V-g>#F20m`JQo(e&{j7p%WZ>; z*e{%f%zj*nB=Fw@tvB*TD71vC2@cQrSK+ous0E&UKZasUs12U{KZj#Us1=@K4UwiL zET|ct;w`bJBrF*2^R>cLt|wTxgvQ`0-xRG&LZk3h>k5aK&^SER+v1@lM1d#FxjkP{GArT zQ?B)$H;aa_lh|(f%|9{hIJG8q3V=U&y7Xyf+WP;1#?lLjT|n&g0%8{sJH3F|1;kD- gAa((i_@%07*qoM6N<$f^rH@)c^nh diff --git a/images/check_ffff00_64.png b/images/check_ffff00_64.png deleted file mode 100644 index bc17f6f6b788297ab847947bf6c97d4e235761ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2bo~aSW-L^LEzWEYUy_xA3Nf z^vUPuUvko^X)x((-6)ovsCy&p6T`n_$HG4-vT#c~vPe6Ithv(AJ55Y!QNn}G9Lz?~ z?o^+fyElFQN#!yeKg5L!{6m$2|}KPc2Ba=eQBU zuy6HyA@yI^b6y(mV6>4b_$T-v>VJYZQ`@0(%X{`0ni#Yz8qEL8u6(fX+pg!ozs5Z( z@V0N7_Ca2y@7-2Elay6?eT?y1389ac9^rpmH+S7OzIdevT}RHzaoc1_+JzseV%oQQ zZP>$NmNnjgPDXsF>;CYWCFWeq`&V(SALP9sq;u{F;kbYGuG0_ci61l>)m7{GGE~By zENZ+COmlQDk81GetVp?X%>{g~3=EVN!mC4_yxP{Wa~BhiQ3=1U!x z-`p@g!PDzsc^uVp0(^~=` zCf-Om5_Ras2ZI`;6jenQxg57-XVsR2&3AJO0y!7kyh=M-WD%vcu=#(|4d=o&%Mb4q zTGhZl|KkrE&Z`HS@Be0;+akXA@%oh8IOZgMpIp!MX2-e+iG0SZ%Ui=! kVld(r9NWbYSpTr{{5>mm$>Z-GU|M7FboFyt=akR{0P1KiA^-pY diff --git a/images/circle-o_808080_64.png b/images/circle-o_808080_64.png deleted file mode 100644 index c659d2e2edfb649a53937fb0ca06ce9f3e220429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1419 zcmV;61$6p}P)1SWZLQH5`~am~Q>(s$wEEgBG??5r=);-nO`P3xc6WBSN%whu8r>hRd=ld=7GAqW`UZ!CV}7cHZCs#)&lnf zLqLy`x9To{Zs6Xgw9~){a18h@pnd-mx(jRuMu9WH0d(gzdVzzkyib9?jOG20Py%cO z#(|T-K%g?4sQ`n(4~P&qhAKF#0Ik5wh+%hUH^;;vGCu5c^=BfB0PCG0&r{4`+Dr?u z7ZHA4mV(j>umkuGxFJjB0qAyi+>y3`Gy?2G`r*}SD-Fywz!>mgnun7%-Ce-DDe9>s zZ-+_b)i&eqT|k7a0$s?c--q<`)d|XP1>SRizn{dgBm(RJ-bzw9FaaD!-Vlw5Jag_k z0~~kv+JJswH_4j!+sNeU3+n^cF0c;x5c{b6HLwkNGkij{^HDV1b9Vx_ApP7zEASC; zy|p5X0Ik3WNMF;q2s{bg4xF$Wq3|tmEASNXmm&XZ#9q^nWf9;7Y!i=JU<+^v_}fx> z0xkis0$Z`I54w@pvx+7_H}I^XoL>;gxyoQ1Z1P_Qw(@z)k4$`isabt0?D}m~r)LW5OWH0xC{`7Y&9yL;lS^iYeeZL%!j- z#3%u-L)44oIPiwSfIN8({S`TY_~Ru?fFVQWPZNH$Ps$}{M;sL-IO8QsfCrR9KSS33 z%YkpuXMU0X_yp)g0vvI?uA~>uAtk*B=7 zYy<96@%0jL_73A1L;Ud)7Z%@V zFyJ5=PiSOd1BQ(c6hGnwIEe&5`n15!B4U3mngBIygUotlJ3R01umNeAmU>=6f1R7Q$6vy>{j~;ZZjTcF?N9-p zK%Ccpd4Qh~yHzX#G=QDx0SAyV;V|$e;pPcjfUl6)zt-mg&Lj4kBG=X z+mY5VO1iZ}8*mRYh@Aj#Gd{O~*!i=yq9li;CV+>5cM?1^;I27Dj8n+Cat>La&m$40 zD$<2|`0tchdxCnFcnJ7B$pcA`$sKY3zM1gZcBEPEOjw_l1;qKINgqseQ1S@UJS}5F z5u8WtIhy9-v`1wpfSW1raKsW*$YLl_vu`HLVd-fk3bP;k;24TUPpOt|8VlM0A(9cHY;9$ Ze*mx#^MUl7b*TUV002ovPDHLkV1is@lgj`A diff --git a/images/circle_808080_64.png b/images/circle_808080_64.png deleted file mode 100644 index 576483f27f299ca6414b3c2fd9a50af7babc94b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 937 zcmV;a16KTrP)Y>9k#X|4Qyfg2wb$37Tg3iqQzTfA&^S(3l&NFS5N`+=-UuXfLX&De&Kxo=M z^wA0QMWrYDzZjJcU<=rY$~sVu$};fFwK!J>bOD!vVW2nV*kV)wO2EaMeJj8WFbn*& zsP7-Phrmf-4)_5~k{)~-eZb?Wy|=)CVSE2!%YYtW0ayZtEVWrn8&C#5Ax0dx)v&1n z1>hkf?3}qAEy~FJFdp@9goy!1BO!P3Gnv-X4vZnjcbhbn*MLFb18~fwa|@Ir9cS}4 zkjH=#WE}3#+o@#^0Q11LJe9Max+B1|JRLcv06dTWevzeOmNQ@wc#@^@06Zn*aL_fN z8+e6hwz*7gDi5xrVJmW~1Uuz2I)i4t;oP9@EN5^&p4OejXt z_~FtFn85!{jxE{|{fQ(QZ~`~?^*$++@&J`&zBA@8E3#@#Jxsf2#H5YoB_jb zv;?6IS)5T4XTTLVT7nT9kIH~fWPziR=mid`cBl;KcdI2B%D7Ypn6Bg1E6TW91}L_5 zIu;TNWn3x)if(lTqo~^0GC;Ad!>x{BDC1HYu;o}tD3o!j4A^k1BN!X1jV%Kd+t%Ic z2!=8)l>wg}3kiiXE|mc*j)jCm8JEg{WyeB7p^PhT4rsJtP$eeaCT>Aw#+{ZR#KzMs z2F%9oh%;afNqK1m=8<@mBrS`NTbB}s#5j@+SOVVJ)#9B6;A7GOX|Kjcfn95I{IZMa zPbAHNDw6NF7kPxnO7{~FK@dsk3h@=o3L1Mrn|H6@gO;EHD4Qec68?caoq9aPW)Itb|r#7~t5X9Kn z2sUDoU}sAI00{&Vi|-BW<#LK3Dg1^@xRo^bB5&e#Jcg_I5_ftg%nytnYb(|851;=i7Wdnk5?ue^j`@l5CZOf`OGclgRF{D3EV zCU2$S(I(2)Kot@mlt9 zKM9%P;qSQvqhEoKgX8yOQ9^e3?{IzY;OI*58$7S=hwxsigg;G7+zhVa{m2C^OX0Hf zoF(CS!aPjjPYW)Kdlo|XTLO=wDLnm4;e#NdIXtV|46Tc<@Z>Z^iZK$p!;{w$D%L9@ zB|Nz;v0^M-d5?Tcugz%Lv2`vH+Qus=HN4#iY5KBt(0HAIc41*Y>yN^catsy22-M zcg_XTPrwJ!iuU2&jZKlaf!e}}xr3v3hMo?WvzPsLbw!?pXXg%#-Wj?PuVohx+R_&N z67HDpHOwOV6*#Z`OwQc>e9^Tnp(#9ldw~bNX;u%fST3PCJpH@DZMBQ)&`F-b+#-Tqfy%8|F vfYEFOj4og_8v&yW7|lk&=mJJ_=mq=_UP!MYYFtXe00000NkvXXu0mjf=u@59 diff --git a/images/times_ff0000_64.png b/images/times_ff0000_64.png deleted file mode 100644 index 2d7367ec6f94180480b2839e180ecf1c4283002f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 641 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj*EaSW-L^Y+$8ub4oA_K)X% zd6K4!B&jdyTHEWNkgX8LrflctA((TCzcgFyEeO`aP+SsGPJqv9PnUo45xXNkOS zoBnTeasD^HIp5yY*o&3#eKW`Kw(*HLh3cw?H>{hMv!gNPy5HSo_|}kqz_NfNrt{su z@@$|BYFP4O%xC@IW4^)q`R;?09=vs>W^*Sl%-)(3A4(R9kKDehBdtg{xI&2mus z{+z2E4Xg)~9t(tgO#85D?fZt`0#iOFzGrxUAIQ4$abZ34hF$)Rg&gXKejl=DRT8-L z$d)13dB!jEgJz0L{_0;~V+r5GrNDhqc0J1svnG`|UISg0$Ql+0lO_{8E(I<}IeE?x zC)&=lhJLK)ndkmSO0-_)1K*F-4R^{KR{St%(L36%P@)^xcj0J-rc?OiRF2rb=?W#b z_j*6rAK5M7^_cz9594P3nH)@SY2mX(H{L@NdF@v^F?tEw_!oHzbUn6Z zn5?8Bm+adVAo`xQg2VAAPri&(=^iGAX4&S`*50+E$IPGK<#^*iuj27H>B$Lk4C@=0 z^VDnpTFNMP-s%I_jPxJg7lYroYBiiYcjkY@F7&tr$8h>H#(zvUug_>}^>=LtCM^a} LS3j3^P6name = 'questions_by_quiz'; $view->description = 'View of all the questions associated with a quiz'; $view->tag = 'quiz'; -$view->base_table = 'quiz_node_properties'; +$view->base_table = 'quiz_entity_revision'; $view->human_name = ''; $view->core = 0; $view->api_version = '3.0'; @@ -20,16 +20,16 @@ $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['exposed_form']['type'] = 'basic'; $handler->display->display_options['pager']['type'] = 'none'; $handler->display->display_options['style_plugin'] = 'table'; -$handler->display->display_options['style_options']['grouping'] = 'parent_vid'; +$handler->display->display_options['style_options']['grouping'] = 'quiz_vid'; $handler->display->display_options['style_options']['columns'] = array( - 'timestamp' => 'parent_nid', + 'timestamp' => 'quiz_qid', 'title' => 'title', 'type' => 'type', - 'child_nid' => 'child_nid', - 'child_vid' => 'child_vid', + 'question_nid' => 'question_nid', + 'question_vid' => 'question_vid', 'question_status' => 'question_status', - 'parent_nid' => 'timestamp', - 'parent_vid' => 'parent_vid', + 'quiz_qid' => 'timestamp', + 'quiz_vid' => 'quiz_vid', ); $handler->display->display_options['style_options']['default'] = 'title'; $handler->display->display_options['style_options']['info'] = array( @@ -45,11 +45,11 @@ $handler->display->display_options['style_options']['info'] = array( 'sortable' => 0, 'separator' => '', ), - 'child_nid' => array( + 'question_nid' => array( 'sortable' => 0, 'separator' => '', ), - 'child_vid' => array( + 'question_vid' => array( 'sortable' => 0, 'separator' => '', ), @@ -57,48 +57,48 @@ $handler->display->display_options['style_options']['info'] = array( 'sortable' => 0, 'separator' => '', ), - 'parent_nid' => array( + 'quiz_qid' => array( 'sortable' => 0, 'separator' => '', ), - 'parent_vid' => array( + 'quiz_vid' => array( 'sortable' => 0, 'separator' => '', ), ); /* Relationship: Quiz Questions: Quiz Node VID */ -$handler->display->display_options['relationships']['parent_vid']['id'] = 'parent_vid'; -$handler->display->display_options['relationships']['parent_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['relationships']['parent_vid']['field'] = 'parent_vid'; -$handler->display->display_options['relationships']['parent_vid']['label'] = 'node'; -$handler->display->display_options['relationships']['parent_vid']['required'] = TRUE; +$handler->display->display_options['relationships']['quiz_vid']['id'] = 'quiz_vid'; +$handler->display->display_options['relationships']['quiz_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['relationships']['quiz_vid']['field'] = 'quiz_vid'; +$handler->display->display_options['relationships']['quiz_vid']['label'] = 'node'; +$handler->display->display_options['relationships']['quiz_vid']['required'] = TRUE; /* Relationship: Quiz Questions: Question Node VID */ -$handler->display->display_options['relationships']['child_vid']['id'] = 'child_vid'; -$handler->display->display_options['relationships']['child_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['relationships']['child_vid']['field'] = 'child_vid'; -$handler->display->display_options['relationships']['child_vid']['label'] = 'question node revision'; +$handler->display->display_options['relationships']['question_vid']['id'] = 'question_vid'; +$handler->display->display_options['relationships']['question_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['relationships']['question_vid']['field'] = 'question_vid'; +$handler->display->display_options['relationships']['question_vid']['label'] = 'question node revision'; /* Field: Quiz Questions: Question Node ID */ -$handler->display->display_options['fields']['child_nid']['id'] = 'child_nid'; -$handler->display->display_options['fields']['child_nid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['fields']['child_nid']['field'] = 'child_nid'; -$handler->display->display_options['fields']['child_nid']['exclude'] = TRUE; -$handler->display->display_options['fields']['child_nid']['separator'] = ''; +$handler->display->display_options['fields']['question_nid']['id'] = 'question_nid'; +$handler->display->display_options['fields']['question_nid']['table'] = 'quiz_relationship'; +$handler->display->display_options['fields']['question_nid']['field'] = 'question_nid'; +$handler->display->display_options['fields']['question_nid']['exclude'] = TRUE; +$handler->display->display_options['fields']['question_nid']['separator'] = ''; /* Field: Content revision: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node_revision'; $handler->display->display_options['fields']['title']['field'] = 'title'; -$handler->display->display_options['fields']['title']['relationship'] = 'child_vid'; +$handler->display->display_options['fields']['title']['relationship'] = 'question_vid'; $handler->display->display_options['fields']['title']['label'] = 'Question Title'; $handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE; -$handler->display->display_options['fields']['title']['alter']['path'] = 'node/[child_nid]'; +$handler->display->display_options['fields']['title']['alter']['path'] = 'node/[question_nid]'; $handler->display->display_options['fields']['title']['link_to_node'] = TRUE; /* Field: Quiz Questions: Question Status */ $handler->display->display_options['fields']['question_status']['id'] = 'question_status'; -$handler->display->display_options['fields']['question_status']['table'] = 'quiz_node_relationship'; +$handler->display->display_options['fields']['question_status']['table'] = 'quiz_relationship'; $handler->display->display_options['fields']['question_status']['field'] = 'question_status'; /* Contextual filter: Quiz: Quiz Node NID */ $handler->display->display_options['arguments']['nid']['id'] = 'nid'; -$handler->display->display_options['arguments']['nid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['arguments']['nid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['arguments']['nid']['field'] = 'nid'; $handler->display->display_options['arguments']['nid']['default_action'] = 'not found'; $handler->display->display_options['arguments']['nid']['exception']['title_enable'] = TRUE; diff --git a/includes/views/defaults/questions_by_quiz_version.view.inc b/includes/views/defaults/questions_by_quiz_version.view.inc index 38d3062..31d2511 100644 --- a/includes/views/defaults/questions_by_quiz_version.view.inc +++ b/includes/views/defaults/questions_by_quiz_version.view.inc @@ -1,9 +1,10 @@ name = 'questions_by_quiz_version'; $view->description = 'View of all the questions associated with a particular revision of a quiz'; $view->tag = 'quiz'; -$view->base_table = 'quiz_node_properties'; +$view->base_table = 'quiz_entity_revision'; $view->human_name = ''; $view->core = 0; $view->api_version = '3.0'; @@ -20,103 +21,103 @@ $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['exposed_form']['type'] = 'basic'; $handler->display->display_options['pager']['type'] = 'none'; $handler->display->display_options['style_plugin'] = 'table'; -$handler->display->display_options['style_options']['grouping'] = 'parent_vid'; +$handler->display->display_options['style_options']['grouping'] = 'quiz_vid'; $handler->display->display_options['style_options']['columns'] = array( - 'timestamp' => 'parent_nid', - 'title' => 'title', - 'type' => 'type', - 'child_nid' => 'child_nid', - 'child_vid' => 'child_vid', + 'timestamp' => 'quiz_qid', + 'title' => 'title', + 'type' => 'type', + 'question_nid' => 'question_nid', + 'question_vid' => 'question_vid', 'question_status' => 'question_status', - 'parent_nid' => 'timestamp', - 'parent_vid' => 'parent_vid', + 'quiz_qid' => 'timestamp', + 'quiz_vid' => 'quiz_vid', ); $handler->display->display_options['style_options']['default'] = 'title'; $handler->display->display_options['style_options']['info'] = array( - 'timestamp' => array( - 'sortable' => 0, + 'timestamp' => array( + 'sortable' => 0, 'separator' => '', ), - 'title' => array( - 'sortable' => 0, + 'title' => array( + 'sortable' => 0, 'separator' => '', ), - 'type' => array( - 'sortable' => 0, + 'type' => array( + 'sortable' => 0, 'separator' => '', ), - 'child_nid' => array( - 'sortable' => 0, + 'question_nid' => array( + 'sortable' => 0, 'separator' => '', ), - 'child_vid' => array( - 'sortable' => 0, + 'question_vid' => array( + 'sortable' => 0, 'separator' => '', ), 'question_status' => array( - 'sortable' => 0, + 'sortable' => 0, 'separator' => '', ), - 'parent_nid' => array( - 'sortable' => 0, + 'quiz_qid' => array( + 'sortable' => 0, 'separator' => '', ), - 'parent_vid' => array( - 'sortable' => 0, + 'quiz_vid' => array( + 'sortable' => 0, 'separator' => '', ), ); /* Relationship: Quiz Questions: Quiz Node VID */ -$handler->display->display_options['relationships']['parent_vid']['id'] = 'parent_vid'; -$handler->display->display_options['relationships']['parent_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['relationships']['parent_vid']['field'] = 'parent_vid'; -$handler->display->display_options['relationships']['parent_vid']['label'] = 'node'; -$handler->display->display_options['relationships']['parent_vid']['required'] = TRUE; +$handler->display->display_options['relationships']['quiz_vid']['id'] = 'quiz_vid'; +$handler->display->display_options['relationships']['quiz_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['relationships']['quiz_vid']['field'] = 'quiz_vid'; +$handler->display->display_options['relationships']['quiz_vid']['label'] = 'node'; +$handler->display->display_options['relationships']['quiz_vid']['required'] = TRUE; /* Relationship: Quiz Questions: Question Node VID */ -$handler->display->display_options['relationships']['child_vid']['id'] = 'child_vid'; -$handler->display->display_options['relationships']['child_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['relationships']['child_vid']['field'] = 'child_vid'; -$handler->display->display_options['relationships']['child_vid']['label'] = 'question node revision'; +$handler->display->display_options['relationships']['question_vid']['id'] = 'question_vid'; +$handler->display->display_options['relationships']['question_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['relationships']['question_vid']['field'] = 'question_vid'; +$handler->display->display_options['relationships']['question_vid']['label'] = 'question node revision'; /* Field: Quiz Questions: Quiz Node ID */ -$handler->display->display_options['fields']['parent_nid']['id'] = 'parent_nid'; -$handler->display->display_options['fields']['parent_nid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['fields']['parent_nid']['field'] = 'parent_nid'; -$handler->display->display_options['fields']['parent_nid']['separator'] = ''; +$handler->display->display_options['fields']['quiz_qid']['id'] = 'quiz_qid'; +$handler->display->display_options['fields']['quiz_qid']['table'] = 'quiz_relationship'; +$handler->display->display_options['fields']['quiz_qid']['field'] = 'quiz_qid'; +$handler->display->display_options['fields']['quiz_qid']['separator'] = ''; /* Field: Quiz Questions: Quiz Node VID */ -$handler->display->display_options['fields']['parent_vid']['id'] = 'parent_vid'; -$handler->display->display_options['fields']['parent_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['fields']['parent_vid']['field'] = 'parent_vid'; -$handler->display->display_options['fields']['parent_vid']['separator'] = ''; +$handler->display->display_options['fields']['quiz_vid']['id'] = 'quiz_vid'; +$handler->display->display_options['fields']['quiz_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['fields']['quiz_vid']['field'] = 'quiz_vid'; +$handler->display->display_options['fields']['quiz_vid']['separator'] = ''; /* Field: Content revision: Updated date */ $handler->display->display_options['fields']['timestamp']['id'] = 'timestamp'; $handler->display->display_options['fields']['timestamp']['table'] = 'node_revision'; $handler->display->display_options['fields']['timestamp']['field'] = 'timestamp'; -$handler->display->display_options['fields']['timestamp']['relationship'] = 'parent_vid'; +$handler->display->display_options['fields']['timestamp']['relationship'] = 'quiz_vid'; $handler->display->display_options['fields']['timestamp']['label'] = 'Quiz Created'; /* Field: Content revision: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node_revision'; $handler->display->display_options['fields']['title']['field'] = 'title'; -$handler->display->display_options['fields']['title']['relationship'] = 'child_vid'; +$handler->display->display_options['fields']['title']['relationship'] = 'question_vid'; $handler->display->display_options['fields']['title']['label'] = 'Question Title'; $handler->display->display_options['fields']['title']['link_to_node'] = TRUE; /* Field: Quiz Questions: Question Node ID */ -$handler->display->display_options['fields']['child_nid']['id'] = 'child_nid'; -$handler->display->display_options['fields']['child_nid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['fields']['child_nid']['field'] = 'child_nid'; -$handler->display->display_options['fields']['child_nid']['separator'] = ''; +$handler->display->display_options['fields']['question_nid']['id'] = 'question_nid'; +$handler->display->display_options['fields']['question_nid']['table'] = 'quiz_relationship'; +$handler->display->display_options['fields']['question_nid']['field'] = 'question_nid'; +$handler->display->display_options['fields']['question_nid']['separator'] = ''; /* Field: Quiz Questions: Question Node VID */ -$handler->display->display_options['fields']['child_vid']['id'] = 'child_vid'; -$handler->display->display_options['fields']['child_vid']['table'] = 'quiz_node_relationship'; -$handler->display->display_options['fields']['child_vid']['field'] = 'child_vid'; -$handler->display->display_options['fields']['child_vid']['separator'] = ''; +$handler->display->display_options['fields']['question_vid']['id'] = 'question_vid'; +$handler->display->display_options['fields']['question_vid']['table'] = 'quiz_relationship'; +$handler->display->display_options['fields']['question_vid']['field'] = 'question_vid'; +$handler->display->display_options['fields']['question_vid']['separator'] = ''; /* Field: Quiz Questions: Question Status */ $handler->display->display_options['fields']['question_status']['id'] = 'question_status'; -$handler->display->display_options['fields']['question_status']['table'] = 'quiz_node_relationship'; +$handler->display->display_options['fields']['question_status']['table'] = 'quiz_relationship'; $handler->display->display_options['fields']['question_status']['field'] = 'question_status'; /* Contextual filter: Quiz: Quiz Node VID */ $handler->display->display_options['arguments']['vid']['id'] = 'vid'; -$handler->display->display_options['arguments']['vid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['arguments']['vid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['arguments']['vid']['field'] = 'vid'; $handler->display->display_options['arguments']['vid']['exception']['title_enable'] = TRUE; $handler->display->display_options['arguments']['vid']['title_enable'] = TRUE; diff --git a/includes/views/defaults/quiz.view.inc b/includes/views/defaults/quiz.view.inc new file mode 100644 index 0000000..7c8b4f5 --- /dev/null +++ b/includes/views/defaults/quiz.view.inc @@ -0,0 +1,170 @@ +name = 'quiz'; +$view->description = ''; +$view->tag = 'default'; +$view->base_table = 'quiz_entity'; +$view->human_name = 'Quiz'; +$view->core = 7; +$view->api_version = '3.0'; +$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ + +/* Display: Master */ +$handler = $view->new_display('default', 'Master', 'default'); +$handler->display->display_options['title'] = 'Quiz'; +$handler->display->display_options['use_ajax'] = TRUE; +$handler->display->display_options['use_more_always'] = FALSE; +$handler->display->display_options['access']['type'] = 'perm'; +$handler->display->display_options['access']['perm'] = 'administer quiz configuration'; +$handler->display->display_options['cache']['type'] = 'none'; +$handler->display->display_options['query']['type'] = 'views_query'; +$handler->display->display_options['exposed_form']['type'] = 'basic'; +$handler->display->display_options['pager']['type'] = 'full'; +$handler->display->display_options['pager']['options']['items_per_page'] = '50'; +$handler->display->display_options['pager']['options']['offset'] = '0'; +$handler->display->display_options['pager']['options']['id'] = '0'; +$handler->display->display_options['pager']['options']['quantity'] = '9'; +$handler->display->display_options['pager']['options']['expose']['items_per_page'] = TRUE; +$handler->display->display_options['pager']['options']['expose']['items_per_page_options'] = '5, 10, 20, 40, 50, 75, 100'; +$handler->display->display_options['style_plugin'] = 'table'; +$handler->display->display_options['style_options']['columns'] = array( + 'url' => 'url', + 'title' => 'title', + 'name' => 'name', + 'type' => 'type', + 'changed' => 'changed', + 'created' => 'created', + 'view_node' => 'view_node', + 'delete_node' => 'view_node', + 'edit_node' => 'view_node', +); +$handler->display->display_options['style_options']['default'] = '-1'; +$handler->display->display_options['style_options']['info'] = array( + 'url' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'title' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'name' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'type' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'changed' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'created' => array( + 'sortable' => 0, + 'default_sort_order' => 'asc', + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'view_node' => array( + 'align' => '', + 'separator' => ' | ', + 'empty_column' => 0, + ), + 'delete_node' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), + 'edit_node' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), +); +/* Relationship: Quiz properties: Uid */ +$handler->display->display_options['relationships']['uid']['id'] = 'uid'; +$handler->display->display_options['relationships']['uid']['table'] = 'quiz_entity'; +$handler->display->display_options['relationships']['uid']['field'] = 'uid'; +$handler->display->display_options['relationships']['uid']['label'] = 'Author'; +/* Field: Quiz properties: URL */ +$handler->display->display_options['fields']['url']['id'] = 'url'; +$handler->display->display_options['fields']['url']['table'] = 'views_entity_quiz_entity'; +$handler->display->display_options['fields']['url']['field'] = 'url'; +$handler->display->display_options['fields']['url']['exclude'] = TRUE; +$handler->display->display_options['fields']['url']['display_as_link'] = FALSE; +$handler->display->display_options['fields']['url']['link_to_entity'] = 0; +/* Field: Quiz properties: Label */ +$handler->display->display_options['fields']['title']['id'] = 'title'; +$handler->display->display_options['fields']['title']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['title']['field'] = 'title'; +$handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE; +$handler->display->display_options['fields']['title']['alter']['path'] = '[url]'; +/* Field: User: Name */ +$handler->display->display_options['fields']['name']['id'] = 'name'; +$handler->display->display_options['fields']['name']['table'] = 'users'; +$handler->display->display_options['fields']['name']['field'] = 'name'; +$handler->display->display_options['fields']['name']['relationship'] = 'uid'; +/* Field: Quiz properties: Type */ +$handler->display->display_options['fields']['type']['id'] = 'type'; +$handler->display->display_options['fields']['type']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['type']['field'] = 'type'; +/* Field: Quiz properties: Changed */ +$handler->display->display_options['fields']['changed']['id'] = 'changed'; +$handler->display->display_options['fields']['changed']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['changed']['field'] = 'changed'; +/* Field: Quiz properties: Created */ +$handler->display->display_options['fields']['created']['id'] = 'created'; +$handler->display->display_options['fields']['created']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['created']['field'] = 'created'; +/* Field: Quiz properties: Link */ +$handler->display->display_options['fields']['view_node']['id'] = 'view_node'; +$handler->display->display_options['fields']['view_node']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['view_node']['field'] = 'view_node'; +/* Field: Quiz properties: Delete link */ +$handler->display->display_options['fields']['delete_node']['id'] = 'delete_node'; +$handler->display->display_options['fields']['delete_node']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['delete_node']['field'] = 'delete_node'; +/* Field: Quiz properties: Edit link */ +$handler->display->display_options['fields']['edit_node']['id'] = 'edit_node'; +$handler->display->display_options['fields']['edit_node']['table'] = 'quiz_entity'; +$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node'; +/* Filter criterion: Quiz properties: Type */ +$handler->display->display_options['filters']['type']['id'] = 'type'; +$handler->display->display_options['filters']['type']['table'] = 'quiz_entity'; +$handler->display->display_options['filters']['type']['field'] = 'type'; +$handler->display->display_options['filters']['type']['exposed'] = TRUE; +$handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op'; +$handler->display->display_options['filters']['type']['expose']['label'] = 'Quiz Type'; +$handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op'; +$handler->display->display_options['filters']['type']['expose']['identifier'] = 'type'; +/* Filter criterion: Quiz properties: Status */ +$handler->display->display_options['filters']['status']['id'] = 'status'; +$handler->display->display_options['filters']['status']['table'] = 'quiz_entity'; +$handler->display->display_options['filters']['status']['field'] = 'status'; +$handler->display->display_options['filters']['status']['operator'] = '>='; +$handler->display->display_options['filters']['status']['value']['value'] = '0'; + +/* Display: Page */ +$handler = $view->new_display('page', 'Page', 'page'); +$handler->display->display_options['path'] = 'admin/content/quiz'; +$handler->display->display_options['menu']['type'] = 'tab'; +$handler->display->display_options['menu']['title'] = 'Quiz'; +$handler->display->display_options['menu']['weight'] = '0'; +$handler->display->display_options['menu']['context'] = 0; +$handler->display->display_options['menu']['context_only_inline'] = 0; diff --git a/includes/views/defaults/quiz_by_author.view.inc b/includes/views/defaults/quiz_by_author.view.inc index 08a74cc..7e01f77 100644 --- a/includes/views/defaults/quiz_by_author.view.inc +++ b/includes/views/defaults/quiz_by_author.view.inc @@ -4,7 +4,7 @@ $view = new view(); $view->name = 'quiz_by_author'; $view->description = 'View of all the quizzes owned by a particular user (\'author\').'; $view->tag = 'quiz'; -$view->base_table = 'quiz_node_properties'; +$view->base_table = 'quiz_entity_revision'; $view->human_name = ''; $view->core = 0; $view->api_version = '3.0'; @@ -53,38 +53,38 @@ $handler->display->display_options['style_options']['info'] = array( ); /* Relationship: Quiz: Quiz Node NID */ $handler->display->display_options['relationships']['nid']['id'] = 'nid'; -$handler->display->display_options['relationships']['nid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['relationships']['nid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['relationships']['nid']['field'] = 'nid'; $handler->display->display_options['relationships']['nid']['required'] = TRUE; /* Field: Quiz: Quiz Node NID */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; -$handler->display->display_options['fields']['nid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['nid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['nid']['field'] = 'nid'; /* Field: Quiz: Quiz Node VID */ $handler->display->display_options['fields']['vid']['id'] = 'vid'; -$handler->display->display_options['fields']['vid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['vid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['vid']['field'] = 'vid'; /* Field: Quiz: Close time */ $handler->display->display_options['fields']['quiz_close']['id'] = 'quiz_close'; -$handler->display->display_options['fields']['quiz_close']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['quiz_close']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['quiz_close']['field'] = 'quiz_close'; $handler->display->display_options['fields']['quiz_close']['label'] = 'Quiz close time'; /* Field: Quiz: Open time */ $handler->display->display_options['fields']['quiz_open']['id'] = 'quiz_open'; -$handler->display->display_options['fields']['quiz_open']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['quiz_open']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['quiz_open']['field'] = 'quiz_open'; $handler->display->display_options['fields']['quiz_open']['label'] = 'Quiz open time'; /* Field: Quiz: Time limit */ $handler->display->display_options['fields']['time_limit']['id'] = 'time_limit'; -$handler->display->display_options['fields']['time_limit']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['time_limit']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['time_limit']['field'] = 'time_limit'; /* Field: Quiz: Allowed takes */ $handler->display->display_options['fields']['takes']['id'] = 'takes'; -$handler->display->display_options['fields']['takes']['table'] = 'quiz_node_properties'; +$handler->display->display_options['fields']['takes']['table'] = 'quiz_entity_revision'; $handler->display->display_options['fields']['takes']['field'] = 'takes'; /* Contextual filter: Quiz Results: User */ $handler->display->display_options['arguments']['uid']['id'] = 'uid'; -$handler->display->display_options['arguments']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['uid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['uid']['field'] = 'uid'; $handler->display->display_options['arguments']['uid']['default_action'] = 'not found'; $handler->display->display_options['arguments']['uid']['exception']['title_enable'] = TRUE; diff --git a/includes/views/defaults/quiz_by_taker.view.inc b/includes/views/defaults/quiz_by_taker.view.inc index 55d56e4..20cba18 100644 --- a/includes/views/defaults/quiz_by_taker.view.inc +++ b/includes/views/defaults/quiz_by_taker.view.inc @@ -1,9 +1,10 @@ name = 'quiz_by_taker'; $view->description = 'View of all the quizzes a user has taken'; $view->tag = 'quiz'; -$view->base_table = 'quiz_node_properties'; +$view->base_table = 'quiz_entity_revision'; $view->human_name = ''; $view->core = 0; $view->api_version = '3.0'; @@ -21,43 +22,43 @@ $handler->display->display_options['pager']['type'] = 'none'; $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['grouping'] = 'vid'; $handler->display->display_options['style_options']['columns'] = array( - 'time_end' => 'time_end', - 'nid' => 'nid', - 'vid' => 'vid', - 'time_start' => 'time_start', - 'score' => 'score', - 'uid' => 'uid', + 'time_end' => 'time_end', + 'nid' => 'nid', + 'vid' => 'vid', + 'time_start' => 'time_start', + 'score' => 'score', + 'uid' => 'uid', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( - 'time_end' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'nid' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'vid' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'time_start' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'score' => array( - 'sortable' => 0, - 'separator' => '', - ), - 'uid' => array( - 'sortable' => 0, - 'separator' => '', - ), + 'time_end' => array( + 'sortable' => 0, + 'separator' => '', + ), + 'nid' => array( + 'sortable' => 0, + 'separator' => '', + ), + 'vid' => array( + 'sortable' => 0, + 'separator' => '', + ), + 'time_start' => array( + 'sortable' => 0, + 'separator' => '', + ), + 'score' => array( + 'sortable' => 0, + 'separator' => '', + ), + 'uid' => array( + 'sortable' => 0, + 'separator' => '', + ), ); /* Relationship: Quiz Results: Quiz Node VID */ $handler->display->display_options['relationships']['vid']['id'] = 'vid'; -$handler->display->display_options['relationships']['vid']['table'] = 'quiz_node_results'; +$handler->display->display_options['relationships']['vid']['table'] = 'quiz_results'; $handler->display->display_options['relationships']['vid']['field'] = 'vid'; $handler->display->display_options['relationships']['vid']['label'] = 'quiz revision'; $handler->display->display_options['relationships']['vid']['required'] = TRUE; @@ -68,24 +69,24 @@ $handler->display->display_options['fields']['title']['field'] = 'title'; $handler->display->display_options['fields']['title']['relationship'] = 'vid'; /* Field: Quiz Results: Score */ $handler->display->display_options['fields']['score']['id'] = 'score'; -$handler->display->display_options['fields']['score']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['score']['table'] = 'quiz_results'; $handler->display->display_options['fields']['score']['field'] = 'score'; /* Field: Quiz Results: Quiz Start Time */ $handler->display->display_options['fields']['time_start']['id'] = 'time_start'; -$handler->display->display_options['fields']['time_start']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_start']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_start']['field'] = 'time_start'; $handler->display->display_options['fields']['time_start']['label'] = 'Quiz Start Time.'; /* Field: Quiz Results: Quiz End Time */ $handler->display->display_options['fields']['time_end']['id'] = 'time_end'; -$handler->display->display_options['fields']['time_end']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_end']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_end']['field'] = 'time_end'; /* Field: Quiz Results: Quiz State */ $handler->display->display_options['fields']['quiz_state']['id'] = 'quiz_state'; -$handler->display->display_options['fields']['quiz_state']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['quiz_state']['table'] = 'quiz_results'; $handler->display->display_options['fields']['quiz_state']['field'] = 'quiz_state'; /* Contextual filter: Quiz Results: User */ $handler->display->display_options['arguments']['uid']['id'] = 'uid'; -$handler->display->display_options['arguments']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['uid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['uid']['field'] = 'uid'; $handler->display->display_options['arguments']['uid']['default_action'] = 'not found'; $handler->display->display_options['arguments']['uid']['exception']['title_enable'] = TRUE; @@ -95,9 +96,10 @@ $handler->display->display_options['arguments']['uid']['default_argument_type'] $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary'; $handler->display->display_options['arguments']['uid']['specify_validation'] = TRUE; $handler->display->display_options['arguments']['uid']['allow_null'] = 1; + /* Filter criterion: Quiz: Quiz Version */ $handler->display->display_options['filters']['nid']['id'] = 'nid'; -$handler->display->display_options['filters']['nid']['table'] = 'quiz_node_properties'; +$handler->display->display_options['filters']['nid']['table'] = 'quiz_entity_revision'; $handler->display->display_options['filters']['nid']['field'] = 'nid'; $handler->display->display_options['filters']['nid']['group'] = '0'; $handler->display->display_options['filters']['nid']['expose']['operator'] = FALSE; diff --git a/includes/views/defaults/quiz_results.view.inc b/includes/views/defaults/quiz_results.view.inc index de40cc8..48386ff 100644 --- a/includes/views/defaults/quiz_results.view.inc +++ b/includes/views/defaults/quiz_results.view.inc @@ -4,7 +4,7 @@ $view = new view(); $view->name = 'quiz_results'; $view->description = ''; $view->tag = 'default'; -$view->base_table = 'quiz_node_results'; +$view->base_table = 'quiz_results'; $view->human_name = 'quiz_results'; $view->core = 7; $view->api_version = '3.0'; @@ -30,11 +30,11 @@ $handler->display->display_options['empty']['area']['content'] = 'There are no a $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; /* Relationship: Quiz result: Uid */ $handler->display->display_options['relationships']['uid']['id'] = 'uid'; -$handler->display->display_options['relationships']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['relationships']['uid']['table'] = 'quiz_results'; $handler->display->display_options['relationships']['uid']['field'] = 'uid'; /* Field: Bulk operations: Quiz result */ $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; -$handler->display->display_options['fields']['views_bulk_operations']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['views_bulk_operations']['table'] = 'quiz_results'; $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations'; $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '1'; $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1; @@ -102,32 +102,32 @@ $handler->display->display_options['fields']['name']['label'] = 'Username'; $handler->display->display_options['fields']['name']['link_to_user'] = FALSE; /* Field: Quiz result: Date started */ $handler->display->display_options['fields']['time_start']['id'] = 'time_start'; -$handler->display->display_options['fields']['time_start']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_start']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_start']['field'] = 'time_start'; $handler->display->display_options['fields']['time_start']['date_format'] = 'short'; /* Field: Quiz result: Date finished */ $handler->display->display_options['fields']['time_end']['id'] = 'time_end'; -$handler->display->display_options['fields']['time_end']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_end']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_end']['field'] = 'time_end'; $handler->display->display_options['fields']['time_end']['date_format'] = 'short'; /* Field: Quiz result: Score */ $handler->display->display_options['fields']['score']['id'] = 'score'; -$handler->display->display_options['fields']['score']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['score']['table'] = 'quiz_results'; $handler->display->display_options['fields']['score']['field'] = 'score'; /* Field: Quiz result: Evaluated */ $handler->display->display_options['fields']['is_evaluated']['id'] = 'is_evaluated'; -$handler->display->display_options['fields']['is_evaluated']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['is_evaluated']['table'] = 'quiz_results'; $handler->display->display_options['fields']['is_evaluated']['field'] = 'is_evaluated'; $handler->display->display_options['fields']['is_evaluated']['not'] = 0; /* Field: Quiz result: Nid */ $handler->display->display_options['fields']['nid']['id'] = 'nid'; -$handler->display->display_options['fields']['nid']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['nid']['table'] = 'quiz_results'; $handler->display->display_options['fields']['nid']['field'] = 'nid'; $handler->display->display_options['fields']['nid']['exclude'] = TRUE; $handler->display->display_options['fields']['nid']['separator'] = ''; /* Field: Quiz result: Quiz result ID */ $handler->display->display_options['fields']['result_id']['id'] = 'result_id'; -$handler->display->display_options['fields']['result_id']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['result_id']['table'] = 'quiz_results'; $handler->display->display_options['fields']['result_id']['field'] = 'result_id'; $handler->display->display_options['fields']['result_id']['exclude'] = TRUE; /* Field: Global: Custom text */ @@ -140,7 +140,7 @@ $handler->display->display_options['fields']['nothing']['alter']['make_link'] = $handler->display->display_options['fields']['nothing']['alter']['path'] = 'node/[nid]/quiz/results/[result_id]/view'; /* Contextual filter: Quiz result: Nid */ $handler->display->display_options['arguments']['nid']['id'] = 'nid'; -$handler->display->display_options['arguments']['nid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['nid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['nid']['field'] = 'nid'; $handler->display->display_options['arguments']['nid']['default_action'] = 'access denied'; $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'fixed'; diff --git a/includes/views/defaults/quiz_user_results.view.inc b/includes/views/defaults/quiz_user_results.view.inc index 63aca55..5fd69b0 100644 --- a/includes/views/defaults/quiz_user_results.view.inc +++ b/includes/views/defaults/quiz_user_results.view.inc @@ -4,7 +4,7 @@ $view = new view(); $view->name = 'quiz_user_results'; $view->description = ''; $view->tag = 'default'; -$view->base_table = 'quiz_node_results'; +$view->base_table = 'quiz_results'; $view->human_name = 'quiz_results'; $view->core = 7; $view->api_version = '3.0'; @@ -31,31 +31,25 @@ $handler->display->display_options['empty']['area']['content'] = 'There are no a $handler->display->display_options['empty']['area']['format'] = 'filtered_html'; /* Relationship: Quiz result: Uid */ $handler->display->display_options['relationships']['uid']['id'] = 'uid'; -$handler->display->display_options['relationships']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['relationships']['uid']['table'] = 'quiz_results'; $handler->display->display_options['relationships']['uid']['field'] = 'uid'; /* Field: Quiz result: Date started */ $handler->display->display_options['fields']['time_start']['id'] = 'time_start'; -$handler->display->display_options['fields']['time_start']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_start']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_start']['field'] = 'time_start'; $handler->display->display_options['fields']['time_start']['date_format'] = 'short'; /* Field: Quiz result: Date finished */ $handler->display->display_options['fields']['time_end']['id'] = 'time_end'; -$handler->display->display_options['fields']['time_end']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['time_end']['table'] = 'quiz_results'; $handler->display->display_options['fields']['time_end']['field'] = 'time_end'; $handler->display->display_options['fields']['time_end']['date_format'] = 'short'; /* Field: Quiz result: Score */ $handler->display->display_options['fields']['score']['id'] = 'score'; -$handler->display->display_options['fields']['score']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['score']['table'] = 'quiz_results'; $handler->display->display_options['fields']['score']['field'] = 'score'; -/* Field: Quiz result: Nid */ -$handler->display->display_options['fields']['nid']['id'] = 'nid'; -$handler->display->display_options['fields']['nid']['table'] = 'quiz_node_results'; -$handler->display->display_options['fields']['nid']['field'] = 'nid'; -$handler->display->display_options['fields']['nid']['exclude'] = TRUE; -$handler->display->display_options['fields']['nid']['separator'] = ''; /* Field: Quiz result: Quiz result ID */ $handler->display->display_options['fields']['result_id']['id'] = 'result_id'; -$handler->display->display_options['fields']['result_id']['table'] = 'quiz_node_results'; +$handler->display->display_options['fields']['result_id']['table'] = 'quiz_results'; $handler->display->display_options['fields']['result_id']['field'] = 'result_id'; $handler->display->display_options['fields']['result_id']['exclude'] = TRUE; /* Field: Global: Custom text */ @@ -65,10 +59,10 @@ $handler->display->display_options['fields']['nothing']['field'] = 'nothing'; $handler->display->display_options['fields']['nothing']['label'] = 'Operations'; $handler->display->display_options['fields']['nothing']['alter']['text'] = 'View'; $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE; -$handler->display->display_options['fields']['nothing']['alter']['path'] = 'node/[nid]/quiz-results/[result_id]/view'; -/* Contextual filter: Quiz result: Nid */ +$handler->display->display_options['fields']['nothing']['alter']['path'] = 'quiz-result/[result_id]'; +/* Contextual filter: Broken/missing handler */ $handler->display->display_options['arguments']['nid']['id'] = 'nid'; -$handler->display->display_options['arguments']['nid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['nid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['nid']['field'] = 'nid'; $handler->display->display_options['arguments']['nid']['default_action'] = 'access denied'; $handler->display->display_options['arguments']['nid']['default_argument_type'] = 'fixed'; @@ -78,13 +72,13 @@ $handler->display->display_options['arguments']['nid']['summary_options']['items $handler->display->display_options['arguments']['nid']['specify_validation'] = TRUE; $handler->display->display_options['arguments']['nid']['validate']['type'] = 'node'; $handler->display->display_options['arguments']['nid']['validate_options']['types'] = array( - 'quiz' => 'quiz', + 'quiz' => 'quiz', ); $handler->display->display_options['arguments']['nid']['validate_options']['access'] = TRUE; $handler->display->display_options['arguments']['nid']['validate_options']['access_op'] = 'update'; /* Contextual filter: Quiz result: Uid */ $handler->display->display_options['arguments']['uid']['id'] = 'uid'; -$handler->display->display_options['arguments']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['uid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['uid']['field'] = 'uid'; $handler->display->display_options['arguments']['uid']['default_action'] = 'default'; $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'current_user'; @@ -95,13 +89,13 @@ $handler->display->display_options['arguments']['uid']['specify_validation'] = T $handler->display->display_options['arguments']['uid']['validate']['type'] = 'user'; /* Filter criterion: Quiz result: Evaluated */ $handler->display->display_options['filters']['is_evaluated']['id'] = 'is_evaluated'; -$handler->display->display_options['filters']['is_evaluated']['table'] = 'quiz_node_results'; +$handler->display->display_options['filters']['is_evaluated']['table'] = 'quiz_results'; $handler->display->display_options['filters']['is_evaluated']['field'] = 'is_evaluated'; $handler->display->display_options['filters']['is_evaluated']['value'] = '1'; /* Display: Page */ $handler = $view->new_display('page', 'Page', 'page'); -$handler->display->display_options['path'] = 'node/%/quiz-results'; +$handler->display->display_options['path'] = 'quiz/%/quiz-results'; $handler->display->display_options['menu']['type'] = 'tab'; $handler->display->display_options['menu']['title'] = 'My results'; $handler->display->display_options['menu']['weight'] = '0'; @@ -116,7 +110,7 @@ $handler = $view->new_display('page', 'Page', 'page_1'); $handler->display->display_options['defaults']['arguments'] = FALSE; /* Contextual filter: Quiz result: Uid */ $handler->display->display_options['arguments']['uid']['id'] = 'uid'; -$handler->display->display_options['arguments']['uid']['table'] = 'quiz_node_results'; +$handler->display->display_options['arguments']['uid']['table'] = 'quiz_results'; $handler->display->display_options['arguments']['uid']['field'] = 'uid'; $handler->display->display_options['arguments']['uid']['default_action'] = 'default'; $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'current_user'; diff --git a/includes/views/handlers/quiz_views_handler_argument_quiz_nid.inc b/includes/views/handlers/quiz_views_handler_argument_quiz_nid.inc deleted file mode 100644 index 179e4a1..0000000 --- a/includes/views/handlers/quiz_views_handler_argument_quiz_nid.inc +++ /dev/null @@ -1,158 +0,0 @@ -nid_field = $this->definition['nid field']; - $this->vid_field = isset($this->definition['vid field']) ? $this->definition['vid field'] : 'vid'; - } - - function option_definition() { - $options = parent::option_definition(); - - $options['which_vid'] = array('default' => 'latest'); - - return $options; - } - - function options_form(&$form, &$form_state) { - parent::options_form($form, $form_state); - // Set weighting so that our element can sanely ordered - $form['title']['#weight'] = -2; - // $form['default_action']['#weight'] = -3; - // $form['wildcard']['#weight'] = -4; - // $form['wildcard_substitution']['#weight'] = -4; - $form['which_vid'] = array( - '#type' => 'select', - '#title' => t('Quiz revision(s) to use'), - '#options' => array( - 'latest' => t('Latest: most recent version of the quiz ONLY.'), - 'initial' => t('Initial: original version of the quiz ONLY.'), - 'all' => t('All: ALL versions of the quiz.') - ), - '#description' => t('The validator will transform the incoming quiz node id(s) into one or more quiz node revisions, depending on your selection.'), - '#default_value' => $this->options['which_vid'], - '#weight' => -1, - ); - } - - function title_query() { - $titles = array(); - - $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.vid IN (:vids)", array(':vids' => implode(', ', $this->corresponding_vids))); - while ($term = $result->fetch()) { - $titles[] = check_plain($term->title); - } - return $titles; - } - - /** - * Override the default behavior of query() to introduce the medial step of - * retrieving vids from the provided nids. - */ - function query($group_by = FALSE) { - $this->ensure_my_table(); - $this->break_phrase(); - - // Do subselect to get relevant vids, then add where clause - $this->subselect_vids(); - $this->query->add_where(0, "$this->table_alias.$this->nid_field", $this->corresponding_vids); - } - - /** - * Set up the argument with the vids extracted from nids. - * - * Needs to be done here, because this is the earliest stage at which we can - * guarantee the contents of $this->argument to be available. - * - * @param string $arg - * The argument, as delivered in the URL. - */ - function set_argument($arg) { - $this->argument = $arg; - if ($this->validate_arg($arg)) { - $this->break_phrase(); - $this->subselect_vids(); - return TRUE; - } - return FALSE; - } - - function break_phrase() { - if (!$this->phrase_broken) { - // Handle multiple argument inputs - if (!empty($this->options['break_phrase'])) { - views_break_phrase($this->argument, $this); - } - else { - $this->value = array($this->argument); - } - $this->phrase_broken = TRUE; - } - } - - /** - * Helper method to retrieve the vid(s) the final view query should actually - * be run against. - * - * Would be done in pre_query(), but $this->argument is not yet available at - * that time. So, called from set_argument(). - */ - function subselect_vids() { - $query = db_select('quiz_node_properties', 'qnp'); - if (count($this->value) > 1) { - // Guaranteed to produce multiple values; therefore may need the group by - $use_group_by = TRUE; - $operator = empty($this->options['not']) ? 'IN' : 'NOT IN'; - $query->condition('nid', $this->value, $operator); - } - else { - // Multiple values only possible with a NOT; only then do we need group by - $use_group_by = !empty($this->options['not']); - $operator = empty($this->options['not']) ? '=' : '!='; - $query->condition('nid', reset($this->value), $operator); - } - - switch ($this->options['which_vid']) { - case 'initial': - // SQL operation for getting the initial vids based on view config settings - $query->addExpression('MIN(vid)', 'vid'); - break; - case 'latest': - // SQL operation for getting the latest vids based on view config settings - $query->addExpression('MAX(vid)', 'vid'); - break; - default: - // Get them all - $query->addField('qnp', 'vid'); - break; - } - if ($use_group_by) { - $query->groupBy('nid'); - } - $result = $query->execute(); - - $this->nid_field = $this->vid_field; - - $this->corresponding_vids = array(); - foreach ($result as $item) { - $this->corresponding_vids[] = $item->vid; - } - return (count($this->corresponding_vids) > 1); - } -} \ No newline at end of file diff --git a/includes/views/handlers/quiz_views_handler_argument_quiz_qid.inc b/includes/views/handlers/quiz_views_handler_argument_quiz_qid.inc new file mode 100644 index 0000000..b5a3d98 --- /dev/null +++ b/includes/views/handlers/quiz_views_handler_argument_quiz_qid.inc @@ -0,0 +1,160 @@ +nid_field = $this->definition['nid field']; + $this->vid_field = isset($this->definition['vid field']) ? $this->definition['vid field'] : 'vid'; + } + + function option_definition() { + $options = parent::option_definition(); + + $options['which_vid'] = array('default' => 'latest'); + + return $options; + } + + function options_form(&$form, &$form_state) { + parent::options_form($form, $form_state); + // Set weighting so that our element can sanely ordered + $form['title']['#weight'] = -2; + // $form['default_action']['#weight'] = -3; + // $form['wildcard']['#weight'] = -4; + // $form['wildcard_substitution']['#weight'] = -4; + $form['which_vid'] = array( + '#type' => 'select', + '#title' => t('Quiz revision(s) to use'), + '#options' => array( + 'latest' => t('Latest: most recent version of the quiz ONLY.'), + 'initial' => t('Initial: original version of the quiz ONLY.'), + 'all' => t('All: ALL versions of the quiz.') + ), + '#description' => t('The validator will transform the incoming quiz entity id(s) into one or more quiz entity revisions, depending on your selection.'), + '#default_value' => $this->options['which_vid'], + '#weight' => -1, + ); + } + + function title_query() { + $titles = array(); + + $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.vid IN (:vids)", array(':vids' => implode(', ', $this->corresponding_vids))); + while ($term = $result->fetch()) { + $titles[] = check_plain($term->title); + } + return $titles; + } + + /** + * Override the default behavior of query() to introduce the medial step of + * retrieving vids from the provided nids. + */ + function query($group_by = FALSE) { + $this->ensure_my_table(); + $this->break_phrase(); + + // Do subselect to get relevant vids, then add where clause + $this->subselect_vids(); + $this->query->add_where(0, "$this->table_alias.$this->nid_field", $this->corresponding_vids); + } + + /** + * Set up the argument with the vids extracted from nids. + * + * Needs to be done here, because this is the earliest stage at which we can + * guarantee the contents of $this->argument to be available. + * + * @param string $arg + * The argument, as delivered in the URL. + */ + function set_argument($arg) { + $this->argument = $arg; + if ($this->validate_arg($arg)) { + $this->break_phrase(); + $this->subselect_vids(); + return TRUE; + } + return FALSE; + } + + function break_phrase() { + if (!$this->phrase_broken) { + // Handle multiple argument inputs + if (!empty($this->options['break_phrase'])) { + views_break_phrase($this->argument, $this); + } + else { + $this->value = array($this->argument); + } + $this->phrase_broken = TRUE; + } + } + + /** + * Helper method to retrieve the vid(s) the final view query should actually + * be run against. + * + * Would be done in pre_query(), but $this->argument is not yet available at + * that time. So, called from set_argument(). + */ + function subselect_vids() { + $query = db_select('quiz_entity_revision', 'qnp'); + if (count($this->value) > 1) { + // Guaranteed to produce multiple values; therefore may need the group by + $use_group_by = TRUE; + $operator = empty($this->options['not']) ? 'IN' : 'NOT IN'; + $query->condition('quiz_qid', $this->value, $operator); + } + else { + // Multiple values only possible with a NOT; only then do we need group by + $use_group_by = !empty($this->options['not']); + $operator = empty($this->options['not']) ? '=' : '!='; + $query->condition('quiz_qid', reset($this->value), $operator); + } + + switch ($this->options['which_vid']) { + case 'initial': + // SQL operation for getting the initial vids based on view config settings + $query->addExpression('MIN(vid)', 'vid'); + break; + case 'latest': + // SQL operation for getting the latest vids based on view config settings + $query->addExpression('MAX(vid)', 'vid'); + break; + default: + // Get them all + $query->addField('qnp', 'vid'); + break; + } + if ($use_group_by) { + $query->groupBy('quiz_qid'); + } + $result = $query->execute(); + + $this->nid_field = $this->vid_field; + + $this->corresponding_vids = array(); + foreach ($result as $item) { + $this->corresponding_vids[] = $item->vid; + } + return (count($this->corresponding_vids) > 1); + } + +} diff --git a/includes/views/handlers/quiz_views_handler_field_node_link_take.inc b/includes/views/handlers/quiz_views_handler_field_node_link_take.inc index e095e77..54630fe 100644 --- a/includes/views/handlers/quiz_views_handler_field_node_link_take.inc +++ b/includes/views/handlers/quiz_views_handler_field_node_link_take.inc @@ -6,7 +6,7 @@ */ /** - * Field handler to present a link to take a quiz node. + * Field handler to present a link to take a quiz entity. * * @ingroup views_field_handlers */ diff --git a/includes/views/handlers/quiz_views_handler_field_number_questions.inc b/includes/views/handlers/quiz_views_handler_field_number_questions.inc index c57ccc4..98b7c89 100644 --- a/includes/views/handlers/quiz_views_handler_field_number_questions.inc +++ b/includes/views/handlers/quiz_views_handler_field_number_questions.inc @@ -10,29 +10,29 @@ class quiz_views_handler_field_number_questions extends views_handler_field { function option_definition() { $options = parent::option_definition(); $options['include_random'] = array( - 'default' => TRUE, + 'default' => TRUE, ); } function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); $form['include_random'] = array( - '#type' => 'checkbox', - '#title' => t('Include random questions?'), - '#description' => t('Whether or not questions set to "random" should be included in the count.'), - '#default_value' => $this->options['include_random'], + '#type' => 'checkbox', + '#title' => t('Include random questions?'), + '#description' => t('Whether or not questions set to "random" should be included in the count.'), + '#default_value' => $this->options['include_random'], ); } function query() { $this->ensure_my_table(); $this->field_alias = 'question_count'; - $formula = "COUNT($this->table_alias.child_vid)"; + $formula = "COUNT($this->table_alias.question_vid)"; if ($this->options['include_random']) { - $properties_alias = $this->query->ensure_table('quiz_node_properties'); - - $formula .= " + (SELECT number_of_random_questions FROM {quiz_node_properties} WHERE vid = $this->table_alias.parent_vid)"; + $properties_alias = $this->query->ensure_table('quiz_entity_revision'); + $formula .= " + (SELECT number_of_random_questions FROM {quiz_entity_revision} WHERE vid = $this->table_alias.quiz_vid)"; } $this->query->add_field(NULL, "$formula", $this->field_alias); } + } diff --git a/includes/views/handlers/quiz_views_handler_field_time.inc b/includes/views/handlers/quiz_views_handler_field_time.inc index 2e36528..ddf7340 100644 --- a/includes/views/handlers/quiz_views_handler_field_time.inc +++ b/includes/views/handlers/quiz_views_handler_field_time.inc @@ -1,12 +1,14 @@ {$this->field_alias}; - return _quiz_format_duration($value); + return quiz()->formatDuration($values->{$this->field_alias}); } + } diff --git a/includes/views/handlers/quiz_views_handler_filter_quiz_nid.inc b/includes/views/handlers/quiz_views_handler_filter_quiz_nid.inc deleted file mode 100644 index a1a426c..0000000 --- a/includes/views/handlers/quiz_views_handler_filter_quiz_nid.inc +++ /dev/null @@ -1,142 +0,0 @@ - array( - 'secondary_group_by' => 'nid', - 'secondary_table' => 'quiz_node_results', - 'secondary_vid' => 'vid', - 'secondary_nid' => 'nid', - ), - 'results' => array( - 'secondary_group_by' => 'uid', - 'secondary_table' => 'quiz_node_results', - 'secondary_vid' => 'vid', - 'secondary_nid' => 'nid', - ), - 'questions' => array( - 'secondary_group_by' => 'child_nid', - 'secondary_table' => 'quiz_node_relationship', - 'secondary_vid' => 'parent_vid', - 'secondary_nid' => 'parent_nid', - ), - ); - - function construct() { - parent::construct(); - $this->vid_field = !empty($this->definition['vid field']) ? $this->definition['vid field'] : 'vid'; - if (!empty($this->definition['group by'])) { - $this->group_by = $this->definition['group by']; - } - if (!empty($this->definition['secondary group by'])) { - $this->secondary_group_by = $this->definition['secondary group by']; - } - } - - function can_expose() { - return FALSE; - } - - function option_definition() { - $options = parent::option_definition(); - - $options['which_vid'] = array('default' => 'latest'); - $options['secondary'] = array('default' => 'none'); - - return $options; - } - - function options_form(&$form, &$form_state) { - parent::options_form($form, $form_state); - $form['which_vid'] = array( - '#type' => 'select', - '#title' => t('Quiz revision(s) to use'), - '#options' => array( - 'latest' => t('Latest: most recent version of the quiz ONLY.'), - 'initial' => t('Initial: original version of the quiz ONLY.'), - // 'all' => t('All: ALL versions of the quiz.') - ), - '#description' => t('The filter will limit score results for a particular quiz node id(s) into one or more quiz node revision ids, depending on your selection.'), - '#default_value' => $this->options['which_vid'], - ); - - $tables = array('none' => t('None')); - $tables['results'] = t('Use Quiz Results'); - $tables['questions'] = t('Use Quiz Questions'); - $form['secondary'] = array( - '#type' => 'radios', - '#title' => t('Secondary Grouping'), - '#options' => $tables, - '#default_value' => $this->options['secondary'], - '#description' => t('If you are looking to generate a list of either quiz questions or quiz results, you must select the appropriate option from this list.'), - ); - } - - function value_submit($form, &$form_state) { - $form_state['values']['options']['secondaries'] = $this->secondary_tables[$form_state['values']['options']['secondary']]; - } - - /** - * Override the default behavior of query() to introduce the medial step of - * retrieving vids from the provided nids. - */ - function query() { - $this->ensure_my_table(); - - foreach ($this->options['secondaries'] as $key => $value) { - if (!is_null($value)) { - $this->$key = $value; - } - } - - $this->group_by_table = !empty($this->definition['group by table']) ? - $this->query->ensure_table($this->definition['group by table']) : - $this->table_alias; - // $this->query->add_groupby("$this->group_by_table.$this->group_by"); - $this->query->add_groupby("$this->table_alias.$this->field"); - $this->query->add_groupby("$this->table_alias.$this->vid_field"); - - // if (!empty($this->secondary_group_by) || !empty($this->options['secondary_group_by'])) { - if (!empty($this->secondary_group_by)) { - $this->secondary_table_alias = $this->query->ensure_table($this->secondary_table); - $this->query->add_groupby("$this->secondary_table_alias.$this->secondary_group_by"); - } - $this->query->add_where(0, "$this->secondary_table_alias.$this->secondary_vid", $this->subselect()); - } - - /** - * Helper method to retrieve the vid(s) the final view query should actually - * be run against. - * - * Would be done in pre_query(), but $this->argument is not yet available at - * that time. So, called from set_argument(). - */ - function subselect() { - $operation = ($this->options['which_vid'] == 'initial' ? 'MIN' : 'MAX'); - $subalias = $this->secondary_table_alias . '__subselect'; - $subselect = "SELECT $operation($subalias.$this->secondary_vid) FROM "; - $subselect .= '{' . $this->secondary_table . "} $subalias WHERE "; - $subselect .= "$subalias.$this->secondary_group_by = $this->secondary_table_alias.$this->secondary_group_by AND "; - $subselect .= "$subalias.$this->secondary_nid = $this->secondary_table_alias.$this->secondary_nid"; - return $subselect; - - } -} diff --git a/includes/views/handlers/quiz_views_handler_filter_quiz_qid.inc b/includes/views/handlers/quiz_views_handler_filter_quiz_qid.inc new file mode 100644 index 0000000..96da482 --- /dev/null +++ b/includes/views/handlers/quiz_views_handler_filter_quiz_qid.inc @@ -0,0 +1,143 @@ + array( + 'secondary_group_by' => 'nid', + 'secondary_table' => 'quiz_results', + 'secondary_vid' => 'vid', + 'secondary_nid' => 'nid', + ), + 'results' => array( + 'secondary_group_by' => 'uid', + 'secondary_table' => 'quiz_results', + 'secondary_vid' => 'vid', + 'secondary_nid' => 'nid', + ), + 'questions' => array( + 'secondary_group_by' => 'question_nid', + 'secondary_table' => 'quiz_relationship', + 'secondary_vid' => 'quiz_vid', + 'secondary_nid' => 'quiz_qid', + ), + ); + + function construct() { + parent::construct(); + $this->vid_field = !empty($this->definition['vid field']) ? $this->definition['vid field'] : 'vid'; + if (!empty($this->definition['group by'])) { + $this->group_by = $this->definition['group by']; + } + if (!empty($this->definition['secondary group by'])) { + $this->secondary_group_by = $this->definition['secondary group by']; + } + } + + function can_expose() { + return FALSE; + } + + function option_definition() { + $options = parent::option_definition(); + + $options['which_vid'] = array('default' => 'latest'); + $options['secondary'] = array('default' => 'none'); + + return $options; + } + + function options_form(&$form, &$form_state) { + parent::options_form($form, $form_state); + $form['which_vid'] = array( + '#type' => 'select', + '#title' => t('Quiz revision(s) to use'), + '#options' => array( + 'latest' => t('Latest: most recent version of the quiz ONLY.'), + 'initial' => t('Initial: original version of the quiz ONLY.'), + // 'all' => t('All: ALL versions of the quiz.') + ), + '#description' => t('The filter will limit score results for a particular quiz entity id(s) into one or more quiz entity revision ids, depending on your selection.'), + '#default_value' => $this->options['which_vid'], + ); + + $tables = array('none' => t('None')); + $tables['results'] = t('Use Quiz Results'); + $tables['questions'] = t('Use Quiz Questions'); + $form['secondary'] = array( + '#type' => 'radios', + '#title' => t('Secondary Grouping'), + '#options' => $tables, + '#default_value' => $this->options['secondary'], + '#description' => t('If you are looking to generate a list of either quiz questions or quiz results, you must select the appropriate option from this list.'), + ); + } + + function value_submit($form, &$form_state) { + $form_state['values']['options']['secondaries'] = $this->secondary_tables[$form_state['values']['options']['secondary']]; + } + + /** + * Override the default behavior of query() to introduce the medial step of + * retrieving vids from the provided nids. + */ + function query() { + $this->ensure_my_table(); + + foreach ($this->options['secondaries'] as $key => $value) { + if (!is_null($value)) { + $this->$key = $value; + } + } + + $this->group_by_table = !empty($this->definition['group by table']) ? + $this->query->ensure_table($this->definition['group by table']) : + $this->table_alias; + // $this->query->add_groupby("$this->group_by_table.$this->group_by"); + $this->query->add_groupby("$this->table_alias.$this->field"); + $this->query->add_groupby("$this->table_alias.$this->vid_field"); + + // if (!empty($this->secondary_group_by) || !empty($this->options['secondary_group_by'])) { + if (!empty($this->secondary_group_by)) { + $this->secondary_table_alias = $this->query->ensure_table($this->secondary_table); + $this->query->add_groupby("$this->secondary_table_alias.$this->secondary_group_by"); + } + $this->query->add_where(0, "$this->secondary_table_alias.$this->secondary_vid", $this->subselect()); + } + + /** + * Helper method to retrieve the vid(s) the final view query should actually + * be run against. + * + * Would be done in pre_query(), but $this->argument is not yet available at + * that time. So, called from set_argument(). + */ + function subselect() { + $operation = ($this->options['which_vid'] == 'initial' ? 'MIN' : 'MAX'); + $subalias = $this->secondary_table_alias . '__subselect'; + $subselect = "SELECT $operation($subalias.$this->secondary_vid) FROM "; + $subselect .= '{' . $this->secondary_table . "} $subalias WHERE "; + $subselect .= "$subalias.$this->secondary_group_by = $this->secondary_table_alias.$this->secondary_group_by AND "; + $subselect .= "$subalias.$this->secondary_nid = $this->secondary_table_alias.$this->secondary_nid"; + return $subselect; + } + +} diff --git a/includes/views/handlers/quiz_views_handler_relationship_quiz_nid.inc b/includes/views/handlers/quiz_views_handler_relationship_quiz_nid.inc deleted file mode 100644 index 7ed06b6..0000000 --- a/includes/views/handlers/quiz_views_handler_relationship_quiz_nid.inc +++ /dev/null @@ -1,10 +0,0 @@ - array( - 'path' => QUIZ_VIEWS_DIR . '/handlers', - ), - 'handlers' => array( - // Fields - 'quiz_views_handler_field_takes' => array( - 'parent' => 'views_handler_field', + 'info' => array('path' => QUIZ_VIEWS_DIR . '/handlers'), + 'handlers' => array( + // Fields + 'quiz_views_handler_field_takes' => array( + 'parent' => 'views_handler_field', + ), + 'quiz_views_handler_field_node_link_take' => array( + 'parent' => 'views_handler_field_node_link', + ), + 'quiz_views_handler_field_time' => array( + 'parent' => 'views_handler_field', + ), + 'quiz_views_handler_field_question_status' => array( + 'parent' => 'views_handler_field', + ), + 'quiz_views_handler_field_user_quiz_state' => array( + 'parent' => 'views_handler_field', + ), + 'quiz_views_handler_field_score_aggregate' => array( + 'parent' => 'views_handler_field_numeric', + ), + 'quiz_views_handler_field_number_questions' => array( + 'parent' => 'views_handler_field', + ), + // Filters + 'quiz_views_handler_filter_question_status' => array( + 'parent' => 'views_handler_filter_in_operator', + ), + 'quiz_views_handler_filter_quiz_qid' => array( + 'parent' => 'views_handler_filter', + ), + 'quiz_views_handler_filter_user_quiz_state' => array( + 'parent' => 'views_handler_filter', + ), + 'quiz_views_handler_filter_user_nullable' => array( + 'parent' => 'views_handler_filter', + ), + // Relationships + 'quiz_views_handler_relationship_vid_from_nid' => array( + 'parent' => 'views_handler_relationship', + ), + // Arguments + 'quiz_views_handler_argument_quiz_qid' => array( + 'parent' => 'views_handler_argument_numeric', + ), + 'quiz_views_handler_argument_user_uid_nullable' => array( + 'parent' => 'views_handler_argument_user_uid', + ), + // Filters + 'quiz_views_handler_filter_quiz_question_type' => array( + 'parent' => 'views_handler_filter_node_type', + ), + 'quiz_views_handler_filter_quiz_question' => array( + 'parent' => 'views_handler_filter_boolean_operator', + ), ), - 'quiz_views_handler_field_node_link_take' => array( - 'parent' => 'views_handler_field_node_link', - ), - 'quiz_views_handler_field_time' => array( - 'parent' => 'views_handler_field', - ), - 'quiz_views_handler_field_question_status' => array( - 'parent' => 'views_handler_field', - ), - 'quiz_views_handler_field_user_quiz_state' => array( - 'parent' => 'views_handler_field', - ), - 'quiz_views_handler_field_score_aggregate' => array( - 'parent' => 'views_handler_field_numeric', - ), - 'quiz_views_handler_field_number_questions' => array( - 'parent' => 'views_handler_field', - ), - // Filters - 'quiz_views_handler_filter_question_status' => array( - 'parent' => 'views_handler_filter_in_operator', - ), - 'quiz_views_handler_filter_quiz_nid' => array( - 'parent' => 'views_handler_filter', - ), - 'quiz_views_handler_filter_user_quiz_state' => array( - 'parent' => 'views_handler_filter', - ), - 'quiz_views_handler_filter_user_nullable' => array( - 'parent' => 'views_handler_filter', - ), - // Relationships - 'quiz_views_handler_relationship_vid_from_nid' => array( - 'parent' => 'views_handler_relationship', - ), - // Arguments - 'quiz_views_handler_argument_quiz_nid' => array( - 'parent' => 'views_handler_argument_numeric', - ), - 'quiz_views_handler_argument_user_uid_nullable' => array( - 'parent' => 'views_handler_argument_user_uid', - ), - // Filters - 'quiz_views_handler_filter_quiz_question_type' => array( - 'parent' => 'views_handler_filter_node_type', - ), - 'quiz_views_handler_filter_quiz_question' => array( - 'parent' => 'views_handler_filter_boolean_operator', - ), - ), ); } @@ -79,81 +77,53 @@ function quiz_views_handlers() { * Implements hook_views_data_alter(). */ function quiz_views_data_alter(&$data) { - // Join the quiz properties table to Quiz nodes. - $data['quiz_node_properties']['table']['join'] = array( - 'node' => array( - 'left_field' => 'vid', - 'field' => 'vid', - 'type' => 'INNER', - ), - 'node_revision' => array( - 'left_field' => 'vid', - 'field' => 'vid', - 'type' => 'INNER', - ), + // Join the quiz properties table to quiz entities. + $data['quiz_entity_revision']['table']['join'] = array( + 'quiz_entity' => array('left_field' => 'vid', 'field' => 'vid', 'type' => 'INNER'), ); - $data['quiz_node_results']['table']['join'] = array( - // This is vid because vid is always more specific. - 'node' => array( - 'left_field' => 'vid', - 'field' => 'vid', - ), - 'node_revisions' => array( - 'left_field' => 'vid', - 'field' => 'vid', - ), - 'quiz_node_properties' => array( - 'left_field' => 'vid', - 'field' => 'vid', - ), + $data['quiz_results']['table']['join'] = array( + // This is vid because vid is always more specific. + 'node' => array('left_field' => 'vid', 'field' => 'vid'), + 'node_revisions' => array('left_field' => 'vid', 'field' => 'vid'), + 'quiz_entity_revision' => array('left_field' => 'vid', 'field' => 'vid'), ); - $data['quiz_node_relationship']['table']['join'] = array( - // This is vid because vid is always more specific. - 'node' => array( - 'left_field' => 'vid', - 'field' => 'parent_vid', - ), - 'node_revisions' => array( - 'left_field' => 'vid', - 'field' => 'parent_vid', - ), - 'quiz_node_properties' => array( - 'left_field' => 'vid', - 'field' => 'parent_vid', - 'type' => 'INNER', - ), + $data['quiz_relationship']['table']['join'] = array( + // This is vid because vid is always more specific. + 'node' => array('left_field' => 'vid', 'field' => 'quiz_vid'), + 'node_revisions' => array('left_field' => 'vid', 'field' => 'quiz_vid'), + 'quiz_entity_revision' => array('left_field' => 'vid', 'field' => 'quiz_vid', 'type' => 'INNER'), ); - $data['quiz_node_results_answers']['table']['join'] = array( - 'quiz_node_properties' => array( - 'left_table' => 'quiz_node_relationship', - 'left_field' => 'child_nid', - 'field' => 'question_nid', - 'extra' => 'quiz_node_results_answers.result_id = quiz_node_results.result_id', - ), + $data['quiz_results_answers']['table']['join'] = array( + 'quiz_entity_revision' => array( + 'left_table' => 'quiz_relationship', + 'left_field' => 'question_nid', + 'field' => 'question_nid', + 'extra' => 'quiz_results_answers.result_id = quiz_results.result_id', + ), ); // Filter for the node being a quiz question. $data['node']['quiz_question_type'] = array( - 'title' => t('Question type'), - 'help' => t('Filter by quiz question type.'), - 'real field' => 'type', - 'filter' => array( - 'label' => 'Quiz question type', - 'handler' => 'quiz_views_handler_filter_quiz_question_type', - ), + 'title' => t('Question type'), + 'help' => t('Filter by quiz question type.'), + 'real field' => 'type', + 'filter' => array( + 'label' => 'Quiz question type', + 'handler' => 'quiz_views_handler_filter_quiz_question_type', + ), ); // Filter for the node being a quiz question. $data['node']['quiz_question'] = array( - 'title' => t('Quiz question'), - 'help' => t('Filter by quiz question.'), - 'real field' => 'type', - 'filter' => array( - 'label' => 'Quiz question', - 'handler' => 'quiz_views_handler_filter_quiz_question', - ), + 'title' => t('Quiz question'), + 'help' => t('Filter by quiz question.'), + 'real field' => 'type', + 'filter' => array( + 'label' => 'Quiz question', + 'handler' => 'quiz_views_handler_filter_quiz_question', + ), ); } diff --git a/js/quiz.auto-title.js b/js/quiz.auto-title.js deleted file mode 100644 index bc1df73..0000000 --- a/js/quiz.auto-title.js +++ /dev/null @@ -1,31 +0,0 @@ -(function ($, Drupal) { - var maxLength = Drupal.settings.quiz_max_length; - - function quizStripTags(str) { - return str.replace(/<\/?[^>]+>/gi, ''); - } - - function quizUpdateTitle() { - var body = $("#edit-body textarea:eq(1)").val(); - if (quizStripTags(body).length > maxLength) { - $("#edit-title").val(quizStripTags(body).substring(0, maxLength - 3) + "..."); - } - else { - $("#edit-title").val(quizStripTags(body).substring(0, maxLength)); - } - } - - $(document).ready(function () { - $("#edit-body textarea").keyup(quizUpdateTitle); - - // Do not use auto title if a title already has been set - if ($("#edit-title").val().length > 0) { - $("#edit-body textarea:eq(1)").unbind("keyup", quizUpdateTitle); - } - - $("#edit-title").keyup(function () { - $("#edit-body textarea:eq(1)").unbind("keyup", quizUpdateTitle); - }); - }); - -})(jQuery, Drupal); diff --git a/js/quiz.jumper.js b/js/quiz.jumper.js deleted file mode 100644 index b6c461d..0000000 --- a/js/quiz.jumper.js +++ /dev/null @@ -1,10 +0,0 @@ -(function ($) { - Drupal.behaviors.quizJumper = { - attach: function(context, settings) { - $("#quiz-jumper-form:not(.quizJumper-processed)", context).show().addClass("quizJumper-processed").change(function(){ - $("#quiz-jumper-form #edit-submit").trigger("click"); - }); - $("#quiz-jumper-form-no-js:not(.quizJumper-processed)").hide().addClass("quizJumper-processed"); - } - }; -})(jQuery); diff --git a/misc/images/arrow-right_808080_64.png b/misc/images/arrow-right_808080_64.png new file mode 100644 index 0000000000000000000000000000000000000000..f410b1d29a3abe2c7ac1c57f3025b747710637b2 GIT binary patch literal 906 zcmV;519kj~P))_IrmvKK0at#uthYXhxS8^BiV$2893eT-K2FiSN7yo-;q4!7V=ynGi z;B!1&$;&L&0I&nwd-Pd`FYr)#JF`_9z*~BU?`RqJsSKecfP3(IpJS?5LP-G6;)Vgn zEf*j>nAgtSDhXg|!r0})*WrOoUZN@q;HSj#RUniEuou52&apy(FqZ5lqLKhE;RWHT zFGVZxr9u!&FN4Ri8Gj|t)2W2DsfPZq8V^E8ut_?E5up;YLa6m9d_O|;}Je6>}0O7ttCun&jcF+(& zXniJlP}ns6ojA{^0U@*o00)Fh$OYlveg<^|FoKUTiJ8LJe%#!T@rXw8l|CTc82NlD zzLxOg(omgBcoM(#>Kv86oZ3YBnow@xttcV)NJMt5Kj zZi;n?0f_xJT#FjR^RdQZSO#n8@mRw`0T9(f0q{+%AqL>zLPlEXGR7^zATQ5bpfE!ZRGp;5vLJeLH+Xxbvs_8Ppm;&hQ)b8J@NPa)tk0 z2>-(%gIfU@itw}nkURXzlu2p>$Q6DPPfH9>T>!bmpGbD39)R58zfX2_MKu8A3jc@9 z;VBQ`F+&`lvH+F{yUJYQze{#Bhe`r?4yzL9n8HSd!c!JN>dOnA@W<1w#8nbN%BwJc z3gN%aKt-Zhuw&5k=m6(e-hY#_nF8|z=R_%X*cU`%LMy<~T go9jA&)&^SZKUP$-sHDN@fdBvi07*qoM6N<$g2G{|NdN!< literal 0 HcmV?d00001 diff --git a/misc/images/check_008000_64.png b/misc/images/check_008000_64.png new file mode 100644 index 0000000000000000000000000000000000000000..408fd2b7805513c83a7e50428b47143d302dedd0 GIT binary patch literal 745 zcmVDuSL2^VyqtK9O6hfk>Kon>+f(0_vu2$6mut<;dY@+(YxcWl!g)(N%VHN0JH3F|1;kD-Aa((< z(+h}QKA^M&2nqk$U>Eq6o@lFpX<^}a<44wH5dk~! z8b9$7M=O_>ooU<*^sJHak~u@(1ltzv=cGzw2X0f%uP%QNOq;A-L0veP&` z;{}X@PjV7ha+j8!DDaFHaL53DMULm3!sR>*W+Wv17X{!MF5n;@$OoU~G%gjm9;Sqa z-=zRN*#b7>=H!Scw1pZsV8VV=$(O6yyt$?SVv%zr^S_4mghogyvSE=!LS_DtI z)_2}47{KnwW`ke;34YhOX5kELi7lD5_4|Ov(hG=PKZYiz00000NkvXXu0mjf`)gKX literal 0 HcmV?d00001 diff --git a/misc/images/check_808080_64.png b/misc/images/check_808080_64.png new file mode 100644 index 0000000000000000000000000000000000000000..aee7c23a4c048ace00c49a33a519db9ed26ff57c GIT binary patch literal 750 zcmV^z(%U;ighZi6!L7^fclt@&F2o;-X z&~2rXh$!w(B$L^D=i$tp89Tq^Hs{Qo`G3E+ICKB!t{MymR&rLyE+BS#0kI2+onAof z0%E5Z5W9fb=>^0tAa?#20SEB{U-1|_^4|DA2$;n)?7>zX!dpWrW7Bm3v$&oyz7CJ% zkkDlT%fTm^kV8UO1&o7FGFCzt1>}WKl1Mm^HQ6-*Gm60{nZQGANl$c1zzl9wxPK!~ zrU$zspelTl&FO(I2nYoa@6!Wq7Z4Ku6Ks3!lh-W zad^fH7zLl?G_K?>Ejv-*87<(5A^h4L>zu*mJP*uBNcb-bz_Yx7!+0Pce3G-cRN#7; z5*B{10`O!D*oM1`!6%uMU&0h_m3T&0O2LyY-~`rJC}s{9$6V72c(Mg-s#48T&f&r` zbFG0VTfm#Li=}cNgVb27;K>$nM>q-d{z+&ZJlO(%V-g>#F20m`JQo(e&{j7p%WZ>; z*e{%f%zj*nB=Fw@tvB*TD71vC2@cQrSK+ous0E&UKZasUs12U{KZj#Us1=@K4UwiL zET|ct;w`bJBrF*2^R>cLt|wTxgvQ`0-xRG&LZk3h>k5aK&^SER+v1@lM1d#FxjkP{GArT zQ?B)$H;aa_lh|(f%|9{hIJG8q3V=U&y7Xyf+WP;1#?lLjT|n&g0%8{sJH3F|1;kD- gAa((i_@%07*qoM6N<$f^rH@)c^nh literal 0 HcmV?d00001 diff --git a/misc/images/check_ffff00_64.png b/misc/images/check_ffff00_64.png new file mode 100644 index 0000000000000000000000000000000000000000..bc17f6f6b788297ab847947bf6c97d4e235761ad GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2bo~aSW-L^LEzWEYUy_xA3Nf z^vUPuUvko^X)x((-6)ovsCy&p6T`n_$HG4-vT#c~vPe6Ithv(AJ55Y!QNn}G9Lz?~ z?o^+fyElFQN#!yeKg5L!{6m$2|}KPc2Ba=eQBU zuy6HyA@yI^b6y(mV6>4b_$T-v>VJYZQ`@0(%X{`0ni#Yz8qEL8u6(fX+pg!ozs5Z( z@V0N7_Ca2y@7-2Elay6?eT?y1389ac9^rpmH+S7OzIdevT}RHzaoc1_+JzseV%oQQ zZP>$NmNnjgPDXsF>;CYWCFWeq`&V(SALP9sq;u{F;kbYGuG0_ci61l>)m7{GGE~By zENZ+COmlQDk81GetVp?X%>{g~3=EVN!mC4_yxP{Wa~BhiQ3=1U!x z-`p@g!PDzsc^uVp0(^~=` zCf-Om5_Ras2ZI`;6jenQxg57-XVsR2&3AJO0y!7kyh=M-WD%vcu=#(|4d=o&%Mb4q zTGhZl|KkrE&Z`HS@Be0;+akXA@%oh8IOZgMpIp!MX2-e+iG0SZ%Ui=! kVld(r9NWbYSpTr{{5>mm$>Z-GU|M7FboFyt=akR{0P1KiA^-pY literal 0 HcmV?d00001 diff --git a/misc/images/circle-o_808080_64.png b/misc/images/circle-o_808080_64.png new file mode 100644 index 0000000000000000000000000000000000000000..c659d2e2edfb649a53937fb0ca06ce9f3e220429 GIT binary patch literal 1419 zcmV;61$6p}P)1SWZLQH5`~am~Q>(s$wEEgBG??5r=);-nO`P3xc6WBSN%whu8r>hRd=ld=7GAqW`UZ!CV}7cHZCs#)&lnf zLqLy`x9To{Zs6Xgw9~){a18h@pnd-mx(jRuMu9WH0d(gzdVzzkyib9?jOG20Py%cO z#(|T-K%g?4sQ`n(4~P&qhAKF#0Ik5wh+%hUH^;;vGCu5c^=BfB0PCG0&r{4`+Dr?u z7ZHA4mV(j>umkuGxFJjB0qAyi+>y3`Gy?2G`r*}SD-Fywz!>mgnun7%-Ce-DDe9>s zZ-+_b)i&eqT|k7a0$s?c--q<`)d|XP1>SRizn{dgBm(RJ-bzw9FaaD!-Vlw5Jag_k z0~~kv+JJswH_4j!+sNeU3+n^cF0c;x5c{b6HLwkNGkij{^HDV1b9Vx_ApP7zEASC; zy|p5X0Ik3WNMF;q2s{bg4xF$Wq3|tmEASNXmm&XZ#9q^nWf9;7Y!i=JU<+^v_}fx> z0xkis0$Z`I54w@pvx+7_H}I^XoL>;gxyoQ1Z1P_Qw(@z)k4$`isabt0?D}m~r)LW5OWH0xC{`7Y&9yL;lS^iYeeZL%!j- z#3%u-L)44oIPiwSfIN8({S`TY_~Ru?fFVQWPZNH$Ps$}{M;sL-IO8QsfCrR9KSS33 z%YkpuXMU0X_yp)g0vvI?uA~>uAtk*B=7 zYy<96@%0jL_73A1L;Ud)7Z%@V zFyJ5=PiSOd1BQ(c6hGnwIEe&5`n15!B4U3mngBIygUotlJ3R01umNeAmU>=6f1R7Q$6vy>{j~;ZZjTcF?N9-p zK%Ccpd4Qh~yHzX#G=QDx0SAyV;V|$e;pPcjfUl6)zt-mg&Lj4kBG=X z+mY5VO1iZ}8*mRYh@Aj#Gd{O~*!i=yq9li;CV+>5cM?1^;I27Dj8n+Cat>La&m$40 zD$<2|`0tchdxCnFcnJ7B$pcA`$sKY3zM1gZcBEPEOjw_l1;qKINgqseQ1S@UJS}5F z5u8WtIhy9-v`1wpfSW1raKsW*$YLl_vu`HLVd-fk3bP;k;24TUPpOt|8VlM0A(9cHY;9$ Ze*mx#^MUl7b*TUV002ovPDHLkV1is@lgj`A literal 0 HcmV?d00001 diff --git a/misc/images/circle_808080_64.png b/misc/images/circle_808080_64.png new file mode 100644 index 0000000000000000000000000000000000000000..576483f27f299ca6414b3c2fd9a50af7babc94b1 GIT binary patch literal 937 zcmV;a16KTrP)Y>9k#X|4Qyfg2wb$37Tg3iqQzTfA&^S(3l&NFS5N`+=-UuXfLX&De&Kxo=M z^wA0QMWrYDzZjJcU<=rY$~sVu$};fFwK!J>bOD!vVW2nV*kV)wO2EaMeJj8WFbn*& zsP7-Phrmf-4)_5~k{)~-eZb?Wy|=)CVSE2!%YYtW0ayZtEVWrn8&C#5Ax0dx)v&1n z1>hkf?3}qAEy~FJFdp@9goy!1BO!P3Gnv-X4vZnjcbhbn*MLFb18~fwa|@Ir9cS}4 zkjH=#WE}3#+o@#^0Q11LJe9Max+B1|JRLcv06dTWevzeOmNQ@wc#@^@06Zn*aL_fN z8+e6hwz*7gDi5xrVJmW~1Uuz2I)i4t;oP9@EN5^&p4OejXt z_~FtFn85!{jxE{|{fQ(QZ~`~?^*$++@&J`&zBA@8E3#@#Jxsf2#H5YoB_jb zv;?6IS)5T4XTTLVT7nT9kIH~fWPziR=mid`cBl;KcdI2B%D7Ypn6Bg1E6TW91}L_5 zIu;TNWn3x)if(lTqo~^0GC;Ad!>x{BDC1HYu;o}tD3o!j4A^k1BN!X1jV%Kd+t%Ic z2!=8)l>wg}3kiiXE|mc*j)jCm8JEg{WyeB7p^PhT4rsJtP$eeaCT>Aw#+{ZR#KzMs z2F%9oh%;afNqK1m=8<@mBrS`NTbB}s#5j@+SOVVJ)#9B6;A7GOX|Kjcfn95I{IZMa zPbAHNDw6NF7kPxnO7{~FK@dsk3h@=o3L1Mrn|H6@gO;EHD4Qec68?caoq9aPW)Itb|r#7~t5X9Kn z2sUDoU}sAI00{&Vi|-BW<#LK3Dg1^@xRo^bB5&e#Jcg_I5_ftg%nytnYb(|851;=i7Wdnk5?ue^j`@l5CZOf`OGclgRF{D3EV zCU2$S(I(2)Kot@mlt9 zKM9%P;qSQvqhEoKgX8yOQ9^e3?{IzY;OI*58$7S=hwxsigg;G7+zhVa{m2C^OX0Hf zoF(CS!aPjjPYW)Kdlo|XTLO=wDLnm4;e#NdIXtV|46Tc<@Z>Z^iZK$p!;{w$D%L9@ zB|Nz;v0^M-d5?Tcugz%Lv2`vH+Qus=HN4#iY5KBt(0HAIc41*Y>yN^catsy22-M zcg_XTPrwJ!iuU2&jZKlaf!e}}xr3v3hMo?WvzPsLbw!?pXXg%#-Wj?PuVohx+R_&N z67HDpHOwOV6*#Z`OwQc>e9^Tnp(#9ldw~bNX;u%fST3PCJpH@DZMBQ)&`F-b+#-Tqfy%8|F vfYEFOj4og_8v&yW7|lk&=mJJ_=mq=_UP!MYYFtXe00000NkvXXu0mjf=u@59 literal 0 HcmV?d00001 diff --git a/misc/images/times_ff0000_64.png b/misc/images/times_ff0000_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2d7367ec6f94180480b2839e180ecf1c4283002f GIT binary patch literal 641 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj*EaSW-L^Y+$8ub4oA_K)X% zd6K4!B&jdyTHEWNkgX8LrflctA((TCzcgFyEeO`aP+SsGPJqv9PnUo45xXNkOS zoBnTeasD^HIp5yY*o&3#eKW`Kw(*HLh3cw?H>{hMv!gNPy5HSo_|}kqz_NfNrt{su z@@$|BYFP4O%xC@IW4^)q`R;?09=vs>W^*Sl%-)(3A4(R9kKDehBdtg{xI&2mus z{+z2E4Xg)~9t(tgO#85D?fZt`0#iOFzGrxUAIQ4$abZ34hF$)Rg&gXKejl=DRT8-L z$d)13dB!jEgJz0L{_0;~V+r5GrNDhqc0J1svnG`|UISg0$Ql+0lO_{8E(I<}IeE?x zC)&=lhJLK)ndkmSO0-_)1K*F-4R^{KR{St%(L36%P@)^xcj0J-rc?OiRF2rb=?W#b z_j*6rAK5M7^_cz9594P3nH)@SY2mX(H{L@NdF@v^F?tEw_!oHzbUn6Z zn5?8Bm+adVAo`xQg2VAAPri&(=^iGAX4&S`*50+E$IPGK<#^*iuj27H>B$Lk4C@=0 z^VDnpTFNMP-s%I_jPxJg7lYroYBiiYcjkY@F7&tr$8h>H#(zvUug_>}^>=LtCM^a} LS3j3^P6]+>/gi, ''); + } + + function quizUpdateTitle() { + var body = $("#edit-body textarea:eq(1)").val(); + if (quizStripTags(body).length > maxLength) { + $("#edit-title").val(quizStripTags(body).substring(0, maxLength - 3) + "..."); + } + else { + $("#edit-title").val(quizStripTags(body).substring(0, maxLength)); + } + } + + $(document).ready(function () { + $("#edit-body textarea").keyup(quizUpdateTitle); + + // Do not use auto title if a title already has been set + if ($("#edit-title").val().length > 0) { + $("#edit-body textarea:eq(1)").unbind("keyup", quizUpdateTitle); + } + + $("#edit-title").keyup(function () { + $("#edit-body textarea:eq(1)").unbind("keyup", quizUpdateTitle); + }); + }); + +})(jQuery, Drupal); diff --git a/misc/js/quiz.entity-form.js b/misc/js/quiz.entity-form.js new file mode 100644 index 0000000..418a3e5 --- /dev/null +++ b/misc/js/quiz.entity-form.js @@ -0,0 +1,32 @@ +(function ($, Drupal) { + + /** + * JS enabling one filter fieldset to control filter formats for all textareas + * in alternatives. + */ + Drupal.behaviors.quizFormBehavior = { + attach: function (context) { + $('.quiz-filter:first :radio', context).click(function () { + $('.quiz-filter:not(:first) :radio[value=' + $(this).val() + ']').click(); + $('.quiz-filter:not(:first) :radio[value=' + $(this).val() + ']').change(); + }); + + var defaultValue = $('.quiz-filter:first :radio[checked=1]').val(); + $('.quiz-filter:not(:first):not(.quizFormBehavior-processed) :radio[value=' + defaultValue + ']', context) + .click() + .change() + .addClass('quizFormBehavior-processed'); + + $('.quiz-filter:not(:first)') + .hide() + .addClass('quizStayHidden'); + + var oldToggle = Drupal.toggleFieldset; + Drupal.toggleFieldset = function (context) { + oldToggle(context); + $('.quizStayHidden').hide(); + }; + } + }; + +})(jQuery, Drupal); diff --git a/misc/js/quiz.jumper.js b/misc/js/quiz.jumper.js new file mode 100644 index 0000000..1fc74e0 --- /dev/null +++ b/misc/js/quiz.jumper.js @@ -0,0 +1,17 @@ +(function ($, Drupal) { + + Drupal.behaviors.quizJumper = { + attach: function (context) { + $("#edit-question-number:not(.quizJumper-processed)", context) + .addClass("quizJumper-processed") + .change(function () { + $(this).parents('form:eq(0)').trigger('submit'); + }); + + $("#quiz-jumper-no-js:not(.quizJumper-processed)") + .hide() + .addClass("quizJumper-processed"); + } + }; + +})(jQuery, Drupal); diff --git a/misc/js/quiz.take.count-down.js b/misc/js/quiz.take.count-down.js new file mode 100644 index 0000000..26a9e51 --- /dev/null +++ b/misc/js/quiz.take.count-down.js @@ -0,0 +1,26 @@ +var quiz_take_finished; + +(function (window, $, Drupal) { + var button_1 = Drupal.settings.quiz_button_1; + var button_2 = Drupal.settings.quiz_button_2; + + quiz_take_finished = function () { + // Find all buttons with a name of 'op'. + var buttons = $('input[type=submit][name=op], button[type=submit][name=op]'); + + // Filter out the ones that don't have the right op value. + buttons = buttons.filter(function () { + return (this.value === button_1) || (this.value === button_2); + }); + + if (buttons.length === 1) { + // Since only one button was found, this must be it. + buttons.click(); + } + else { + // Zero, or more than one buttons were found; fall back on a page refresh. + window.location = window.location.href; + } + }; + +})(window, jQuery, Drupal); diff --git a/misc/js/quiz_take.js b/misc/js/quiz_take.js new file mode 100644 index 0000000..3548745 --- /dev/null +++ b/misc/js/quiz_take.js @@ -0,0 +1,19 @@ +(function ($) { + Drupal.behaviors.quizQuestionBrowserBehavior = { + attach: function(context, settings) { + // $('div.checkbox div.form-item').hide(); + var $cell = $('div.mark-doubtful'); + var $checkbox = $(':checkbox', $cell); + var $switch = $('.toggle', $cell); + if ($checkbox.is(':checked')) { + $switch.toggleClass('off'); + } + $switch.click(function() { + $checkbox.click(); + }); + $checkbox.click(function() { + $switch.toggleClass('off'); + }); + } + }; +})(jQuery); diff --git a/misc/quiz.css b/misc/quiz.css new file mode 100644 index 0000000..06ccc3d --- /dev/null +++ b/misc/quiz.css @@ -0,0 +1,356 @@ +/** + * Definitions that apply while viewing questions + */ +.question-type-name { + font-style: italic; +} + +/** + * Definitions that apply while taking the quiz. + */ +#quiz-progress { + font-style: italic; + font-size: 80%; +} + +#quiz-score-possible, #quiz-score-percent { + font-weight: bold; +} + +td.quiz-summary-qcell { + vertical-align: top; + padding: 1em 1em 0em 0em; +} + +td.quiz-summary-qcell table tr { + background: transparent; +} + +td.quiz-summary-qcell table td { + vertical-align: top; + padding: .5em; +} + +.quiz-answer-feedback { + font-style: italic; +} + +.quiz-summary-text { +} + +.feedback-icon { + display: inline; +} + +.add-questions { + background: transparent url(images/add.png) no-repeat scroll 0% 10%; + padding: 0 0 1em 2em; +} + +.hidden-question { + display: none; +} + +.quiz-question-browser-row.odd { + background-color: #e7e7e7; +} + +.quiz-question-browser-row.even { + background-color: #fbfbfb; +} + +#quiz-question-browser-filters { + /*background-color: black;*/ + /* Black bg in seven theme looks horrible. */ + background: none repeat scroll 0 0 #E1E2DC; + border-color: #BEBFB9; + border-style: solid; + border-width: 1px; + font-weight: normal; + padding: 3px 10px; + text-transform: uppercase; +} + +#quiz-question-browser-filters td.active { + background-color: #666; +} + +.quiz-question-browser-row.odd td.active { + background-color: #e2e2f9; +} + +.quiz-question-browser-row.even td.active { + background-color: #f8f8ff; +} + +tr.selected.quiz-question-browser-row td, tr.selected.quiz-question-browser-row td.active { + background: none repeat scroll 0 0 #505050; + color: #FFF; +} + +.browser-table th { + border-bottom: 0px solid #666666; +} + +.q-staying { + display: inline; + float: left; + margin-right: 8px; +} + + +/* + * Definitions that apply on the quiz report pages. + */ + +div.quiz-report { + margin: 0; + padding: 0; +} + +div.quiz-report .dt { + background: #eee; + border-top: solid 1px gray; + padding-left: 5px; +} + +div.quiz-report .dt div.quiz-report-score-container { + border-right: solid 1px gray; + border-left: solid 1px gray; + border-bottom: solid 1px gray; + float: right; + padding: 4px 6px; +} + +div.quiz-report .dt div.quiz-report-score-container span div.form-item { + display: inline; +} + +div.quiz-score-submit { + float: right; +} + +.quiz-report-skipped { + float: right; +} + +.q-correct { + background-color: #DDFFDD; +} + +.q-wrong { + background-color: #FFCCCC; +} + +.q-waiting { + background-color: #FFFFDD; +} + +input#edit-submit-hidden { + height: 0; + width: 0; + overflow: hidden; + padding: 0; + border: none; +} + +.quiz-passed { + color: #00dd00; +} + +.quiz-failed { + color: #dd0000; +} + +#no-questions { + font-style: italic; +} +#quiz-view-table { + width: auto; + border-collapse: separate; + border: thin solid #555555; + padding: 0px; + margin: 0px; + margin-bottom: 20px; +} +#quiz-start-quiz-button-form div { + padding: 0px; + margin: 0px; +} + +#quiz-start-quiz-button-form input { + margin: 0px; +} + +#quiz-view-table td { + padding: 0px 3px 0px 3px; + margin: 0px; + line-height: 110%; +} +.quiz-view-table-title { + +} +.quiz-view-table-data { + +} + +#browser-pager .pager-last { + display: none; +} +#browser-pager .pager-first { + display: none; +} + +.matching-tbl { + width: auto; + border-collapse: separate; + padding: 0px; + margin: 0px; + border: 0px; + line-height: 100%; +} + +.matching-tbl p, .matching-tbl select, .matching-tbl div { + padding: 0px; + margin: 0px; + line-height: 100%; +} + +.matching-tbl td { + padding: 2px; + margin: 2px; + line-height: 100%; +} + +.quiz-solution { + border-left: solid 5px #00ff00; + padding-left: 3px; +} + +.quiz-answer-hidden { + font-style: italic; +} + +#quiz-jumper-form, #quiz-jumper-form div, #quiz-jumper-form select { + display: inline; +} + +#quiz-progress .item-list .pager { + text-align: left; +} + +#quiz-categorized-form #autocomplete { + overflow: auto; + max-height: 300px; +} + +.mark-doubtful .toggle { + margin: auto; + position: relative; + width: 100px; + overflow: hidden; + height: 18px; + line-height: 18px; + font-size: 11px; + text-align: center; + cursor: pointer; + border: 1px solid #ccc; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 0 10px rgba(0,0,0,0.50) inset; + -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.50) inset; + box-shadow: 0 0 10px rgba(0,0,0,0.50) inset; +} + +.mark-doubtful .toggle.off { + background-clip: padding-box; + background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, color-stop(50%, red), color-stop(50%, white), color-stop(100%, white)); + background-image: -moz-linear-gradient(left, red 50%, white 50%, white 100%); + background-image: linear-gradient(left, red 50%, white 50%, white 100%); +} + +.mark-doubtful .toggle { + background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, color-stop(50%, white), color-stop(50%, green), color-stop(100%, green)); + background-image: -moz-linear-gradient(left, white 50%, green 50%, green 100%); + background-image: linear-gradient(left, white 50%, green 50%, green 100%); +} + +.mark-doubtful .toggle div { + position: relative; + color: #777; + width: 52px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; + background: white; + text-shadow: 1px 1px 0 white; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #FEFEFE), color-stop(100%, #EAEAEA)); + background-image: -moz-linear-gradient(top, #FEFEFE 0%, #EAEAEA 100%); + background-image: linear-gradient(top, #FEFEFE 0%, #EAEAEA 100%); + -webkit-transition: left 0.2s; + -mox-transition: left 0.2s; + -o-transition: left 0.2s; + transition: left 0.2s; +} + + +.mark-doubtful .toggle div:after, +.mark-doubtful .toggle div:before { + color: white; + text-shadow: none; + width: 50px; + position: absolute; + top: 0; + font-size: 9px; + font-weight: bold; +} + +.mark-doubtful .toggle div:before { + content: "Doubtful"; + left: -48px; +} + +.mark-doubtful .toggle div:after { + content: "Clear"; + right: -48px; +} +.mark-doubtful .toggle.off div { + left: 48px; +} + +/* + Icons +*/ +.quiz-score-icon { + display: inline-block; + width: 32px; + height: 32px; + background-size: cover +} +.quiz-score-icon.correct { + background-image: url('images/check_008000_64.png'); +} +.quiz-score-icon.incorrect { + background-image: url('images/times_ff0000_64.png'); +} +.quiz-score-icon.unknown { + background-image: url('images/question_808080_64.png'); +} +.quiz-score-icon.should { + background-image: url('images/check_808080_64.png'); +} +.quiz-score-icon.should-not { + background-image: url('images/times_808080_64.png'); +} +.quiz-score-icon.almost { + background-image: url('images/check_ffff00_64.png'); +} +.quiz-score-icon.selected { + background-image: url('images/arrow-right_808080_64.png'); +} +.quiz-score-icon.unselected { + background-image: url('images/circle-o_808080_64.png'); +} diff --git a/modules/ajax_quiz/ajax_quiz.admin.inc b/modules/ajax_quiz/ajax_quiz.admin.inc deleted file mode 100644 index 48095f8..0000000 --- a/modules/ajax_quiz/ajax_quiz.admin.inc +++ /dev/null @@ -1,58 +0,0 @@ -'; - $output .= '
' . $node->body . '
'; - $output .= '
' . l(t('Start'), $_GET['q'], array('attributes' => array('class' => 'ajax-load-example'))) . '
'; - $output .= ''; - return $output; - } -} - -function _ajax_quiz_get_questions($node) { - $output = ''; - foreach (drupal_get_messages() as $type) { - foreach ($type as $message) { - $output .= ''; - } - } - $output .= node_view($node, FALSE, TRUE); - $result = array( - 'content' => $output, - // Put the Javascript callback you will use here. - // You can if you wish leave out this line and instead - // call your callback directly in your Javascript. See - // comments in ajax_load_example.js. - '__callbacks' => array('Drupal.AjaxLoadExample.formCallback'), - ); - // Call drupal_alter('ajax_data', ...). This is what allows ajax_load to - // add its data and register its Javascript callback. - // The second argument is the data to be altered. - // The third argument is a unique identifier for this AJAX data operation. - // The fourth and optional argument is the original data that was the subject - // of the ajax operation--in this case, a form ID. - drupal_alter('ajax_data', $result, 'ajax_load_example', 'node_view'); - drupal_json_output($result); -} - diff --git a/modules/ajax_quiz/ajax_quiz.info b/modules/ajax_quiz/ajax_quiz.info deleted file mode 100644 index 6a102a7..0000000 --- a/modules/ajax_quiz/ajax_quiz.info +++ /dev/null @@ -1,8 +0,0 @@ -name = AJAX Quiz -description = This module doesn't degrade gracefully, and we don't recommend using it until it does. This module attempts to provide an AJAX version of quiz. Successive quiz questions will be loaded in the same page without page reload, but it doesn't work flawlessly at the moment. -dependencies[] = quiz -core = 7.x -package = Quiz Addon - -files[] = ajax_quiz.admin.inc -files[] = ajax_quiz.module diff --git a/modules/ajax_quiz/ajax_quiz.js b/modules/ajax_quiz/ajax_quiz.js deleted file mode 100644 index c7e23c6..0000000 --- a/modules/ajax_quiz/ajax_quiz.js +++ /dev/null @@ -1,113 +0,0 @@ - -Drupal.AjaxLoadExample = Drupal.AjaxLoadExample || {}; - -/** - * Ajax load example behavior. - */ -Drupal.behaviors.AjaxLoadExample = function (context) { - // to proceed with the quiz - $('.form-submit:not(.form-submit-clicked)', context) - .each(function () { - // The target should not be e.g. a node that will itself be - // replaced, as this would mean no node is available for - // ajax_load to attach behaviors to when all scripts are loaded. - var target = this.parentNode; - $(this) - .addClass('form-submit-clicked') - .click(function () { - var tries = ''; - $('[name^="tries"]:not(.form-submit-clicked)').each(function (i) { - switch(this.type) { - case 'radio': - case 'checkbox': - if (this.checked) { - tries += '&' + this.name + '=' + this.value; - } - break; - default: - tries += '&' + this.name + '=' + this.value; - break; - } - $(this).addClass('form-submit-clicked'); - }); - $(this).attr('disabled', true); - $.ajax({ - // Either GET or POST will work. - type: 'POST', - data: 'ajax_load_example=1&op=Next'+tries, - // Need to specify JSON data. - dataType: 'json', - url: $(this).attr('href'), - success: function(response) { - $(this).prepend('answer saved'); - // Call all callbacks. - //alert('sucess'); - if (response.__callbacks) { - $.each(response.__callbacks, function(i, callback) { - // The first argument is a target element, the second - // the returned JSON data. - //alert(response); - eval(callback)(target, response); - }); - // If you don't want to return this module's own callback, - // you could of course just call it directly here. - // Drupal.AjaxLoadExample.formCallback(target, response); - } - }, - error: function(xhr, opt, err) { - alert(xhr.statusText); - alert(opt); - alert(err); - }, - }); - return false; - }); - }); - // to start the quiz - $('a.ajax-load-example:not(.ajax-load-example-processed)', context) - .each(function () { - // The target should not be e.g. a node that will itself be - // replaced, as this would mean no node is available for - // ajax_load to attach behaviors to when all scripts are loaded. - var target = this.parentNode; - $(this) - .addClass('ajax-load-example-processed') - .click(function () { - $.ajax({ - // Either GET or POST will work. - type: 'POST', - data: 'ajax_load_example=1', - // Need to specify JSON data. - dataType: 'json', - url: $(this).attr('href'), - success: function(response){ - // Call all callbacks. - if (response.__callbacks) { - $.each(response.__callbacks, function(i, callback) { - // The first argument is a target element, the second - // the returned JSON data. - eval(callback)(target, response); - }); - // If you don't want to return this module's own callback, - // you could of course just call it directly here. - // Drupal.AjaxLoadExample.formCallback(target, response); - } - }, - error: function(){ - alert('An error has occurred. Please try again.'); - }, - }); - return false; - }); - }); -}; - -/** - * Ajax load example callback. - */ -Drupal.AjaxLoadExample.formCallback = function (target, response) { - target = $(target).append(response.content); - Drupal.attachBehaviors(target); -}; - - diff --git a/modules/ajax_quiz/ajax_quiz.module b/modules/ajax_quiz/ajax_quiz.module deleted file mode 100644 index 3a5e8b3..0000000 --- a/modules/ajax_quiz/ajax_quiz.module +++ /dev/null @@ -1,71 +0,0 @@ -' . t('AJAX version of quiz. Successive quiz questions will be loaded in the same page without page reload.') . '

'; - } -} - -/** - * Implementation of hook_perm() - * Valid permissions for this module - * @return array An array of valid permissions. - */ - -/** - * @todo Please document this function. - * @see http://drupal.org/node/1354 - */ -function ajax_quiz_permission() { - return array( - 'access ajax quiz' => array( - 'title' => t('access ajax quiz'), - 'description' => t('TODO Add a description for \'access ajax quiz\''), - ), - ); -} - -/** - * Implements hook_menu(). - * - */ -function ajax_quiz_menu() { - $items = array(); - $items['node/%quiz_type_access/ajax-quiz'] = array( - 'title' => 'Take by AJAX', - 'file' => 'ajax_quiz.admin.inc', - 'page callback' => 'ajax_quiz_instruction', - 'page arguments' => array(1), - 'access arguments' => array('access ajax quiz'), - 'type' => MENU_LOCAL_TASK, - ); - return $items; -} - -/* - * @function - * Implementation of hook_init - * includes the necessary js file(s). - */ -/** - * @todo Please document this function. - * @see http://drupal.org/node/1354 - */ -function ajax_quiz_init() { - //drupal_add_js(drupal_get_path('module', 'ajax_quiz') . '/ajax_quiz.js'); -} - diff --git a/modules/question_types/long_answer/long_answer.admin.inc b/modules/question_types/long_answer/long_answer.admin.inc new file mode 100644 index 0000000..d9f100a --- /dev/null +++ b/modules/question_types/long_answer/long_answer.admin.inc @@ -0,0 +1,186 @@ + $unscored)); +} + +/** + * Page handler for displaying a scoring form. + * This function is called directly from the menu router. It generates a form for + * scoring a quiz. + * + * @param $vid + * The VID of the question and answer to load. + * @param $result_id + * The result ID of the answer to load. + * @return + * Text to display. + */ +function long_answer_edit_score($vid, $result_id) { + + // We have to do the vid -> nid lookup ourselves because node_load uses only node.vid, + // and we need to be able to access old nodes in node_revision.vid. + $nid = db_query('SELECT nid FROM {node_revision} WHERE vid = :vid', array(':vid' => $vid))->fetchField(); + if (!$nid) { + drupal_not_found(); + return; + } + + $node = node_load($nid, $vid); + if (!$node || $node->type != 'long_answer') { + drupal_not_found(); + return; + } + + $answer = (object) long_answer_get_answer($node->nid, $node->vid, $result_id); + if (!$answer) { + drupal_not_found(); + return; + } + if ($node->max_score > 0) { + $answer->rel_score = round($answer->score * $answer->rel_max_score / $node->max_score); + } + else { + $answer->rel_score = 0; + } + drupal_set_title(t('Score answer to "@title"', array('@title' => $node->title)), PASS_THROUGH); + return drupal_get_form('long_answer_score_form', $node, $answer); +} + +/** + * Build a form for scoring long-answer questions. + * + * @param $node + * The question node. + * @param $answer + * An object containing an answer to the question. This form is for scoring that answer. + * @return + * The form (as a FAPI array). + */ +function long_answer_score_form($form, $form_state, $node, $answer) { + if (!$node || $node->type != 'long_answer' || !$answer) { + drupal_not_found(); + return; + } + // Set up the form + $form['question'] = array( + '#type' => 'item', + '#title' => t('Question'), + '#markup' => check_markup($node->body['und'][0]['value'], $node->body['und'][0]['format']), + ); + $form['rubric'] = array( + '#type' => 'item', + '#title' => t('Rubric'), + '#markup' => check_markup($node->rubric), + ); + $form['show_max_score'] = array( + '#type' => 'item', + '#title' => t('Maximum Score'), + '#markup' => (int) $answer->rel_max_score, + ); + $form['score_answer'] = array( + '#type' => 'fieldset', + '#title' => t('Score answer'), + ); + $form['score_answer']['answer'] = array( + '#type' => 'item', + '#title' => t('Answer'), + '#markup' => check_markup($answer->answer), + ); + $form['score_answer']['score'] = array( + '#type' => 'textfield', + '#title' => t('Score'), + '#description' => t('The score for this essay, between 0 and @max', array('@max' => $answer->rel_max_score)), + '#size' => 3, + '#maxlength' => 3, + '#default_value' => (int) $answer->rel_score, + '#required' => TRUE, + ); + $form['score_answer']['answer_feedback'] = array( + '#title' => t('Feedback'), + '#type' => 'text_format', + '#description' => t('The text entered here would be shown to attendees'), + '#default_value' => $answer->answer_feedback, + '#format' => isset($answer->answer_feedback_format) ? $answer->answer_feedback_format : NULL + ); + + $form['score_answer']['submit'] = array( + '#type' => 'submit', + '#value' => t('Save this score'), + ); + + // Save some work by keeping these. + $form['max_score'] = array( + '#type' => 'value', + '#value' => $node->max_score, + ); + $form['rel_max_score'] = array( + '#type' => 'value', + '#value' => $answer->rel_max_score, + ); + $form['question_nid'] = array( + '#type' => 'value', + '#value' => $answer->question_nid, + ); + $form['question_vid'] = array( + '#type' => 'value', + '#value' => $answer->question_vid, + ); + $form['result_id'] = array( + '#type' => 'value', + '#value' => $answer->result_id, + ); + + return $form; +} + +/** + * Validates the long answer score form + */ +function long_answer_score_form_validate($form, $form_state) { + // Check to make sure that entered score is not higher than max allowed score. + $max = (int) $form_state['values']['rel_max_score']; + $given = $form_state['values']['score']; + if (!_quiz_is_int($given, 0, $max)) { + $args = array('@score' => $given, '@max' => $max); + form_set_error('score', t('The given score (@score) must be an integer between 0 and @max', $args)); + } +} + +/** + * Submit handler for the long answer score form + */ +function long_answer_score_form_submit($form, &$form_state) { + $result = db_query('SELECT quiz_qid, quiz_vid FROM {quiz_results} WHERE result_id = :result_id', array( + ':result_id' => $form_state['values']['result_id'] + ))->fetch(); + + $result = long_answer_score_an_answer(array( + 'quiz' => node_load($result->quiz_qid, $result->quiz_vid), + 'nid' => $form_state['values']['question_nid'], + 'vid' => $form_state['values']['question_vid'], + 'result_id' => $form_state['values']['result_id'], + 'score' => $form_state['values']['score'], + 'max_score' => $form_state['values']['rel_max_score'], + 'answer_feedback' => $form_state['values']['answer_feedback'] + )); + + if ($result == 1) { + drupal_set_message(t('The score has been saved.')); + $form_state['redirect'] = 'admin/quiz/reports/score-long-answer'; + } + else { + drupal_set_message(t('Error saving the score. The selected answer was not scored.'), 'error'); + } +} diff --git a/modules/question_types/long_answer/long_answer.classes.inc b/modules/question_types/long_answer/long_answer.classes.inc new file mode 100644 index 0000000..8381a93 --- /dev/null +++ b/modules/question_types/long_answer/long_answer.classes.inc @@ -0,0 +1,394 @@ +node->feedback)) { + $this->node->feedback = ''; + } + + if ($is_new || $this->node->revision == 1) { + db_insert('quiz_long_answer_node_properties') + ->fields(array( + 'nid' => $this->node->nid, + 'vid' => $this->node->vid, + 'rubric' => $this->node->rubric, + )) + ->execute(); + } + else { + db_update('quiz_long_answer_node_properties') + ->fields(array('rubric' => isset($this->node->rubric) ? $this->node->rubric : '')) + ->condition('nid', $this->node->nid) + ->condition('vid', $this->node->vid) + ->execute(); + } + } + + /** + * Implementation of validateNode + * + * @see QuizQuestion#validateNode($form) + */ + public function validateNode(array &$form) { + + } + + /** + * Implementation of delete + * + * @see QuizQuestion#delete($only_this_version) + */ + public function delete($only_this_version = FALSE) { + if ($only_this_version) { + db_delete('quiz_long_answer_user_answers') + ->condition('question_nid', $this->node->nid) + ->condition('question_vid', $this->node->vid) + ->execute(); + db_delete('quiz_long_answer_node_properties') + ->condition('nid', $this->node->nid) + ->condition('vid', $this->node->vid) + ->execute(); + } + else { + db_delete('quiz_long_answer_node_properties') + ->condition('nid', $this->node->nid) + ->execute(); + db_delete('quiz_long_answer_user_answers') + ->condition('question_nid', $this->node->nid) + ->execute(); + } + parent::delete($only_this_version); + } + + /** + * Implementation of getNodeProperties + * + * @see QuizQuestion#getNodeProperties() + */ + public function getNodeProperties() { + if (isset($this->nodeProperties)) { + return $this->nodeProperties; + } + $props = parent::getNodeProperties(); + + $res_a = db_query('SELECT rubric FROM {quiz_long_answer_node_properties} + WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid))->fetchAssoc(); + + if (is_array($res_a)) { + $props = array_merge($props, $res_a); + } + + $this->nodeProperties = $props; + return $props; + } + + /** + * Implementation of getNodeView + * + * @see QuizQuestion#getNodeView() + */ + public function getNodeView() { + $content = parent::getNodeView(); + + if ($this->viewCanRevealCorrect()) { + if (!empty($this->node->rubric)) { + $content['answers'] = array( + '#type' => 'item', + '#title' => t('Rubric'), + '#prefix' => '
', + '#suffix' => '
', + '#markup' => check_markup($this->node->rubric, $this->getFormat()), + '#weight' => 1, + ); + } + } + else { + $content['answers'] = array( + '#markup' => '
Answer hidden
', + '#weight' => 1, + ); + } + return $content; + } + + /** + * Implementation of getAnweringForm + * + * @see QuizQuestion#getAnsweringForm($form_state, $result_id) + */ + public function getAnsweringForm(array $form_state = NULL, $result_id) { + $element = parent::getAnsweringForm($form_state, $result_id); + + $element += array( + '#type' => 'textarea', + '#title' => t('Answer'), + '#description' => t('Enter your answer here. If you need more space, click on the grey bar at the bottom of this area and drag it down.'), + '#rows' => 15, + '#cols' => 60, + //'#theme' =>'long_answer_answering_form', + ); + if (isset($result_id)) { + $response = new LongAnswerResponse($result_id, $this->node); + $element['#default_value'] = $response->getResponse(); + } + return $element; + } + + /** + * Question response validator. + */ + public function getAnsweringFormValidate(array &$form, array &$form_state = NULL) { + if ($form_state['values']['question'][$this->node->nid] == '') { + form_set_error('', t('You must provide an answer.')); + } + } + + /** + * Implementation of getCreationForm + * + * @see QuizQuestion#getCreationForm($form_state) + */ + public function getCreationForm(array &$form_state = NULL) { + $form['rubric'] = array( + '#type' => 'textarea', + '#title' => t('Rubric'), + '#description' => t('Specify the criteria for grading the response.'), + '#default_value' => isset($this->node->rubric) ? $this->node->rubric : '', + '#size' => 60, + '#maxlength' => 2048, + '#required' => FALSE, + ); + return $form; + } + + /** + * Implementation of getMaximumScore + * + * @see QuizQuestion#getMaximumScore() + */ + public function getMaximumScore() { + return variable_get('long_answer_default_max_score', 10); + } + +} + +/** + * Extension of QuizQuestionResponse + */ +class LongAnswerResponse extends QuizQuestionResponse { + + /** + * Get all scores that have not yet been evaluated. + * + * @param $count + * Number of items to return (default: 50). + * @param $offset + * Where in the results we should start (default: 0). + * + * @return + * Array of objects describing unanswered questions. Each object will have result_id, question_nid, and question_vid. + */ + public static function fetchAllUnscoredAnswers($count = 50, $offset = 0) { + global $user; + + $query = db_select('quiz_long_answer_user_answers', 'answer'); + $query->fields('answer', array('result_id', 'question_nid', 'question_vid', 'answer_feedback', 'answer_feedback_format')); + $query->fields('question_revision', array('title')); + $query->fields('qr', array('time_end', 'time_start', 'uid')); + $query->join('node_revision', 'question_revision', 'answer.question_vid = question_revision.vid'); + $query->join('quiz_results', 'qr', 'answer.result_id = qr.result_id'); + $query->join('quiz_entity', 'quiz', 'qr.quiz_qid = quiz.qid'); + $query->condition('answer.is_evaluated', 0); + + if (user_access('score own quiz') && user_access('score taken quiz answer')) { + $query->condition(db_or()->condition('quiz.uid', $user->uid)->condition('qr.uid', $user->uid)); + } + elseif (user_access('score own quiz')) { + $query->condition('quiz.uid', $user->uid); + } + elseif (user_access('score taken quiz answer')) { + $query->condition('qr.uid', $user->uid); + } + + $unscored = array(); + foreach ($query->execute() as $row) { + $unscored[] = $row; + } + return $unscored; + } + + /** + * Given a quiz, return a list of all of the unscored answers. + * + * @param $nid + * Node ID for the quiz to check. + * @param $vid + * Version ID for the quiz to check. + * @param $count + * Number of items to return (default: 50). + * @param $offset + * Where in the results we should start (default: 0). + * + * @return + * Indexed array of result IDs that need to be scored. + */ + public static function fetchUnscoredAnswersByQuestion($nid, $vid, $count = 50, $offset = 0) { + $results = db_query('SELECT result_id FROM {quiz_long_answer_user_answers} + WHERE is_evaluated = :is_evaluated + AND question_nid = :question_nid + AND question_vid = :question_vid', array(':is_evaluated' => 0, ':question_nid' => $nid, ':question_vid' => $vid)); + $unscored = array(); + foreach ($results as $row) { + $unscored[] = $row->result_id; + } + return $unscored; + } + + /** + * ID of the answer. + */ + protected $answer_id = 0; + + /** + * Constructor + */ + public function __construct($result_id, stdClass $question_node, $answer = NULL) { + parent::__construct($result_id, $question_node, $answer); + + if (!isset($answer)) { + // Question has been answered allready. We fetch the answer data from the database. + $r = db_query('SELECT answer_id, answer, is_evaluated, score, question_vid, question_nid, result_id, answer_feedback, answer_feedback_format + FROM {quiz_long_answer_user_answers} + WHERE question_nid = :qnid AND question_vid = :qvid AND result_id = :rid', array(':qnid' => $question_node->nid, ':qvid' => $question_node->vid, ':rid' => $result_id))->fetch(); + + if (!empty($r)) { + $this->answer = $r->answer; + $this->score = $r->score; + $this->evaluated = $r->is_evaluated; + $this->answer_id = $r->answer_id; + $this->answer_feedback = $r->answer_feedback; + $this->answer_feedback_format = $r->answer_feedback_format; + } + } + else { + $this->answer = $answer; + $this->evaluated = FALSE; + } + } + + /** + * Implementation of save + * + * @see QuizQuestionResponse#save() + */ + public function save() { + $this->answer_id = db_insert('quiz_long_answer_user_answers') + ->fields(array( + 'answer' => $this->answer, + 'question_nid' => $this->question->nid, + 'question_vid' => $this->question->vid, + 'result_id' => $this->result_id, + )) + ->execute(); + } + + /** + * Implementation of delete + * + * @see QuizQuestionResponse#delete() + */ + public function delete() { + db_delete('quiz_long_answer_user_answers') + ->condition('question_nid', $this->question->nid) + ->condition('question_vid', $this->question->vid) + ->condition('result_id', $this->result_id) + ->execute(); + } + + /** + * Implementation of score + * + * @see QuizQuestionResponse#score() + */ + public function score() { + return (int) db_query('SELECT score FROM {quiz_long_answer_user_answers} + WHERE result_id = :result_id AND question_vid = :question_vid', array(':result_id' => $this->result_id, ':question_vid' => $this->question->vid))->fetchField(); + } + + /** + * Implementation of getResponse + * + * @see QuizQuestionResponse#getResponse() + */ + public function getResponse() { + return $this->answer; + } + + /** + * Implementation of getReportFormResponse + */ + public function getReportFormResponse() { + $data = array(); + + $data[] = array( + 'choice' => '', + 'attempt' => $this->answer, + 'correct' => !$this->evaluated ? t('This answer has not yet been scored.') : '', + 'score' => $this->getScore(), + 'answer_feedback' => check_markup($this->answer_feedback, $this->answer_feedback_format), + 'question_feedback' => '', + 'solution' => $this->question->rubric, + ); + + return $data; + } + + public function getReportFormAnswerFeedback() { + return array( + '#title' => t('Enter feedback'), + '#type' => 'text_format', + '#default_value' => isset($this->answer_feedback) ? check_markup($this->answer_feedback, $this->answer_feedback_format) : '', + '#format' => isset($this->answer_feedback_format) ? $this->answer_feedback_format : filter_default_format(), + '#attributes' => array('class' => array('quiz-report-score')), + ); + } + + /** + * Implementation of getReportFormSubmit + * + * @see QuizQuestionResponse#getReportFormSubmit() + */ + public function getReportFormSubmit() { + return 'long_answer_report_submit'; + } + + /** + * Implements QuizQuestionResponse::getReportFormValidate(). + */ + public function getReportFormValidate(&$element, &$form_state) { + $max = $this->question->max_score; + // Check to make sure that entered score is not higher than max allowed score. + if ($element['score']['#value'] > $max) { + form_error($element['score'], t('The score needs to be a number between @min and @max', array('@min' => 0, '@max' => $max))); + } + } + +} diff --git a/modules/question_types/long_answer/long_answer.info b/modules/question_types/long_answer/long_answer.info new file mode 100644 index 0000000..629e1ce --- /dev/null +++ b/modules/question_types/long_answer/long_answer.info @@ -0,0 +1,9 @@ +name = Long Answer +package = Quiz Question +description = This provides long answer (essay, multi-paragraph) question types for use by the Quiz module. +dependencies[] = quiz +dependencies[] = quiz_question +core = 7.x + +files[] = long_answer.classes.inc +files[] = tests/LongAnswerUnitTest.test diff --git a/modules/question_types/long_answer/long_answer.install b/modules/question_types/long_answer/long_answer.install new file mode 100644 index 0000000..4d8a89f --- /dev/null +++ b/modules/question_types/long_answer/long_answer.install @@ -0,0 +1,139 @@ + array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'rubric' => array( + 'type' => 'text', + ), + ), + 'primary key' => array('nid', 'vid'), + ); + + // User answers go in here. + $schema['quiz_long_answer_user_answers'] = array( + 'fields' => array( + 'answer_id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question_nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question_vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'result_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'score' => array( + 'type' => 'float', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'is_evaluated' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'size' => 'tiny', + 'default' => 0, + 'not null' => TRUE, + ), + 'answer' => array( + 'type' => 'text' + ), + 'answer_feedback' => array( + 'type' => 'text' + ), + 'answer_feedback_format' => array( + 'type' => 'varchar', + 'length' => 255, + ), + ), + 'primary key' => array('answer_id'), + 'unique keys' => array( + 'ids' => array('result_id', 'question_nid', 'question_vid'), + ), + ); + + return $schema; +} + +/** + * Adding feedback field to table {quiz_long_answer_user_answers} + */ +function long_answer_update_7401() { + $spec = array( + 'type' => 'text', + 'not null' => FALSE, + ); + db_add_field('quiz_long_answer_user_answers', 'answer_feedback', $spec); +} + +/** + * Adding feedback format field to table {quiz_long_answer_user_answers} + */ +function long_answer_update_7402() { + if (!db_field_exists('quiz_long_answer_user_answers', 'answer_feedback_format')) { + $spec = array( + 'type' => 'varchar', + 'length' => 255, + ); + db_add_field('quiz_long_answer_user_answers', 'answer_feedback_format', $spec); + } +} \ No newline at end of file diff --git a/modules/question_types/long_answer/long_answer.module b/modules/question_types/long_answer/long_answer.module new file mode 100644 index 0000000..1babdfa --- /dev/null +++ b/modules/question_types/long_answer/long_answer.module @@ -0,0 +1,309 @@ +' . t('This module provides long-answer (essay, multi-paragraph) questions to the quiz module.') . + '

' . t('A long-answer question is designed to provide the quiz taker a lengthy area to expand on ideas. + Common forms of long-answer questions include essays, single paragraph responses, hypothesis design problems, + outlines and summaries, and lengthier math problems + where the focus is on showing work rather than simply getting the correct answer.') . '

'; + } +} + +/** + * Implements hook_menu(). + */ +function long_answer_menu() { + $items['admin/quiz/reports/score-long-answer'] = array( + 'title' => 'Score long answer questions', + 'description' => 'Score the answers from quizzes that use long answer questions.', + 'page callback' => 'long_answer_view_unscored', + 'access arguments' => array('score any quiz', 'score own quiz', 'score taken quiz answer'), + 'access callback' => 'quiz_access_multi_or', + 'type' => MENU_NORMAL_ITEM, + 'file' => 'long_answer.admin.inc', + ); + // Pass vid and rid to this path. + $items['admin/quiz/reports/score-long-answer/%/%'] = array( + 'title' => 'Score long answer response', + 'description' => 'Score a response to a long answer question.', + 'page callback' => 'long_answer_edit_score', + 'page arguments' => array(4, 5), + 'type' => MENU_NORMAL_ITEM, + 'access arguments' => array(4, 5), + 'access callback' => 'quiz_question_access_to_score', + 'file' => 'long_answer.admin.inc' + ); + + return $items; +} + +/** + * Implements hook_quiz_question_info(). + */ +function long_answer_quiz_question_info() { + return array( + 'long_answer' => array( + 'name' => t('Long answer question'), + 'description' => t('Quiz questions that allow a user to enter multiple paragraphs of text.'), + 'question provider' => 'LongAnswerQuestion', + 'response provider' => 'LongAnswerResponse', + 'module' => 'quiz_question', // All wrapper functions are in that module. + ), + ); +} + +/** + * Implements hook_quiz_question_config(). + */ +function long_answer_quiz_question_config() { + $form['long_answer_default_max_score'] = array( + '#type' => 'textfield', + '#title' => t('Default max score'), + '#description' => t('Choose the default maximum score for a long answer question.'), + '#default_value' => variable_get('long_answer_default_max_score', 10), + ); + $form['#validate'][] = 'long_answer_config_validate'; + return $form; +} + +/** + * Validate the long_answer config form values + */ +function long_answer_config_validate($form, $form_state) { + if ($form_state['values']['long_answer_default_max_score'] <= 0) { + form_set_error('long_answer_default_max_score', t('The default max score must be greater than 0')); + } +} + +/** + * Implements hook_theme(). + */ +function long_answer_theme() { + return array( + 'long_answer_view_unscored' => array( + 'variables' => array('unscored' => array()), + 'path' => drupal_get_path('module', 'long_answer') . '/theme', + 'file' => 'long_answer.theme.inc', + ), + 'long_answer_response_form' => array( + 'render element' => 'form', + 'path' => drupal_get_path('module', 'long_answer') . '/theme', + 'file' => 'long_answer.theme.inc', + ), + 'long_answer_answering_form' => array( + 'render element' => 'form', + 'path' => drupal_get_path('module', 'long_answer') . '/theme', + 'template' => 'long-answer-answering-form', + ), + ); +} + +/** + * Set a score for a long answer question. + * + * This stores a score for a long answer question and marks that question as having been evaluated. + * The function updates all of the necessary data sources so that the individual answer results should be + * reflected in the total scoring table. + * + * @param $quiz + * Quiz entity. + * @param $nid + * Node ID of question. + * @param $vid + * Version ID of question. + * @param $result_id + * Result ID for the quiz results. + * @param $score + * The numeric score to assign the result. + * @param $update_total + * Shall the total score be updated? + * + * @return int + * Number of scores adjusted. If a change was made, this should be 1. + */ +function long_answer_score_an_answer($values, $update_total = TRUE) { + extract($values); + // Quiz scoring information is spread out across three tables: + // 1. The module should retain its own scoring information in any case where scoring is non-trivial. + // 2. The Quiz moduleretains a limited amount of scoring information. + // 3. The Quiz module retains an overall score for a quiz. This is the percentage score for the combination of all + // questions on the quiz. + // + // We update all three. + // First, we update the long answer table + $question_max_score = db_query('SELECT max_score FROM {quiz_question_properties} WHERE nid = :nid AND vid = :vid', array(':nid' => $nid, ':vid' => $vid))->FetchField(); + + $quiz_max_score = db_query('SELECT max_score FROM {quiz_relationship} WHERE quiz_vid = :pvid AND question_vid = :cvid', array(':pvid' => $quiz->vid, ':cvid' => $vid))->fetchField(); + + $changed = db_update('quiz_long_answer_user_answers') + ->fields(array( + 'score' => $score * $question_max_score / $quiz_max_score, + 'is_evaluated' => 1, + 'answer_feedback' => isset($answer_feedback['value']) ? $answer_feedback['value'] : '', + 'answer_feedback_format' => empty($answer_feedback['format']) ? '' : $answer_feedback['format'], + )) + ->condition('question_nid', $nid) + ->condition('question_vid', $vid) + ->condition('result_id', $result_id) + ->execute(); + if ($changed > 0) { + // Second, we update the main quiz answers table + // What do we do about the quiz_results_answers table? It assumes strict + // bivalence (is_correct). I guess we consider any essay with over 50% to be correct? + $max = db_query('SELECT max_score FROM {quiz_question_properties} WHERE vid = :vid', array(':vid' => $vid))->fetchField(); + if ($max <= 0) { + $is_correct = 0; + $points_awarded = 0; + } + else { + $is_correct = $score == $max ? 1 : 0; + $points_awarded = $score; + } + + db_update('quiz_results_answers') + ->fields(array( + 'points_awarded' => $points_awarded, + 'is_correct' => $is_correct, + )) + ->condition('question_vid', $vid) + ->condition('result_id', $result_id) + ->execute(); + + // Third, we update the main quiz results table + if ($update_total) { + quiz()->getQuizHelper()->getResultHelper()->updateTotalScore($quiz, $result_id); + } + } + + return $changed; +} + +/** + * Get the answer for a question. + * + * This stores a score for a long answer question and marks that question as having been evaluated. + * @param $nid + * Node ID of question. + * @param $vid + * Version ID of question. + * @param $result_id + * Result ID for the quiz results. + * + * @return Assoc array + * An array if successful, or FALSE if no result could be found. The array contains the following properties: + * + * answer_id; // The answer ID + * answer; // The full text of the answer + * is_evaluated; // 0 if the question has not been evaluated, 1 if it has + * score; // The score the evaluator gave the user; this should be 0 if is_evaluated is 0. + * question_vid + * question_nid + * result_id + * + */ +function long_answer_get_answer($question_nid, $question_vid, $result_id) { + $result = db_query(' + SELECT answer_id, answer, la.is_evaluated, la.score, question_vid, question_nid, la.result_id, la.answer_feedback, la.answer_feedback_format, rel.max_score AS rel_max_score + FROM {quiz_long_answer_user_answers} la + JOIN {quiz_results} qnr ON (la.result_id = qnr.result_id) + JOIN {quiz_relationship} rel ON (qnr.quiz_vid = rel.quiz_vid AND rel.question_vid = la.question_vid) + WHERE question_nid = :qnid AND question_vid = :qvid AND la.result_id = :rid', array(':qnid' => $question_nid, ':qvid' => $question_vid, ':rid' => $result_id))->fetchAssoc(); + return $result ? $result : FALSE; +} + +/** + * Given a quiz, return a list of all the unscored answers. + * + * @param $nid + * Node ID for the quiz to check. + * @param $vid + * Version ID for the quiz to check. + * @param $count + * Number of items to return (default: 50). + * @param $offset + * Where in the results we should start (default: 0). + * + * @return + * Indexed array of result IDs that need to be scored. + */ +function long_answer_get_unscored_answers_by_question($nid, $vid, $count = 50, $offset = 0) { + $results = db_query('SELECT result_id FROM {quiz_long_answer_user_answers} + WHERE is_evaluated = :is_evaluated AND question_nid = :question_nid AND question_vid = :question_vid', array(':is_evaluated' => 0, ':question_nid' => $nid, ':question_vid' => $vid)); + + $unscored = array(); + foreach ($results as $result) { + $unscored[] = $result->result_id; + } + return $unscored; +} + +/** + * Get all quiz scores that have not yet been evaluated. + * + * @param $count + * Number of items to return (default: 50). + * @param $offset + * Where in the results we should start (default: 0). + * + * @return + * Array of objects describing unanswered questions. Each object will have result_id, question_nid, and question_vid. + */ +function long_answer_get_all_unscored_answers($count = 50, $offset = 0) { + $unscored = LongAnswerResponse::fetchAllUnscoredAnswers(); + return $unscored; +} + +/** + * Generate a list of long answer questions + * + * @return + * array containing nid as key and title as value + */ +function long_answer_questions_list() { + $questions = array(); + $query = db_query('SELECT nid, title FROM {node} WHERE type = :type', array(':type' => 'long_answer')); + foreach ($query as $question) { + $questions[$question->nid] = check_plain($question->title); + } + return $questions; +} + +/** + * Submit function for the report form + * + * @param $values + * The FAPI $form_state['values'] + */ +function long_answer_report_submit($values) { + long_answer_score_an_answer($values, FALSE); +} + +/** + * Implements hook_field_extra_fields(). + */ +function long_answer_field_extra_fields() { + $extra['node']['long_answer'] = array( + 'form' => array( + 'rubric' => array( + 'label' => t('Rubric'), + 'description' => t('Specify the criteria for grading the response'), + 'weight' => -4, + ), + ), + ); + return $extra; +} diff --git a/modules/question_types/long_answer/tests/LongAnswerUnitTest.test b/modules/question_types/long_answer/tests/LongAnswerUnitTest.test new file mode 100644 index 0000000..95e0929 --- /dev/null +++ b/modules/question_types/long_answer/tests/LongAnswerUnitTest.test @@ -0,0 +1,97 @@ + t('Long answer'), + 'description' => t('Unit test for Long answers question type.'), + 'group' => t('Quiz'), + ); + } + + public function setUp() { + parent::setUp(array('long_answer'), array('score any quiz')); + } + + /** + * Test manually graded questions. Also test feedback here instead of its own + * test case. + * + * Note: we use two questions here to make sure the grading form is handled + * correctly. + */ + public function testGradeAnswerManualFeedback() { + $this->drupalLogin($this->admin); + + $question_node1 = $this->testCreateQuizQuestion(); + $quiz = $this->linkQuestionToQuiz($question_node1); + + $question_node2 = $this->testCreateQuizQuestion(); + $this->linkQuestionToQuiz($question_node2, $quiz); + + // Test correct. + $this->drupalLogin($this->user); + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array("question[$question_node1->nid]" => 'the answer is the zero one infinity rule'), t('Next')); + $this->drupalPost(NULL, array("question[$question_node2->nid]" => 'the number two really is ridiculous'), t('Finish')); + $this->assertText('Your score: 0%'); + + // Strange behavior - extra spacing in the HTML. + // $this->assertText('Score ? of 10'); + $this->assertText('This answer has not yet been scored.'); + $this->assertNoFieldByName('0[score]'); + $this->assertNoFieldByName('1[score]'); + $url_of_result = $this->getUrl(); + + // Test grading the question. + $this->drupalLogin($this->admin); + $this->drupalGet($url_of_result); + $this->drupalPost(NULL, array( + "0[score]" => 3, + "1[score]" => 7, + "0[answer_feedback][value]" => 'Feedback for answer 1.', + "1[answer_feedback][value]" => 'Feedback for answer 2.', + "0[answer_feedback][format]" => 'filtered_html', + "1[answer_feedback][format]" => 'filtered_html'), t('Save score')); + $this->assertText('The scoring data you provided has been saved.'); + + // Test the score and feedback are visible to the user. + $this->drupalLogin($this->user); + $this->drupalGet($url_of_result); + $this->assertText('You got 10 of 20 possible points.'); + $this->assertText('Your score: 50%'); + + // Strange behavior - extra spacing in the HTML. + // $this->assertText('Score 3 of 10'); + // $this->assertText('Score 7 of 10'); + $this->assertText('Feedback for answer 1.'); + $this->assertText('Feedback for answer 2.'); + } + + /** + * Test adding and taking a truefalse question. + */ + function testCreateQuizQuestion($settings = NULL) { + if (!$settings) { + $settings = array('rubric' => 'LA 1 rubric.'); + } + + // Login as our privileged user. + $this->drupalLogin($this->admin); + + $question_node = $this->drupalCreateNode(array( + 'type' => $this->question_node_type, + 'title' => 'LA 1 title', + 'body' => array(LANGUAGE_NONE => array(array('value' => 'LA 1 body text.'))), + ) + $settings); + + return $question_node; + } + +} diff --git a/modules/question_types/long_answer/theme/long-answer-answering-form.tpl.php b/modules/question_types/long_answer/theme/long-answer-answering-form.tpl.php new file mode 100644 index 0000000..b487a9c --- /dev/null +++ b/modules/question_types/long_answer/theme/long-answer-answering-form.tpl.php @@ -0,0 +1,12 @@ + diff --git a/modules/question_types/long_answer/theme/long_answer.theme.inc b/modules/question_types/long_answer/theme/long_answer.theme.inc new file mode 100644 index 0000000..f245a76 --- /dev/null +++ b/modules/question_types/long_answer/theme/long_answer.theme.inc @@ -0,0 +1,47 @@ +time_end > 0) { + $rows[] = array( + check_plain($item->title), + date('Y-m-d H:i', $item->time_end), + l(t('Score this response'), 'admin/quiz/reports/score-long-answer/' . $item->question_vid . '/' . $item->result_id), + ); + } + } + $output .= !empty($rows) ? theme('table', array('header' => $header, 'rows' => $rows)) : t('There are no unscored essays.'); + return $output; +} + +/** + * Theme the long_answer response form + * + * @param $form + * The response form + */ +function theme_long_answer_response_form($variables) { + $form = $variables['form']; + return drupal_render_children($form); +} diff --git a/modules/question_types/matching/matching.classes.inc b/modules/question_types/matching/matching.classes.inc new file mode 100644 index 0000000..a51061d --- /dev/null +++ b/modules/question_types/matching/matching.classes.inc @@ -0,0 +1,560 @@ +node->match)) { + $this->node->match = array(); + } + } + + /** + * Implementation of saveNodeProperties + * + * @see QuizQuestion#saveNodeProperties($is_new) + */ + public function saveNodeProperties($is_new = FALSE) { + // Update or insert the question properties + if ($is_new) { + db_insert('quiz_matching_properties') + ->fields(array( + 'nid' => $this->node->nid, + 'vid' => $this->node->vid, + 'choice_penalty' => $this->node->choice_penalty, + )) + ->execute(); + } + else { + db_update('quiz_matching_properties') + ->fields(array( + 'choice_penalty' => $this->node->choice_penalty, + )) + ->condition('nid', $this->node->nid) + ->condition('vid', $this->node->vid) + ->execute(); + } + + // Loop through each question-answer combination + foreach ($this->node->match as $match) { + $match['feedback'] = (isset($match['feedback'])) ? $match['feedback'] : ''; + // match_id is not so it is a new question. + if ($is_new || empty($match['match_id']) || $this->node->revision || isset($this->node->node_export_drupal_version)) { + if (!empty($match['question']) && !empty($match['answer'])) { + $id = db_insert('quiz_matching_node') + ->fields(array( + 'nid' => $this->node->nid, + 'vid' => $this->node->vid, + 'question' => $match['question'], + 'answer' => $match['answer'], + 'feedback' => $match['feedback'], + )) + ->execute(); + } + } + // match_id is set, user may remove or update existing question. + else { + if (empty($match['question']) && empty($match['answer'])) { + // remove sub question. + db_delete('quiz_matching_node') + ->condition('match_id', $match['match_id']) + ->execute(); + } + else { + // update sub question. + db_update('quiz_matching_node') + ->fields(array( + 'question' => $match['question'], + 'answer' => $match['answer'], + 'feedback' => $match['feedback'], + )) + ->condition('match_id', $match['match_id']) + ->execute(); + } + } + } + } + + /** + * Implementation of validateNode + * + * @see QuizQuestion#validateNode($form) + */ + public function validateNode(array &$form) { + // No validation is required + // The first two pairs are required in the form, if there are other errors we forgive them + } + + /** + * Implementation of delete + * + * @see QuizQuestion#delete($only_this_version) + */ + public function delete($only_this_version = FALSE) { + parent::delete($only_this_version); + + $delete_properties = db_delete('quiz_matching_properties')->condition('nid', $this->node->nid); + + if ($only_this_version) { + $delete_properties->condition('vid', $this->node->vid); + + $match_id = db_query('SELECT match_id FROM {quiz_matching_node} WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid))->fetchCol(); + db_delete('quiz_matching_user_answers') + ->condition('match_id', is_array($match_id) ? $match_id : array(0), 'IN') + ->execute(); + + db_delete('quiz_matching_node') + ->condition('nid', $this->node->nid) + ->condition('vid', $this->node->vid) + ->execute(); + } + // Delete all versions of this question. + else { + $match_id = db_query('SELECT match_id FROM {quiz_matching_node} WHERE nid = :nid', array(':nid' => $this->node->nid))->fetchCol(); + if (!empty($match_id)) { + db_delete('quiz_matching_user_answers') + ->condition('match_id', $match_id, 'IN') + ->execute(); + } + + db_delete('quiz_matching_node') + ->condition('nid', $this->node->nid) + ->execute(); + } + + $delete_properties->execute(); + } + + /** + * Implementation of getNodeProperties + * + * @see QuizQuestion#getNodeProperties() + */ + public function getNodeProperties() { + if (isset($this->nodeProperties)) { + return $this->nodeProperties; + } + $props = parent::getNodeProperties(); + + $res_a = db_query('SELECT choice_penalty FROM {quiz_matching_properties} + WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid))->fetchAssoc(); + + if (is_array($res_a)) { + $props = array_merge($props, $res_a); + } + + //$sql = "SELECT match_id, question, answer, feedback FROM {quiz_matching_node} WHERE nid = %d AND vid = %d"; + $query = db_query('SELECT match_id, question, answer, feedback FROM {quiz_matching_node} WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid)); + while ($result = $query->fetch()) { + $props['match'][] = array( + 'match_id' => $result->match_id, + 'question' => $result->question, + 'answer' => $result->answer, + 'feedback' => $result->feedback, + ); + } + $this->nodeProperties = $props; + return $props; + } + + /** + * Implementation of getNodeView + * + * @see QuizQuestion#getNodeView() + */ + public function getNodeView() { + $content = parent::getNodeView(); + + list($matches, $select_option) = $this->getSubquestions(); + $subquestions = array(); + if ($this->viewCanRevealCorrect()) { + foreach ($matches as $match) { + $subquestions[] = array( + 'question' => $match['question'], + 'correct' => $match['answer'], + 'feedback' => $match['feedback'] + ); + } + } + else { + // shuffle the answer column + foreach ($matches as $match) { + $sub_qs[] = $match['question']; + $sub_as[] = $match['answer']; + } + shuffle($sub_as); + foreach ($sub_qs as $i => $sub_q) { + $subquestions[] = array( + 'question' => $sub_q, + 'random' => $sub_as[$i], + ); + } + } + $content['answers'] = array( + '#markup' => theme('matching_match_node_view', array('subquestions' => $subquestions)), + '#weight' => 2, + ); + return $content; + } + + /** + * Implementation of getAnsweringForm + * + * @see QuizQuestion#getAnsweringForm($form_state, $result_id) + */ + public function getAnsweringForm(array $form_state = NULL, $result_id) { + $form = parent::getAnsweringForm($form_state, $result_id); + + if (isset($result_id)) { + // The question has already been answered. We load the answers + $response = new MatchingResponse($result_id, $this->node); + $responses = $response->getResponse(); + } + list($matches, $select_option) = $this->getSubquestions(); + //$form['#theme'] = 'matching_subquestion_form'; + foreach ($matches as $match) { + $form[$match['match_id']] = array( + '#title' => $match['question'], + '#type' => 'select', + '#options' => $this->customShuffle($select_option), + ); + if ($responses) { + // If this question already has been answered + $form[$match['match_id']]['#default_value'] = $responses[$match['match_id']]; + } + } + if (variable_get('quiz_matching_shuffle_options', TRUE)) { + $form = $this->customShuffle($form); + } + $form['scoring_info'] = array( + '#markup' => '

' . t('You lose points by selecting incorrect options. You may leave an option blank to avoid losing points.') . '

', + ); + return $form; + } + + /** + * Question response validator. + */ + public function getAnsweringFormValidate(array &$form, array &$form_state = NULL) { + $question_answer = $form_state['values']['question'][$this->node->nid]; + foreach ($question_answer as $value) { + if ($value != 'def') { + return TRUE; + } + } + form_set_error('', t('You need to match at least one of the items.')); + } + + /** + * Shuffles an array, but keeps the keys, and makes sure the first element is the default element + * + * @param $array + * Array to be shuffled + * @return + * A shuffled version of the array with $array['def'] = '' as the first element + */ + private function customShuffle(array $array = array()) { + $new_array = array(); + $new_array['def'] = ''; + while (count($array)) { + $element = array_rand($array); + $new_array[$element] = $array[$element]; + unset($array[$element]); + } + return $new_array; + } + + /** + * Helper function to fetch subquestions + * + * @return + * Array with two arrays, matches and selected options + */ + public function getSubquestions() { + $matches = $select_option = array(); + //$sql = "SELECT match_id, question, answer, feedback FROM {quiz_matching_node} WHERE nid = %d AND vid = %d"; + $query = db_query('SELECT match_id, question, answer, feedback FROM {quiz_matching_node} WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid)); + while ($result = $query->fetch()) { + $matches[] = array( + 'match_id' => $result->match_id, + 'question' => $result->question, + 'answer' => $result->answer, + 'feedback' => $result->feedback, + ); + $select_option[$result->match_id] = $result->answer; + } + return array($matches, $select_option); + } + + /** + * Implementation of getBodyFieldTitle + * + * @see QuizQuestion#getBodyFieldTitle() + */ + public function getBodyFieldTitle() { + return t('Instruction'); + } + + /** + * Implementation of getCreationForm + * + * @see QuizQuestion#getCreationForm($form_state) + */ + public function getCreationForm(array &$form_state = NULL) { + // Get the nodes settings, users settings or default settings + $default_settings = $this->getDefaultAltSettings(); + + $form['settings'] = array( + '#type' => 'fieldset', + '#title' => t('Settings'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + $form['settings']['choice_penalty'] = array( + '#type' => 'checkbox', + '#title' => t('Penalty for guessing'), + '#description' => t('Subtract 1 point from the users score for each incorrect match. Scores cannot go below 0.'), + '#default_value' => $default_settings['choice_penalty'], + '#parents' => array('choice_penalty'), + ); + + $form['match'] = array( + '#type' => 'fieldset', + '#title' => t('Answer'), + '#weight' => -4, + '#tree' => TRUE, + '#theme' => 'matching_question_form', + '#description' => t('Write your pairs in the question and answer columns. For the user the question will be fixed and the answers will be shown as alternatives in a dropdown box.'), + ); + for ($i = 1; $i <= variable_get('quiz_matching_form_size', 5); ++$i) { + $form['match'][$i] = array( + '#type' => 'fieldset', + '#title' => t('Question ' . $i), + ); + $form['match'][$i]['match_id'] = array( + '#type' => 'value', + '#default_value' => isset($this->node->match[$i - 1]['match_id']) ? $this->node->match[$i - 1]['match_id'] : '' + ); + $form['match'][$i]['question'] = array( + '#type' => 'textarea', + '#rows' => 2, + '#default_value' => isset($this->node->match[$i - 1]['question']) ? $this->node->match[$i - 1]['question'] : '', + '#required' => $i < 3, + ); + $form['match'][$i]['answer'] = array( + '#type' => 'textarea', + '#rows' => 2, + '#default_value' => isset($this->node->match[$i - 1]['answer']) ? $this->node->match[$i - 1]['answer'] : '', + '#required' => $i < 3, + ); + + $form['match'][$i]['feedback'] = array( + '#type' => 'textarea', + '#rows' => 2, + '#default_value' => isset($this->node->match[$i - 1]['feedback']) ? $this->node->match[$i - 1]['feedback'] : '' + ); + } + return $form; + } + + /** + * Helper function provding the default settings for the creation form. + * + * @return + * Array with the default settings + */ + private function getDefaultAltSettings() { + // If the node is being updated the default settings are those stored in the node + if (isset($this->node->nid)) { + $settings['choice_penalty'] = $this->node->choice_penalty; + } + // The user is creating his first matching node + else { + $settings['choice_penalty'] = 0; + } + return $settings; + } + + /** + * Implementation of getMaximumScore + * + * @see QuizQuestion#getMaximumScore() + */ + public function getMaximumScore() { + $to_return = 0; + foreach ($this->node->match as $match) { + if (empty($match['question']) || empty($match['answer'])) { + continue; + } + $to_return++; + } + // The maximum score = the number of sub-questions + return $to_return; + } + + /** + * Get the correct answers for this question + * + * @return + * Array of correct answers + */ + public function getCorrectAnswer() { + $correct_answers = array(); + $query = db_query('SELECT match_id, question, answer, feedback FROM {quiz_matching_node} WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid)); + while ($result = $query->fetch()) { + $correct_answers[$result->match_id] = array( + 'match_id' => $result->match_id, + 'question' => $result->question, + 'answer' => $result->answer, + 'feedback' => $result->feedback, + ); + } + return $correct_answers; + } + +} + +/** + * Extension of QuizQuestionResponse + */ +class MatchingResponse extends QuizQuestionResponse { + + /** + * Constructor + */ + public function __construct($result_id, stdClass $question_node, $answer = NULL) { + parent::__construct($result_id, $question_node, $answer); + if (!isset($answer)) { + $res = db_query('SELECT ua.answer, score, ua.match_id FROM {quiz_matching_user_answers} ua + JOIN {quiz_matching_node} n ON n.match_id = ua.match_id + WHERE n.nid = :nid AND n.vid = :vid AND ua.result_id = :result_id', array(':nid' => $question_node->nid, ':vid' => $question_node->vid, ':result_id' => $result_id)); + $this->answer = array(); + while ($obj = $res->fetch()) { + $this->answer[$obj->match_id] = $obj->answer; + } + } + $this->is_correct = $this->isCorrect(); + } + + /** + * Implementation of save + * + * @see QuizQuestionResponse#save() + */ + public function save() { + if (!isset($this->answer) || !is_array($this->answer)) { + return; + } + $insert = db_insert('quiz_matching_user_answers')->fields(array('match_id', 'result_id', 'answer', 'score')); + foreach ($this->answer as $key => $value) { + $insert->values(array( + 'match_id' => $key, + 'result_id' => $this->result_id, + 'answer' => (int) $value, + 'score' => ($key == $value) ? 1 : 0, + )); + } + $insert->execute(); + } + + /** + * Implementation of delete + * + * @see QuizQuestionResponse#delete() + */ + public function delete() { + $match_id = db_query('SELECT match_id FROM {quiz_matching_node} WHERE nid = :nid AND vid = :vid', array(':nid' => $this->question->nid, ':vid' => $this->question->vid))->fetchCol(); + db_delete('quiz_matching_user_answers') + ->condition('match_id', is_array($match_id) ? $match_id : array(0), 'IN') + ->condition('result_id', $this->result_id) + ->execute(); + } + + /** + * Implementation of score + * + * @see QuizQuestionResponse#score() + */ + public function score() { + $wrong_answer = 0; + $correct_answer = 0; + $user_answers = isset($this->answer['answer']) ? $this->answer['answer'] : $this->answer; + $MatchingQuestion = new MatchingQuestion($this->question); + $correct_answers = $MatchingQuestion->getCorrectAnswer(); + foreach ((array) $user_answers as $key => $value) { + if ($value != 0 && $correct_answers[$key]['answer'] == $correct_answers[$value]['answer']) { + $correct_answer++; + } + elseif ($value == 0 || $value == 'def') { + + } + else { + $wrong_answer++; + } + } + + $score = $correct_answer; + if ($this->question->choice_penalty) { + $score -= $wrong_answer; + } + + return $score < 0 ? 0 : $score; + } + + /** + * Implementation of getResponse + * + * @see QuizQuestionResponse#getResponse() + */ + public function getResponse() { + return $this->answer; + } + + /** + * Implementation of getReportFormResponse + */ + public function getReportFormResponse() { + $data = array(); + $answers = $this->question->answers[0]['answer']; + $solution = $this->quizQuestion->getSubquestions(); + foreach ($this->question->match as $match) { + + $data[] = array( + 'choice' => $match['question'], + 'attempt' => !empty($answers[$match['match_id']]) ? $solution[1][$answers[$match['match_id']]] : '', + 'correct' => $answers[$match['match_id']] == $match['match_id'] ? theme('quiz_answer_result', array('type' => 'correct')) : theme('quiz_answer_result', array('type' => 'incorrect')), + 'score' => $answers[$match['match_id']] == $match['match_id'] ? 1 : 0, + 'answer_feedback' => $match['feedback'], + 'question_feedback' => 'Question feedback', + 'solution' => $solution[1][$match['match_id']], + 'quiz_feedback' => t('@quiz feedback', array('@quiz' => QUIZ_NAME)), + ); + } + + return $data; + } + +} diff --git a/modules/question_types/matching/matching.info b/modules/question_types/matching/matching.info new file mode 100644 index 0000000..a8dd1c8 --- /dev/null +++ b/modules/question_types/matching/matching.info @@ -0,0 +1,9 @@ +name = Matching question +package = Quiz Question +description = Provide a way to create matching type of questions. +core = 7.x +dependencies[] = quiz +dependencies[] = quiz_question + +files[] = matching.classes.inc +files[] = tests/MatchingUnitTest.test diff --git a/modules/question_types/matching/matching.install b/modules/question_types/matching/matching.install new file mode 100644 index 0000000..9273b5c --- /dev/null +++ b/modules/question_types/matching/matching.install @@ -0,0 +1,185 @@ + array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_penalty' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array( + 'nid', 'vid' + ), + ); + + $schema['quiz_matching_node'] = array( + 'fields' => array( + 'match_id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question' => array( + 'type' => 'text', + 'not null' => TRUE, + ), + 'answer' => array( + 'type' => 'text', + 'not null' => TRUE, + ), + 'feedback' => array( + 'type' => 'text', + 'not null' => TRUE, + ), + ), + 'primary key' => array('match_id'), + 'indexes' => array( + 'question_id' => array('nid', 'vid'), + ), + ); + + // User answers go in here. + $schema['quiz_matching_user_answers'] = array( + 'fields' => array( + 'answer_id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + + 'match_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'result_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'score' => array( + 'type' => 'int', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'answer' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array('answer_id'), + ); + + return $schema; +} + +/** + * Implements hook_update_N() + */ + +/** + * Add a table to store properties for the matching questions + */ +function matching_update_7400() { + $schema = array( + 'fields' => array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_penalty' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array( + 'nid', 'vid' + ), + ); + + db_create_table('quiz_matching_properties', $schema); + + // Insert default properties for all of the existing matching questions + $result = db_query("SELECT nid, vid FROM {node} WHERE type='matching'"); + + foreach ($result as $question) { + db_insert('quiz_matching_properties') + ->fields(array( + 'nid' => $question->nid, + 'vid' => $question->vid, + 'choice_penalty' => 0, + )) + ->execute(); + } +} diff --git a/modules/question_types/matching/matching.module b/modules/question_types/matching/matching.module new file mode 100644 index 0000000..55593bc --- /dev/null +++ b/modules/question_types/matching/matching.module @@ -0,0 +1,125 @@ + array( + 'name' => t('Matching'), + 'description' => t('Matching question type for quiz module. A question type for the quiz module: allows you to create matching type questions, which connect terms with one another.'), + 'question provider' => 'MatchingQuestion', + 'response provider' => 'MatchingResponse', + 'module' => 'quiz_question', // All wrapper functions are in that module. + ), + ); +} + +/** + * Implements hook_quiz_question_config(). + * + * @return FAPI array + */ +function matching_quiz_question_config() { + $form['quiz_matching_form_size'] = array( + '#type' => 'textfield', + '#title' => t('Match Question Size'), + '#description' => t('Number of questions allowed to wrap under a matching type question.'), + '#default_value' => variable_get('quiz_matching_form_size', 5), + ); + $form['quiz_matching_shuffle_options'] = array( + '#type' => 'checkbox', + '#title' => t('Shuffle Matching Questions'), + '#default_value' => variable_get('quiz_matching_shuffle_options', TRUE), + '#description' => t('If checked matching questions will be shuffled'), + ); + $form['#validate'][] = 'matching_config_validate'; + return $form; +} + +/** + * Validate the matching config form values + */ +function matching_config_validate($form, $form_state) { + if (!_quiz_is_int($form_state['values']['quiz_matching_form_size'], 2, 50)) { + form_set_error('quiz_matching_form_size', t('The number of questions must be between 2 and 50')); + } +} + +/** + * Implements hook_theme(). + */ +function matching_theme() { + return array( + 'matching_question_form' => array( + 'render element' => 'form', + 'path' => drupal_get_path('module', 'matching') . '/theme', + 'file' => 'matching.theme.inc', + ), + 'matching_response' => array( + 'variables' => array('metadata' => NULL, 'data' => NULL), + 'path' => drupal_get_path('module', 'matching') . '/theme', + 'file' => 'matching.theme.inc', + ), + 'matching_subquestion_form' => array( + 'render element' => 'form', + 'path' => drupal_get_path('module', 'matching') . '/theme', + 'file' => 'matching.theme.inc', + ), + 'matching_match_node_view' => array( + 'variables' => array('subquestions' => NULL), + 'path' => drupal_get_path('module', 'matching') . '/theme', + 'file' => 'matching.theme.inc', + ), + 'matching_answering_form' => array( + 'render element' => 'form', + 'path' => drupal_get_path('module', 'matching') . '/theme', + 'template' => 'matching-answering-form', + ), + + ); +} + +/** + * Implements hook_field_extra_fields(). + */ +function matching_field_extra_fields() { + $extra['node']['matching'] = array( + 'form' => array( + 'settings' => array( + 'label' => t('Settings'), + 'description' => t('The settings for the matching question.'), + 'weight' => -5, + ), + 'match' => array( + 'label' => t('Answer'), + 'description' => t('The sets of matches for this question.'), + 'weight' => -4, + ), + ), + ); + return $extra; +} diff --git a/modules/question_types/matching/tests/MatchingUnitTest.test b/modules/question_types/matching/tests/MatchingUnitTest.test new file mode 100644 index 0000000..4c5c86d --- /dev/null +++ b/modules/question_types/matching/tests/MatchingUnitTest.test @@ -0,0 +1,60 @@ + t('Matching'), + 'description' => t('Unit test for matching question type.'), + 'group' => t('Quiz'), + ); + } + + public function setUp() { + parent::setUp(array('matching')); + } + + /** + * function to create true false type question node for testing. + */ + public function testCreateQuizQuestion() { + // matching question node attributes + $this->title = $this->randomName(); + $this->body = $this->randomName(); + + // array of node attributes to create a test node + $settings = array( + 'type' => $this->question_node_type, + 'title' => $this->title, + 'body' => array(LANGUAGE_NONE => array(array('value' => $this->body))), + 'revisions' => TRUE, + 'choice_penalty' => 0, + ); + + $this->match = array(); + $form_size = variable_get('quiz_matching_form_size', 5); + // generate rand match question, answer and feedback + for ($i = 1; $i < $form_size; $i++) { + $settings['match'][$i]['question'] = $this->match[$i]['question'] = $this->randomName(); + $setting['match'][$i]['answer'] = $this->match[$i]['answer'] = $this->randomName(); + $settings['match'][$i]['feedback'] = $this->match[$i]['feedback'] = $this->randomName(); + } + + // create drupal node + $node = $this->drupalCreateNode($settings); + $load = node_load($node->nid); + + // @todo verify save + + return $load; + } + +} diff --git a/modules/question_types/matching/theme/matching-answering-form.tpl.php b/modules/question_types/matching/theme/matching-answering-form.tpl.php new file mode 100644 index 0000000..5410a07 --- /dev/null +++ b/modules/question_types/matching/theme/matching-answering-form.tpl.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/modules/question_types/matching/theme/matching.theme.inc b/modules/question_types/matching/theme/matching.theme.inc new file mode 100644 index 0000000..24c329e --- /dev/null +++ b/modules/question_types/matching/theme/matching.theme.inc @@ -0,0 +1,99 @@ + t('Question'), + 'answer' => t('Correct answer'), + 'feedback' => t('Feedback'), + ); + foreach (element_children($form) as $key) { + $rows[] = array( + 'question' => drupal_render($form[$key]['question']), + 'answer' => drupal_render($form[$key]['answer']), + 'feedback' => drupal_render($form[$key]['feedback']), + ); + } + // Theme output and display to screen. + return theme('table', array('header' => $header, 'rows' => $rows)); +} + +/** + * Theme the answering form + */ +function theme_matching_subquestion_form($variables) { + $form = $variables['form']; + $out = ''; + foreach ($form as $key => $value) { + if (is_int($key)) { + $out .= ''; + } + } + $out .= '
' . $value['#question']; + $out .= '' . drupal_render_children($value) . '
'; + return $out; +} + +/** + * Theme the answer part of the node view + * + * @param $subquestions + * Array with all the data in the subquestions. + */ +function theme_matching_match_node_view($variables) { + $subquestions = $variables['subquestions']; + // We know the correct answer for each subquestion + if (isset($subquestions[0]['correct'])) { + $header = array(t('Subquestion'), t('Correct match'), t('Feedback')); + } + // We do not know the correct answer for each subquestion + else { + $header = array(t('Subquestion'), t('Possible match')); + } + return theme('table', array('header' => $header, 'rows' => $subquestions)); +} + +/** + * Theme the contents of the matching response form + * + * @param $metadata + * Can be used as a table header + * @param $data + * Can be used as table rows + */ +function theme_matching_response($variables) { + $metadata = $variables['metadata']; + $data = $variables['data']; + if (isset($data[0]['is_correct'])) { + foreach ($data as $id => $match_data) { + if ($match_data['is_correct'] == 0) { + $theme = 'quiz_score_incorrect'; + } + if ($match_data['is_correct'] == 1) { + $theme = 'quiz_score_correct'; + } + if ($match_data['is_correct'] == 2) { + $theme = 'quiz_score_unknown'; + } + // TODO Please change this theme call to use an associative array for the $variables parameter. + $data[$id]['is_correct'] = array( + 'data' => theme($theme), + 'class' => 'quiz-summary-qcell', + ); + } + } + return theme('table', array('header' => $metadata, 'rows' => $data)); +} diff --git a/modules/question_types/multichoice/README.txt b/modules/question_types/multichoice/README.txt new file mode 100644 index 0000000..256dd47 --- /dev/null +++ b/modules/question_types/multichoice/README.txt @@ -0,0 +1,45 @@ + +/** + * @file + * README file for Quiz Multichoice. + */ + +Quiz Multichoice +Allows quiz creators to make a multiple choice question type. + +Sponsored by: Norwegian Centre for Telemedicine +Code: falcon + + +CONTENTS +-------- + +1. Introduction +2. Installation +3. Configuration + +---- +1. Introduction +This module is an attempt to make it easy to multiple choice questions using the quiz module. + +The multichoice module lets the user create single answer questions and multiple answer questions. +Advanced feedback and scoring options are also available. + +The multichoice module is based on the OO framework of the quiz project. + +---- +2. Installation + +To install, unpack the module to your modules folder, and simply enable the module at Admin > Build > Modules. + +Several database tables prefixed with quiz_multichoice are installed to have a separate storage for this module. + +---- +3. Configuration +Settings are to be found here: admin/quiz/questions_settings + +The only available setting is the number of default alternatives. This decides how many alternatives +will be shown on the node-form by default. The question creator can add more by pushing the +add more alternatives button, and he can always leave some alternatives blank if not all the shown +alternatives are needed. + diff --git a/modules/question_types/multichoice/js/multichoice.alternative.js b/modules/question_types/multichoice/js/multichoice.alternative.js new file mode 100644 index 0000000..56768f7 --- /dev/null +++ b/modules/question_types/multichoice/js/multichoice.alternative.js @@ -0,0 +1,25 @@ +(function ($, Drupal) { + + Drupal.behaviors.multichoiceAlternativeBehavior = { + attach: function (context, settings) { + $('.multichoice_row', context).once() + .filter(':has(:checkbox:checked)') + .addClass('selected').end() + .click(function (event) { + $(this).toggleClass('selected'); + if (event.target.type !== 'checkbox') { + $(':checkbox', this).attr('checked', function () { + return !this.checked; + }); + + $(':radio', this).attr('checked', true); + if ($(':radio', this).html() != null) { + $('.multichoice_row').removeClass('selected'); + $(this).addClass('selected'); + } + } + }); + } + }; + +})(jQuery, Drupal); diff --git a/modules/question_types/multichoice/js/multichoice.js b/modules/question_types/multichoice/js/multichoice.js new file mode 100644 index 0000000..90a4499 --- /dev/null +++ b/modules/question_types/multichoice/js/multichoice.js @@ -0,0 +1,91 @@ +var Multichoice = Multichoice || {}; + +(function ($) { + + Multichoice.refreshScores = function (checkbox, scoring) { + var prefix = '#' + Multichoice.getCorrectIdPrefix(checkbox.id); + if (checkbox.checked) { + $(prefix + 'score-if-chosen').val('1'); + $(prefix + 'score-if-not-chosen').val('0'); + } + else { + if (scoring == 0) { + $(prefix + 'score-if-not-chosen').val('0'); + if ($('#edit-choice-multi').attr('checked')) { + $(prefix + 'score-if-chosen').val('-1'); + } + else { + $(prefix + 'score-if-chosen').val('0'); + } + } + else if (scoring == 1) { + $(prefix + 'score-if-chosen').val('0'); + if ($('#edit-choice-multi').attr('checked')) { + $(prefix + 'score-if-not-chosen').val('1'); + } + else { + $(prefix + 'score-if-not-chosen').val('0'); + } + } + } + }; + + /** + * Updates correct checkboxes according to changes of the score values for an alternative + * + * @param textfield + * The textfield(score) that is being updated + */ + Multichoice.refreshCorrect = function (textfield) { + var prefix = '#' + Multichoice.getCorrectIdPrefix(textfield.id); + var chosenScore; + var notChosenScore; + + // Fetch the score if chosen and score if not chosen values for the active alternative + if (Multichoice.isChosen(textfield.id)) { + chosenScore = new Number(textfield.value); + notChosenScore = new Number($(prefix + 'score-if-not-chosen').val()); + } + else { + chosenScore = new Number($(prefix + 'score-if-chosen').val()); + notChosenScore = new Number(textfield.value); + } + + // Set the checked status for the checkbox in the active alternative + if (notChosenScore < chosenScore) { + $(prefix + 'correct').attr('checked', true); + } + else { + $(prefix + 'correct').attr('checked', false); + } + }; + + /** + * Helper function fetching the id prefix for a html id attribute + * + * @param string + * Html id attribute + * @return + * The common prefix for all the alternatives in this alternative fieldset + */ + Multichoice.getCorrectIdPrefix = function (string) { + // TODO: Will the regExp below always work? + var pattern = new RegExp("^(edit-alternatives-[0-9]{1,2}-)(?:correct|score-if-(?:not-|)chosen)$"); + pattern.exec(string); + return RegExp.lastParen; + }; + + /** + * Checks if the id belongs to the score if chosen textfield + * + * @param string + * html id attribute of one of the score text fields + * @return + * True if the string ends with "score-if-chosen", false otherwise. + */ + Multichoice.isChosen = function (string) { + var pattern = new RegExp("score-if-chosen$"); + return pattern.test(string); + }; + +})(jQuery); \ No newline at end of file diff --git a/modules/question_types/multichoice/multichoice.classes.inc b/modules/question_types/multichoice/multichoice.classes.inc new file mode 100644 index 0000000..989c77f --- /dev/null +++ b/modules/question_types/multichoice/multichoice.classes.inc @@ -0,0 +1,1024 @@ +node->choice_multi == 1) { + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = &$this->node->alternatives[$i]; + // If the scoring data doesn't make sense, use the data from the "correct" checkbox to set the score data + if ($short['score_if_chosen'] == $short['score_if_not_chosen'] || !is_numeric($short['score_if_chosen']) || !is_numeric($short['score_if_not_chosen'])) { + if (!empty($short['correct'])) { + $short['score_if_chosen'] = 1; + $short['score_if_not_chosen'] = 0; + } + else { + if (variable_get('multichoice_def_scoring', 0) == 0) { + $short['score_if_chosen'] = -1; + $short['score_if_not_chosen'] = 0; + } + elseif (variable_get('multichoice_def_scoring', 0) == 1) { + $short['score_if_chosen'] = 0; + $short['score_if_not_chosen'] = 1; + } + } + } + } + } + else { + // For questions with one, and only one, correct answer, there will be no points awarded for alternatives + // not chosen. + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = &$this->node->alternatives[$i]; + $short['score_if_not_chosen'] = 0; + if (isset($short['correct']) && $short['correct'] == 1 && !_quiz_is_int($short['score_if_chosen'], 1)) { + $short['score_if_chosen'] = 1; + } + } + } + } + + /** + * Warn the user about possible user errors + */ + private function warn() { + // Count the number of correct answers + $num_corrects = 0; + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $alt = &$this->node->alternatives[$i]; + if ($alt['score_if_chosen'] > $alt['score_if_not_chosen']) { + $num_corrects++; + } + } + if ($num_corrects == 1 && $this->node->choice_multi == 1 || $num_corrects > 1 && $this->node->choice_multi == 0) { + $link_options = array(); + if (isset($_GET['destination'])) { + $link_options['query'] = array('destination' => $_GET['destination']); + } + $go_back = l(t('go back'), 'node/' . $this->node->nid . '/edit', $link_options); + if ($num_corrects == 1) { + drupal_set_message( + t('Your question allows multiple answers. Only one of the alternatives have been marked as correct. If this wasn\'t intended please !go_back and correct it.', array('!go_back' => $go_back)), 'warning'); + } + else { + drupal_set_message( + t('Your question doesn\'t allow multiple answers. More than one of the alternatives have been marked as correct. If this wasn\'t intended please !go_back and correct it.', array('!go_back' => $go_back)), 'warning'); + } + } + } + + /** + * Run check_markup() on the field of the specified choice alternative + * @param $alternativeIndex + * The index of the alternative in the alternatives array. + * @param $field + * The name of the field we want to check markup on + * @param $check_user_access + * Whether or not to check for user access to the filter we're trying to apply + * @return HTML markup + */ + private function checkMarkup($alternativeIndex, $field, $check_user_access = FALSE) { + $alternative = $this->node->alternatives[$alternativeIndex]; + return check_markup($alternative[$field]['value'], $alternative[$field]['format']); + } + + /** + * Implementation of save + * + * Stores the question in the database. + * + * @param is_new if - if the node is a new node... + * (non-PHPdoc) + * @see sites/all/modules/quiz-HEAD/question_types/quiz_question/QuizQuestion#save() + */ + public function saveNodeProperties($is_new = FALSE) { + $is_new = $is_new || $this->node->revision == 1; + + // Before we save we forgive some possible user errors + $this->forgive(); + + // We also add warnings on other possible user errors + $this->warn(); + + if ($is_new) { + $id = db_insert('quiz_multichoice_properties') + ->fields(array( + 'nid' => $this->node->nid, + 'vid' => $this->node->vid, + 'choice_multi' => $this->node->choice_multi, + 'choice_random' => $this->node->choice_random, + 'choice_boolean' => $this->node->choice_boolean, + )) + ->execute(); + + // TODO: utilize the benefit of multiple insert of DBTNG + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + if (drupal_strlen($this->node->alternatives[$i]['answer']['value']) > 0) { + $this->insertAlternative($i); + } + } + } + else { + db_update('quiz_multichoice_properties') + ->fields(array( + 'choice_multi' => $this->node->choice_multi, + 'choice_random' => $this->node->choice_random, + 'choice_boolean' => $this->node->choice_boolean, + )) + ->condition('nid', $this->node->nid) + ->condition('vid', $this->node->vid) + ->execute(); + + // We fetch ids for the existing answers belonging to this question + // We need to figure out if an existing alternative has been changed or deleted. + $res = db_query('SELECT id FROM {quiz_multichoice_answers} + WHERE question_nid = :nid AND question_vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid)); + + // We start by assuming that all existing alternatives needs to be deleted + $ids_to_delete = array(); + while ($res_o = $res->fetch()) { + $ids_to_delete[] = $res_o->id; + } + + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = $this->node->alternatives[$i]; + if (drupal_strlen($this->node->alternatives[$i]['answer']['value']) > 0) { + // If new alternative + if (!is_numeric($short['id'])) { + $this->insertAlternative($i); + } + // If existing alternative + else { + $this->updateAlternative($i); + // Make sure this alternative isn't deleted + $key = array_search($short['id'], $ids_to_delete); + $ids_to_delete[$key] = FALSE; + } + } + } + foreach ($ids_to_delete as $id_to_delete) { + if ($id_to_delete) { + db_delete('quiz_multichoice_answers') + ->condition('id', $id_to_delete) + ->execute(); + } + } + } + $this->saveUserSettings(); + } + + function _normalizeAlternative($alternatives) { + $copy = $alternatives; + // answer + if (is_array($alternatives['answer']) && isset($alternatives['answer']['value'])) { + $copy['answer'] = $alternatives['answer']['value']; + } + // answer format + if (is_array($alternatives['answer']) && isset($alternatives['answer']['format'])) { + $copy['answer_format'] = $alternatives['answer']['format']; + } + // feedback if choosen + if (is_array($alternatives['feedback_if_chosen']) && isset($alternatives['feedback_if_chosen']['value'])) { + $copy['feedback_if_chosen'] = $alternatives['feedback_if_chosen']['value']; + } + // feedback if choosen foramt + if (is_array($alternatives['feedback_if_chosen']) && isset($alternatives['feedback_if_chosen']['format'])) { + $copy['feedback_if_chosen_format'] = $alternatives['feedback_if_chosen']['format']; + } + // feedback if not chosen + if (is_array($alternatives['feedback_if_not_chosen']) && isset($alternatives['feedback_if_not_chosen']['value'])) { + $copy['feedback_if_not_chosen'] = $alternatives['feedback_if_not_chosen']['value']; + } + // feedback if not chosen foramt + if (is_array($alternatives['feedback_if_not_chosen']) && isset($alternatives['feedback_if_not_chosen']['format'])) { + $copy['feedback_if_not_chosen_format'] = $alternatives['feedback_if_not_chosen']['format']; + } + return $copy; + } + + /** + * Helper function. Saves new alternatives + * + * @param $i + * The alternative index + */ + private function insertAlternative($i) { + $alternatives = $this->_normalizeAlternative($this->node->alternatives[$i]); + db_insert('quiz_multichoice_answers') + ->fields(array( + 'answer' => $alternatives['answer'], + 'answer_format' => $alternatives['answer_format'], + 'feedback_if_chosen' => $alternatives['feedback_if_chosen'], + 'feedback_if_chosen_format' => $alternatives['feedback_if_chosen_format'], + 'feedback_if_not_chosen' => $alternatives['feedback_if_not_chosen'], + 'feedback_if_not_chosen_format' => $alternatives['feedback_if_not_chosen_format'], + 'score_if_chosen' => $alternatives['score_if_chosen'], + 'score_if_not_chosen' => $alternatives['score_if_not_chosen'], + 'question_nid' => $this->node->nid, + 'question_vid' => $this->node->vid + )) + ->execute(); + } + + /** + * Helper function. Updates existing alternatives + * + * @param $i + * The alternative index + */ + private function updateAlternative($i) { + $alternatives = $this->_normalizeAlternative($this->node->alternatives[$i]); + db_update('quiz_multichoice_answers') + ->fields(array( + 'answer' => $alternatives['answer'], + 'answer_format' => $alternatives['answer_format'], + 'feedback_if_chosen' => $alternatives['feedback_if_chosen'], + 'feedback_if_chosen_format' => $alternatives['feedback_if_chosen_format'], + 'feedback_if_not_chosen' => $alternatives['feedback_if_not_chosen'], + 'feedback_if_not_chosen_format' => $alternatives['feedback_if_not_chosen_format'], + 'score_if_chosen' => $alternatives['score_if_chosen'], + 'score_if_not_chosen' => $alternatives['score_if_not_chosen'], + )) + ->condition('id', $alternatives['id']) + ->condition('question_nid', $this->node->nid) + ->condition('question_vid', $this->node->vid) + ->execute(); + } + + /** + * Implementation of validate + * + * QuizQuestion#validate() + */ + public function validateNode(array &$form) { + if ($this->node->choice_multi == 0) { + $found_one_correct = FALSE; + for ($i = 0; (isset($this->node->alternatives[$i]) && is_array($this->node->alternatives[$i])); $i++) { + $short = $this->node->alternatives[$i]; + if (drupal_strlen($this->checkMarkup($i, 'answer')) < 1) { + continue; + } + if ($short['correct'] == 1) { + if ($found_one_correct) { + // We don't display an error message here since we allow alternatives to be partially correct + } + else { + $found_one_correct = TRUE; + } + } + } + if (!$found_one_correct) { + form_set_error('choice_multi', t('You have not marked any alternatives as correct. If there are no correct alternatives you should allow multiple answers.')); + } + } + else { + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = $this->node->alternatives[$i]; + if (strlen($this->checkMarkup($i, 'answer')) < 1) { + continue; + } + if ($short['score_if_chosen'] < $short['score_if_not_chosen'] && $short['correct']) { + form_set_error("alternatives][$i][score_if_not_chosen", t('The alternative is marked as correct, but gives more points if you don\'t select it.')); + } + elseif ($short['score_if_chosen'] > $short['score_if_not_chosen'] && !$short['correct']) { + form_set_error("alternatives][$i][score_if_chosen", t('The alternative is not marked as correct, but gives more points if you select it.')); + } + } + } + } + + /** + * Implementation of delete + * + * @see QuizQuestion#delete() + */ + public function delete($only_this_version = FALSE) { + $delete_properties = db_delete('quiz_multichoice_properties')->condition('nid', $this->node->nid); + $delete_answers = db_delete('quiz_multichoice_answers')->condition('question_nid', $this->node->nid); + $delete_results = db_delete('quiz_multichoice_user_answers')->condition('question_nid', $this->node->nid); + + if ($only_this_version) { + $delete_properties->condition('vid', $this->node->vid); + $delete_answers->condition('question_vid', $this->node->vid); + $delete_results->condition('question_vid', $this->node->vid); + } + + // Delete from table quiz_multichoice_user_answer_multi + if ($only_this_version) { + $user_answer_id = db_query('SELECT id FROM {quiz_multichoice_user_answers} WHERE question_nid = :nid AND question_vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid))->fetchCol(); + } + else { + $user_answer_id = db_query('SELECT id FROM {quiz_multichoice_user_answers} WHERE question_nid = :nid', array(':nid' => $this->node->nid))->fetchCol(); + } + + if (!empty($user_answer_id)) { + db_delete('quiz_multichoice_user_answer_multi') + ->condition('user_answer_id', $user_answer_id, 'IN') + ->execute(); + } + $delete_properties->execute(); + $delete_answers->execute(); + $delete_results->execute(); + parent::delete($only_this_version); + } + + /** + * Implementation of getNodeProperties + * + * @see QuizQuestion#getNodeProperties() + */ + public function getNodeProperties() { + if (isset($this->nodeProperties) && !empty($this->nodeProperties)) { + return $this->nodeProperties; + } + $props = parent::getNodeProperties(); + + $res_a = db_query('SELECT choice_multi, choice_random, choice_boolean FROM {quiz_multichoice_properties} + WHERE nid = :nid AND vid = :vid', array(':nid' => $this->node->nid, ':vid' => $this->node->vid))->fetchAssoc(); + + if (is_array($res_a)) { + $props = array_merge($props, $res_a); + } + + // Load the answers + $res = db_query('SELECT id, answer, answer_format, feedback_if_chosen, feedback_if_chosen_format, + feedback_if_not_chosen, feedback_if_not_chosen_format, score_if_chosen, score_if_not_chosen + FROM {quiz_multichoice_answers} + WHERE question_nid = :question_nid AND question_vid = :question_vid + ORDER BY id', array(':question_nid' => $this->node->nid, ':question_vid' => $this->node->vid)); + $props['alternatives'] = array(); // init array so it can be iterated even if empty + while ($res_arr = $res->fetchAssoc()) { + $props['alternatives'][] = array( + 'id' => $res_arr['id'], + 'answer' => array( + 'value' => $res_arr['answer'], + 'format' => $res_arr['answer_format'], + ), + 'feedback_if_chosen' => array( + 'value' => $res_arr['feedback_if_chosen'], + 'format' => $res_arr['feedback_if_chosen_format'], + ), + 'feedback_if_not_chosen' => array( + 'value' => $res_arr['feedback_if_not_chosen'], + 'format' => $res_arr['feedback_if_not_chosen_format'], + ), + 'score_if_chosen' => $res_arr['score_if_chosen'], + 'score_if_not_chosen' => $res_arr['score_if_not_chosen'], + ); + } + $this->nodeProperties = $props; + return $props; + } + + /** + * Implementation of getNodeView + * + * @see QuizQuestion#getNodeView() + */ + public function getNodeView() { + $content = parent::getNodeView(); + if ($this->node->choice_random) { + $this->shuffle($this->node->alternatives); + } + $content['answers'] = array( + '#markup' => theme('multichoice_answer_node_view', array('alternatives' => $this->node->alternatives, 'show_correct' => $this->viewCanRevealCorrect())), + '#weight' => 2, + ); + + return $content; + } + + /** + * Generates the question element. + * + * This is called whenever a question is rendered, either + * to an administrator or to a quiz taker. + */ + public function getAnsweringForm(array $form_state = NULL, $result_id) { + $element = parent::getAnsweringForm($form_state, $result_id); + + /* We use an array looking key to be able to store multiple answers in tries. + * At the moment all user answers have to be stored in tries. This is something we plan + * to fix in quiz 5.x. + */ + $element['#theme'] = 'multichoice_alternative'; + if (isset($result_id)) { + // This question has already been answered. We load the answer. + $response = new MultichoiceResponse($result_id, $this->node); + } + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = $this->node->alternatives[$i]; + $answer_markup = check_markup($short['answer']['value'], $short['answer']['format']); + if (drupal_strlen($answer_markup) > 0) { + $element['user_answer']['#options'][$short['id']] = $answer_markup; + } + } + if ($this->node->choice_random) { + // We save the choice order so that the order will be the same in the answer report + $element['choice_order'] = array( + '#type' => 'hidden', + '#value' => implode(',', $this->shuffle($element['user_answer']['#options'])), + ); + } + if ($this->node->choice_multi) { + $element['user_answer']['#type'] = 'checkboxes'; + $element['user_answer']['#title'] = t('Choose all that apply'); + if (isset($response)) { + if (is_array($response->getResponse())) { + $element['#default_value'] = $response->getResponse(); + } + } + } + else { + $element['user_answer']['#type'] = 'radios'; + $element['user_answer']['#title'] = t('Choose one'); + if (isset($response)) { + $selection = $response->getResponse(); + if (is_array($selection)) { + $element['user_answer']['#default_value'] = array_pop($selection); + } + } + } + + return $element; + } + + /** + * Custom shuffle function. It keeps the array key - value relationship intact + * + * @param array $array + * @return unknown_type + */ + private function shuffle(array &$array) { + $newArray = array(); + $toReturn = array_keys($array); + shuffle($toReturn); + foreach ($toReturn as $key) { + $newArray[$key] = $array[$key]; + } + $array = $newArray; + return $toReturn; + } + + /** + * Implementation of getCreationForm + * + * @see QuizQuestion#getCreationForm() + */ + public function getCreationForm(array &$form_state = NULL) { + $form = array(); + $type = node_type_get_type($this->node); + // We add #action to the form because of the use of ajax + $options = array(); + $get = $_GET; + unset($get['q']); + if (!empty($get)) { + $options['query'] = $get; + } + + // TODO The second parameter to this function call should be an array. + $action = url('node/add/' . $type->type, $options); + if (isset($this->node->nid)) { + // TODO The second parameter to this function call should be an array. + $action = url('node/' . $this->node->nid . '/edit', $options); + } + $form['#action'] = $action; + + $form['alternatives'] = array( + '#type' => 'fieldset', + '#title' => t('Answer'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#weight' => -4, + '#tree' => TRUE, + ); + + // Get the nodes settings, users settings or default settings + $default_settings = $this->getDefaultAltSettings(); + + $form['alternatives']['settings'] = array( + '#type' => 'fieldset', + '#title' => t('Settings'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#description' => t('Your settings will be remembered.'), + ); + $form['alternatives']['settings']['choice_multi'] = array( + '#type' => 'checkbox', + '#title' => t('Multiple answers'), + '#description' => t('Allow any number of answers(checkboxes are used). If this box is not checked, one, and only one answer is allowed(radiobuttons are used).'), + '#default_value' => $default_settings['choice_multi'], + '#parents' => array('choice_multi'), + ); + $form['alternatives']['settings']['choice_random'] = array( + '#type' => 'checkbox', + '#title' => t('Random order'), + '#description' => t('Present alternatives in random order when @quiz is being taken.', array('@quiz' => QUIZ_NAME)), + '#default_value' => $default_settings['choice_random'], + '#parents' => array('choice_random'), + ); + $form['alternatives']['settings']['choice_boolean'] = array( + '#type' => 'checkbox', + '#title' => t('Simple scoring'), + '#description' => t('Give max score if everything is correct. Zero points otherwise.'), + '#default_value' => $default_settings['choice_boolean'], + '#parents' => array('choice_boolean'), + ); + + // Add helper tag where we will place the input selector for all the textareas. + $form['alternatives']['input_format_all'] = array( + '#markup' => '
', + ); + + $form['alternatives']['#theme'][] = 'multichoice_creation_form'; + $i = 0; + + // choice_count might be stored in the form_state after an ajax callback + if (isset($form_state['choice_count'])) { + $choice_count = $form_state['choice_count']; + } + else { + $choice_count = max(variable_get('multichoice_def_num_of_alts', 2), isset($this->node->alternatives) ? count($this->node->alternatives) : 0); + } + + for (; $i < $choice_count; $i++) { + $short = isset($this->node->alternatives[$i]) ? $this->node->alternatives[$i] : NULL; + $form['alternatives'][$i] = array( + '#type' => 'fieldset', + '#title' => t('Alternative !i', array('!i' => ($i + 1))), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + // - The two first alternatives won't be collapsed. + // - Populated alternatives won't be collapsed + ); + $form['alternatives'][$i]['#theme'][] = 'multichoice_alternative_creation'; + + if (is_array($short)) { + if ($short['score_if_chosen'] == $short['score_if_not_chosen']) { + $correct_default = isset($short['correct']) ? $short['correct'] : FALSE; + } + else { + $correct_default = $short['score_if_chosen'] > $short['score_if_not_chosen']; + } + } + else { + $correct_default = FALSE; + } + $form['alternatives'][$i]['correct'] = array( + '#type' => 'checkbox', + '#title' => t('Correct'), + '#default_value' => $correct_default, + '#attributes' => array('onchange' => 'Multichoice.refreshScores(this, ' . variable_get('multichoice_def_scoring', 0) . ')'), + ); + // We add id to be able to update the correct alternatives if the node is updated, without destroying + // existing answer reports + $form['alternatives'][$i]['id'] = array( + '#type' => 'value', + '#value' => $short['id'], + ); + + $form['alternatives'][$i]['answer'] = array( + '#type' => 'text_format', + '#base_type' => 'textarea', + '#title' => t('Alternative !i', array('!i' => ($i + 1))), + '#default_value' => $short['answer']['value'], + '#required' => $i < 2, + '#format' => isset($short['answer']['format']) ? $short['answer']['format'] : NULL, + '#rows' => 3, + ); + + $form['alternatives'][$i]['advanced'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['alternatives'][$i]['advanced']['feedback_if_chosen'] = array( + '#type' => 'text_format', + '#base_type' => 'textarea', + '#title' => t('Feedback if chosen'), + '#description' => t('This feedback is given to users who chooses this alternative.'), + '#parents' => array('alternatives', $i, 'feedback_if_chosen'), + '#default_value' => $short['feedback_if_chosen']['value'], + '#format' => isset($short['feedback_if_chosen']['format']) ? $short['feedback_if_chosen']['format'] : NULL, + '#rows' => 3, + ); + // We add 'helper' to trick the current version of the wysiwyg module to add an editor to several + // textareas in the same fieldset + $form['alternatives'][$i]['advanced']['helper']['feedback_if_not_chosen'] = array( + '#type' => 'text_format', + '#base_type' => 'textarea', + '#title' => t('Feedback if not chosen'), + '#description' => t('This feedback is given to users who doesn\'t choose this alternative.'), + '#parents' => array('alternatives', $i, 'feedback_if_not_chosen'), + '#default_value' => $short['feedback_if_not_chosen']['value'], + '#format' => isset($short['feedback_if_not_chosen']['format']) ? $short['feedback_if_not_chosen']['format'] : NULL, + '#rows' => 3, + ); + $default_value = isset($this->node->alternatives[$i]['score_if_chosen']) ? $this->node->alternatives[$i]['score_if_chosen'] : 0; + $form['alternatives'][$i]['advanced']['score_if_chosen'] = array( + '#type' => 'textfield', + '#title' => t('Score if chosen'), + '#size' => 4, + '#maxlength' => 4, + '#default_value' => $default_value, + '#description' => t("This score is added to the user's total score if the user chooses this alternative."), + '#attributes' => array( + 'onkeypress' => 'Multichoice.refreshCorrect(this)', + 'onkeyup' => 'Multichoice.refreshCorrect(this)', + 'onchange' => 'Multichoice.refreshCorrect(this)' + ), + '#parents' => array('alternatives', $i, 'score_if_chosen') + ); + + $default_value = $short['score_if_not_chosen']; + if (!isset($default_value)) { + $default_value = '0'; + } + $form['alternatives'][$i]['advanced']['score_if_not_chosen'] = array( + '#type' => 'textfield', + '#title' => t('Score if not chosen'), + '#size' => 4, + '#maxlength' => 4, + '#default_value' => $default_value, + '#description' => t("This score is added to the user's total score if the user doesn't choose this alternative. Only used if multiple answers are allowed."), + '#attributes' => array( + 'onkeypress' => 'Multichoice.refreshCorrect(this)', + 'onkeyup' => 'Multichoice.refreshCorrect(this)', + 'onchange' => 'Multichoice.refreshCorrect(this)' + ), + '#parents' => array('alternatives', $i, 'score_if_not_chosen') + ); + } + // ahah helper tag. New questions will be inserted before this tag + $form['alternatives']["placeholder"] = array( + '#markup' => '
', + ); + + // We can't send the get values to the ahah callback the normal way, so we do it like this. + $form['get'] = array( + '#type' => 'value', + '#value' => $get, + ); + + $form['alternatives']['multichoice_add_alternative'] = array( + '#type' => 'submit', + '#value' => t('Add more alternatives'), + '#submit' => array('multichoice_more_choices_submit'), // If no javascript action. + '#limit_validation_errors' => array(), + '#ajax' => array( + 'callback' => 'multichoice_add_alternative_ajax_callback', + 'wrapper' => 'placeholder', + 'effect' => 'slide', + 'method' => 'before', + ), + ); + $form['#attached']['js'] = array( + drupal_get_path('module', 'multichoice') . '/js/multichoice.js', + ); + + return $form; + } + + /** + * Helper function provding the default settings for the creation form. + * + * @return + * Array with the default settings + */ + private function getDefaultAltSettings() { + // If the node is being updated the default settings are those stored in the node + if (isset($this->node->nid)) { + $settings['choice_multi'] = $this->node->choice_multi; + $settings['choice_random'] = $this->node->choice_random; + $settings['choice_boolean'] = $this->node->choice_boolean; + } + // We try to fetch the users settings + elseif ($settings = $this->getUserSettings()) { + + } + // The user is creating his first multichoice node + else { + $settings['choice_multi'] = 0; + $settings['choice_random'] = 0; + $settings['choice_boolean'] = 0; + } + return $settings; + } + + /** + * Fetches the users default settings for the creation form + * + * @return + * The users default node settings + */ + private function getUserSettings() { + global $user; + $res = db_query('SELECT choice_multi, choice_boolean, choice_random + FROM {quiz_multichoice_user_settings} + WHERE uid = :uid', array(':uid' => $user->uid))->fetchAssoc(); + if ($res) { + return $res; + } + else { + return FALSE; + } + } + + /** + * Fetches the users default settings from the creation form + */ + private function saveUserSettings() { + global $user; + db_merge('quiz_multichoice_user_settings') + ->key(array('uid' => $user->uid)) + ->fields(array( + 'choice_random' => $this->node->choice_random, + 'choice_multi' => $this->node->choice_multi, + 'choice_boolean' => $this->node->choice_boolean, + )) + ->execute(); + } + + /** + * Implementation of getMaximumScore. + * + * @see QuizQuestion#getMaximumScore() + */ + public function getMaximumScore() { + if ($this->node->choice_boolean) { + return 1; + } + + $max = 0; + for ($i = 0; isset($this->node->alternatives[$i]); $i++) { + $short = $this->node->alternatives[$i]; + if ($this->node->choice_multi) { + $max += max($short['score_if_chosen'], $short['score_if_not_chosen']); + } + else { + $max = max($max, $short['score_if_chosen'], $short['score_if_not_chosen']); + } + } + return max($max, 1); + } + + /** + * Question response validator. + */ + public function getAnsweringFormValidate(array &$form, array &$form_state = NULL) { + if (!$this->node->choice_multi && is_null($form_state['values']['question'][$this->node->nid]['user_answer'])) { + form_set_error('', t('You must provide an answer.')); + } + } + +} + +/** + * Extension of QuizQuestionResponse + */ +class MultichoiceResponse extends QuizQuestionResponse { + + /** + * ID of the answers. + */ + protected $user_answer_ids; + protected $choice_order; + + /** + * Constructor. + * + * @param type $result_id + * @param stdClass $question_node + * @param type $values + * Form state values. + */ + public function __construct($result_id, stdClass $question_node, $values = NULL) { + parent::__construct($result_id, $question_node, $values['user_answer']); + $this->user_answer_ids = array(); + // tries is the tries part of the post data + if (isset($values['user_answer'])) { + if (!is_array($values['user_answer'])) { + // Account for single-select + $values['user_answer'] = array($values['user_answer']); + } + if (isset($values['choice_order'])) { + $this->choice_order = $values['choice_order']; + } + unset($values['choice_order']); + if (isset($values['user_answer']) && is_array($values['user_answer'])) { + foreach ($values['user_answer'] as $answer_id) { + $this->user_answer_ids[] = $answer_id; + $this->answer = $this->user_answer_ids; //@todo: Stop using user_answer_ids and only use answer instead... + } + } + elseif (isset($values['user_answer'])) { + $this->user_answer_ids[] = $values['user_answer']; + } + } + // We load the answer from the database + else { + $res = db_query('SELECT answer_id FROM {quiz_multichoice_user_answers} ua + LEFT OUTER JOIN {quiz_multichoice_user_answer_multi} uam ON(uam.user_answer_id = ua.id) + WHERE ua.result_id = :result_id AND ua.question_nid = :question_nid AND ua.question_vid = :question_vid', array(':result_id' => $result_id, ':question_nid' => $this->question->nid, ':question_vid' => $this->question->vid)); + while ($res_o = $res->fetch()) { + $this->user_answer_ids[] = $res_o->answer_id; + } + } + } + + /** + * Implementation of save + * + * @see QuizQuestionResponse#save() + */ + public function save() { + $user_answer_id = db_insert('quiz_multichoice_user_answers') + ->fields(array( + 'result_id' => $this->result_id, + 'question_vid' => $this->question->vid, + 'question_nid' => $this->question->nid, + 'choice_order' => $this->choice_order + )) + ->execute(); + + $query = db_insert('quiz_multichoice_user_answer_multi') + ->fields(array('user_answer_id', 'answer_id')); + for ($i = 0; $i < count($this->user_answer_ids); $i++) { + if ($this->user_answer_ids[$i]) { + $query->values(array($user_answer_id, $this->user_answer_ids[$i])); + } + } + $query->execute(); + } + + /** + * Implementation of delete + * + * @see QuizQuestionResponse#delete() + */ + public function delete() { + $user_answer_id = array(); + $query = db_query('SELECT id FROM {quiz_multichoice_user_answers} WHERE question_nid = :nid AND question_vid = :vid AND result_id = :result_id', array(':nid' => $this->question->nid, ':vid' => $this->question->vid, ':result_id' => $this->result_id)); + while ($user_answer = $query->fetch()) { + $user_answer_id[] = $user_answer->id; + } + + if (!empty($user_answer_id)) { + db_delete('quiz_multichoice_user_answer_multi') + ->condition('user_answer_id', $user_answer_id, 'IN') + ->execute(); + } + + db_delete('quiz_multichoice_user_answers') + ->condition('result_id', $this->result_id) + ->condition('question_nid', $this->question->nid) + ->condition('question_vid', $this->question->vid) + ->execute(); + } + + /** + * Implementation of score + * + * @return uint + * + * @see QuizQuestionResponse#score() + */ + public function score() { + if ($this->question->choice_boolean || $this->isAllWrong()) { + $score = $this->getMaxScore(); + foreach ($this->question->alternatives as $key => $alt) { + if (in_array($alt['id'], $this->user_answer_ids)) { + if ($alt['score_if_chosen'] <= $alt['score_if_not_chosen']) { + $score = 0; + } + } + else { + if ($alt['score_if_chosen'] > $alt['score_if_not_chosen']) { + $score = 0; + } + } + } + } + else { + $score = 0; + foreach ($this->question->alternatives as $key => $alt) { + if (in_array($alt['id'], $this->user_answer_ids)) { + $score += $alt['score_if_chosen']; + } + else { + $score += $alt['score_if_not_chosen']; + } + } + } + return $score; + } + + /** + * If all answers in a question is wrong + * + * @return boolean + * TRUE if all answers are wrong. False otherwise. + */ + public function isAllWrong() { + foreach ($this->question->alternatives as $key => $alt) { + if ($alt['score_if_chosen'] > 0 || $alt['score_if_not_chosen'] > 0) { + return FALSE; + } + } + return TRUE; + } + + /** + * Implementation of getResponse + * + * @return answer + * + * @see QuizQuestionResponse#getResponse() + */ + public function getResponse() { + return $this->user_answer_ids; + } + + /** + * Implementation of getReportFormResponse + */ + public function getReportFormResponse() { + $this->orderAlternatives($this->question->alternatives); + $simple_scoring = $this->question->choice_boolean; + + $data = array(); + foreach ($this->question->alternatives as $alternative) { + $chosen = in_array($alternative['id'], $this->user_answer_ids); + $not = $chosen ? '' : 'not_'; + + $data[] = array( + 'choice' => check_markup($alternative['answer']['value'], $alternative['answer']['format']), + 'attempt' => $chosen ? quiz_icon('selected') : '', + 'correct' => $chosen ? $alternative['score_if_chosen'] > 0 ? quiz_icon('correct') : quiz_icon('incorrect') : '', + 'score' => $alternative["score_if_{$not}chosen"], + 'answer_feedback' => check_markup($alternative["feedback_if_{$not}chosen"]['value'], $alternative["feedback_if_{$not}chosen"]['format'], FALSE), + 'question_feedback' => 'Question feedback', + 'solution' => $alternative['score_if_chosen'] > 0 ? quiz_icon('should') : ($simple_scoring ? quiz_icon('should-not') : ''), + 'quiz_feedback' => t('@quiz feedback', array('@quiz' => QUIZ_NAME)), + ); + } + + return $data; + } + + /** + * Order the alternatives according to the choice order stored in the database + * + * @param array $alternatives + * The alternatives to be ordered + */ + protected function orderAlternatives(array &$alternatives) { + if (!$this->question->choice_random) { + return; + } + $result = db_query('SELECT choice_order FROM {quiz_multichoice_user_answers} + WHERE result_id = :result_id AND question_nid = :question_nid AND question_vid = :question_vid', array(':result_id' => $this->result_id, ':question_nid' => $this->question->nid, ':question_vid' => $this->question->vid))->fetchField(); + if (!$result) { + return; + } + $order = explode(',', $result); + $newAlternatives = array(); + foreach ($order as $value) { + foreach ($alternatives as $alternative) { + if ($alternative['id'] == $value) { + $newAlternatives[] = $alternative; + break; + } + } + } + $alternatives = $newAlternatives; + } + +} diff --git a/modules/question_types/multichoice/multichoice.info b/modules/question_types/multichoice/multichoice.info new file mode 100644 index 0000000..9507e10 --- /dev/null +++ b/modules/question_types/multichoice/multichoice.info @@ -0,0 +1,9 @@ +name = Quiz Multichoice +package = Quiz Question +description = Multiple choice question type for quiz. +core = 7.x +dependencies[] = quiz +dependencies[] = quiz_question + +files[] = multichoice.classes.inc +files[] = tests/MultichoiceTestCase.test diff --git a/modules/question_types/multichoice/multichoice.install b/modules/question_types/multichoice/multichoice.install new file mode 100644 index 0000000..b491afd --- /dev/null +++ b/modules/question_types/multichoice/multichoice.install @@ -0,0 +1,231 @@ + array( + 'id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'result_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question_nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question_vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_order' => array( + 'type' => 'text', + ), + ), + 'primary key' => array( + 'id' + ), + 'indexes' => array( + 'answer_id' => array('result_id', 'question_nid', 'question_vid'), + ), + ); + + $schema['quiz_multichoice_user_answer_multi'] = array( + 'fields' => array( + 'user_answer_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'answer_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array( + 'user_answer_id', 'answer_id' + ), + 'indexes' => array( + 'answer_id' => array('user_answer_id'), + ), + ); + + $schema['quiz_multichoice_properties'] = array( + 'fields' => array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_multi' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_random' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_boolean' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array( + 'nid', 'vid' + ), + ); + + /* + * Holds each answer in the answer_collections. + */ + $schema['quiz_multichoice_answers'] = array( + 'fields' => array( + 'id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'answer' => array( + 'type' => 'text', + ), + 'answer_format' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + ), + 'feedback_if_chosen' => array( + 'type' => 'text', + ), + 'feedback_if_chosen_format' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + ), + 'feedback_if_not_chosen' => array( + 'type' => 'text', + ), + 'feedback_if_not_chosen_format' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + ), + 'score_if_chosen' => array( + 'type' => 'int', + 'unsigned' => FALSE, + 'not null' => TRUE, + 'default' => 0, + ), + 'score_if_not_chosen' => array( + 'type' => 'int', + 'unsigned' => FALSE, + 'not null' => TRUE, + 'default' => 0, + ), + 'question_nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'question_vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array( + 'id', + ), + 'indexes' => array( + 'quiz_id' => array('question_nid', 'question_vid'), + ) + ); + + $schema['quiz_multichoice_user_settings'] = array( + 'fields' => array( + 'uid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_multi' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_random' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_boolean' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array( + 'uid' + ), + ); + return $schema; +} + +/** + * Implements hook_uninstall(). + */ +function multichoice_uninstall() { + // TODO The drupal_(un)install_schema functions are called automatically in D7. + // drupal_uninstall_schema('multichoice') + $var = array( + 'multichoice_def_scoring', + 'multichoice_def_num_of_alts', + ); + foreach ($var as $v) { + variable_del($v); + } + drupal_set_message(t("The multichoice module has been uninstalled. multichoice nodes may still exist, but they will not function properly.")); +} diff --git a/modules/question_types/multichoice/multichoice.module b/modules/question_types/multichoice/multichoice.module new file mode 100644 index 0000000..c99925d --- /dev/null +++ b/modules/question_types/multichoice/multichoice.module @@ -0,0 +1,197 @@ +This module provides a multiple choice question type for Quiz.

+ +

The module has three settings. + Multiple answers allows the quiz taker to select more than one alternative + (it also allows for the possibility that none of the alternatives are correct). + Alternatives are selected using checkboxes instead of radio buttons. + Random order displays the alternatives in random order when quiz is beeing taken. + Simple scoring gives max score if everything is correct. Zero points otherwise.

+ +

The scoring system in multichoice is a bit complex. With multiple answers each alternative adds a given number of points to + the total score if it is chosen, and another number of points is added if the alternative isn't chosen. Both score if chosen and + score if not chosen may be edited for each alternative by the question creator. + If multiple answers isn't allowed the score will be set to the score if chosen of the alternative that has been chosen. + The question is considered correct if the quiz taker gets the maximum amount of points possible for the question.

+ "); + } +} + +/** + * Implements hook_quiz_question_info(). + */ +function multichoice_quiz_question_info() { + return array( + 'multichoice' => array( + 'name' => t('Multiple choice question'), + 'description' => t('This provides multiple choice questions for use by the Quiz module.'), + 'question provider' => 'MultichoiceQuestion', + 'response provider' => 'MultichoiceResponse', + 'module' => 'quiz_question', // All wrapper functions are in that module. + ), + ); +} + +/** + * Implements hook_quiz_question_config(). + */ +function multichoice_quiz_question_config() { + $form['multichoice_def_num_of_alts'] = array( + '#type' => 'textfield', + '#title' => t('Default number of alternatives'), + '#default_value' => variable_get('multichoice_def_num_of_alts', 2), + ); + $form['multichoice_def_scoring'] = array( + '#type' => 'radios', + '#title' => t('Default scoring method'), + '#description' => t('Choose the default scoring method for questions with multiple correct answers.'), + '#options' => array( + 0 => t('Give minus one point for incorrect answers'), + 1 => t("Give one point for each incorrect option that haven't been chosen"), + ), + '#default_value' => variable_get('multichoice_def_scoring', 0), + ); + $form['#validate'][] = 'multichoice_config_validate'; + return $form; +} + +/** + * Validate the multichoice config form values + */ +function multichoice_config_validate($form, $form_state) { + if (!_quiz_is_int($form_state['values']['multichoice_def_num_of_alts'], 2, 50)) { + form_set_error('multichoice_def_num_of_alts', t('The default number of alternatives must be between 2 and 50')); + } +} + +/** + * Implements hook_theme(). + */ +function multichoice_theme($existing, $type, $theme, $path) { + $path = drupal_get_path('module', 'multichoice') . '/theme'; + return array( + 'multichoice_creation_form' => array( + 'render element' => 'form', + 'path' => $path, + 'file' => 'multichoice.theme.inc', + ), + 'multichoice_answer_node_view' => array( + 'variables' => array( + 'alternatives' => NULL, + 'show_correct' => NULL, + ), + 'path' => $path, + 'file' => 'multichoice.theme.inc', + ), + 'multichoice_response' => array( + 'variables' => array( + 'data' => array(), + ), + 'path' => $path, + 'file' => 'multichoice.theme.inc', + ), + 'multichoice_alternative_creation' => array( + 'render element' => 'form', + 'path' => $path, + 'template' => 'multichoice-alternative-creation', + ), + 'multichoice_answering_form' => array( + 'render element' => 'form', + 'path' => $path, + 'template' => 'multichoice-answering-form', + ), + 'multichoice_alternative' => array( + 'render element' => 'form', + 'path' => $path, + 'template' => 'multichoice-alternative', + ), + ); +} + +/** + * ajax callback function used when adding alternatives to the node-form + */ +function multichoice_add_alternative_ajax_callback($form, &$form_state) { + $i = 0; + while (isset($form['alternatives'][$i])) { + $i++; + } + return $form['alternatives'][$i - 1]; +} + +/** + * Submit handler used when adding more alternatives to the node-form + */ +function multichoice_more_choices_submit($form, &$form_state) { + // Set the form to rebuild and run submit handlers. + if (!empty($form['node']->nid)) { + node_form_submit_build_node($form, $form_state); + } + + // Count the existing alternatives + $exists = 0; + while (isset($form['alternatives'][$exists])) { + $exists++; + } + + // Make the changes we want to the form state. + if ($form_state['values']['alternatives']['multichoice_add_alternative']) { + // We add 3 if js is disabled. 1 if the adding is done using ahah + $n = $_GET['q'] == 'system/ajax' ? 1 : 3; + $form_state['choice_count'] = $exists + $n; + } + $form_state['rebuild'] = TRUE; +} + +/** + * Implements hook_user_cancel(). + */ +function multichoice_user_cancel($edit, $account, $method) { + db_delete('quiz_multichoice_user_settings') + ->condition('uid', $account->uid) + ->execute(); +} + +/** + * Implements hook_field_extra_fields(). + */ +function multichoice_field_extra_fields() { + $extra['node']['multichoice'] = array( + 'form' => array( + 'alternatives' => array( + 'label' => t('Alternatives'), + 'description' => t('Alternatives for multichoice'), + 'weight' => -4, + ), + ), + ); + return $extra; +} + +/** + * Implements hook_views_api(). + */ +function multichoice_views_api() { + return array( + 'api' => 3, + 'path' => drupal_get_path('module', 'multichoice'), + ); +} diff --git a/modules/question_types/multichoice/multichoice.views.inc b/modules/question_types/multichoice/multichoice.views.inc new file mode 100644 index 0000000..0b626c9 --- /dev/null +++ b/modules/question_types/multichoice/multichoice.views.inc @@ -0,0 +1,244 @@ + array( + 'group' => 'Quiz Multichoice Answers', + 'join' => array( + 'quiz_entity_revision' => array( + 'left_table' => 'quiz_relationship', + 'left_field' => 'question_nid', + 'field' => 'question_nid', + ), + ), + ), + // Field descriptions: + 'id' => array( + 'title' => t('Answer ID'), + 'help' => t('The ID identifying an individual answer.'), + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + 'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'result_id', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + 'question_nid' => array( + 'title' => t('Answers Question Node NID'), + 'help' => t('The ID of the Question Node.'), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + //'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'nid', + ), + 'filter' => array( + 'handler' => 'quiz_views_handler_filter_numeric', + 'help' => t('Filter results to a particular subset of question versions.'), + ), + 'sort' => array('handler' => 'views_handler_sort'), + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'node', + 'field' => 'nid', + 'label' => t('node'), + ), + ), + 'question_vid' => array( + 'title' => t('Answers Question Node VID'), + 'help' => t('The Version ID of the Question Node.'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + //'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'vid', + ), + // Related to NODE + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'node_revision', + 'field' => 'vid', + 'label' => t('node revision'), + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + 'answer' => array( + 'title' => t('Answer'), + 'help' => t('Answer text'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + ); // End quiz_multichoice_answers + + + $data['quiz_multichoice_user_answers'] = array( + // Table Definition + 'table' => array( + 'group' => 'Quiz Multichoice Answers', + 'join' => array( + 'quiz_entity_revision' => array( + 'left_table' => 'quiz_relationship', + 'left_field' => 'question_nid', + 'field' => 'question_nid', + ), + ), + ), + // Field descriptions: + 'id' => array( + 'title' => t('User answer set ID'), + 'help' => t('The ID identifying an answer set for a user.'), + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + 'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'result_id', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + 'result_id' => array( + 'title' => t('Result ID'), + 'help' => t('The ID identifying a particular set of quiz results. This ID is unique with respect to the quiz nid and vid of the quiz, uid of the quizee, and the take of the quiz.'), + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + 'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'result_id', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + 'help' => t('Filter results to a particular result set'), + ), + 'sort' => array('handler' => 'views_handler_sort'), + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'quiz_results', + 'field' => 'result_id', + 'base field' => 'result_id', + 'label' => t('Result'), + ), + ), + 'question_nid' => array( + 'title' => t('Result Question Node NID'), + 'help' => t('The ID of the Question Node.'), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + //'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'nid', + ), + 'filter' => array( + 'handler' => 'quiz_views_handler_filter_numeric', + 'help' => t('Filter results to a particular subset of question versions.'), + ), + 'sort' => array('handler' => 'views_handler_sort'), + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'node', + 'field' => 'nid', + 'label' => t('node'), + ), + ), + 'question_vid' => array( + 'title' => t('Result Question Node VID'), + 'help' => t('The Version ID of the Question Node.'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + //'name_field' => 'title', + 'numeric' => TRUE, + 'validate type' => 'vid', + ), + // Related to NODE + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'node_revision', + 'field' => 'vid', + 'label' => t('node revision'), + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + ); // End quiz_multichoice_user_answers + + $data['quiz_multichoice_user_answer_multi'] = array( + 'table' => array( + 'group' => t('Quiz Multichoice Answers'), + 'join' => array( + 'quiz_entity_revision' => array( + 'left_table' => 'quiz_multichoice_user_answers', + 'left_field' => 'id', + 'field' => 'user_answer_id', + ), + ), + ), + // Field descriptions: + 'user_answer_id' => array( + 'title' => t('User answer set id'), + 'help' => t("The ID of a user's answer set."), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + 'numeric' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + 'help' => t("Filter results to a particular subset of a user's answer set."), + ), + 'sort' => array('handler' => 'views_handler_sort'), + ), + 'answer_id' => array( + 'title' => t('Answer id'), + 'help' => t("The ID of a user's answer."), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + 'numeric' => TRUE, + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array('handler' => 'views_handler_sort'), + 'relationship' => array( + 'handler' => 'views_handler_relationship', + 'base' => 'quiz_multichoice_answers', + 'field' => 'answer_id', + 'base field' => 'id', + 'label' => t('answer'), + ), + ), + ); // End quiz_multichoice_user_answer_multi + + return $data; +} diff --git a/modules/question_types/multichoice/multichoice_update_6400.inc b/modules/question_types/multichoice/multichoice_update_6400.inc new file mode 100644 index 0000000..1857d8a --- /dev/null +++ b/modules/question_types/multichoice/multichoice_update_6400.inc @@ -0,0 +1,402 @@ + 'serial', + 'unsignet' => TRUE, + 'not_null' => TRUE, + ), array('primary key' => array('id'))); + db_add_field('quiz_multichoice_user_answers', 'choice_order', array('type' => 'text')); + db_create_table('quiz_multichoice_user_answer_multi', array( + 'fields' => array( + 'user_answer_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'answer_id' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array( + 'user_answer_id', 'answer_id' + ), + )); +} + +/** + * Move/convert user answer data from the old data model to the new + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_move_old_answers(&$to_return, &$sandbox = NULL) { + // Store persistent data in the sandbox variable + if (!isset($sandbox['step_progress'])) { + $sandbox['step_progress'] = 0; + $sandbox['last_rid'] = -1; + $sandbox['last_nid'] = -1; + $sandbox['last_vid'] = -1; + $sandbox['last_id'] = -1; + $sandbox['step_max'] = db_query('SELECT COUNT(DISTINCT id) FROM {quiz_multichoice_user_answers}')->fetchField(); + } + // Fetch old user ans + $sql = 'SELECT id, answer_id, question_nid, question_vid, result_id + FROM {quiz_multichoice_user_answers} + WHERE result_id >= %d + ORDER BY result_id, question_nid, question_vid, answer_id'; + $res = db_query_range('SELECT id, answer_id, question_nid, question_vid, result_id + FROM {quiz_multichoice_user_answers} + WHERE result_id >= :result_id + ORDER BY result_id, question_nid, question_vid, answer_id', array(':result_id' => $sandbox['last_rid'])); + $progress_to_add = 0; + while ($res_o = db_fetch_object($res)) { + if ($res_o->question_nid == $sandbox['last_nid'] && $res_o->question_vid == $sandbox['last_vid'] && $res_o->result_id == $sandbox['last_rid']) { + // We only keep one row for each question result in quiz_multichoice_user_answers + if ($res_o->id > $sandbox['last_id']) { + $sql2 = 'DELETE FROM {quiz_multichoice_user_answers} + WHERE id = %d'; + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query($sql2, $res_o->id) */ + db_delete('quiz_multichoice_user_answers') + ->condition('id', $res_o->id) + ->execute(); + if ($progress_to_add + $sandbox['step_progress'] + 1 >= $sandbox['step_max']) { + $sandbox['step_progress'] = $sandbox['step_max']; + } + } + } + else { + // This is the first row for this question result + $sandbox['last_nid'] = $res_o->question_nid; + $sandbox['last_vid'] = $res_o->question_vid; + $sandbox['last_rid'] = $res_o->result_id; + $sandbox['last_id'] = $res_o->id; + $sandbox['step_progress'] += $progress_to_add; + $progress_to_add = 0; + } + // We insert ther answers in quiz_multichoice_user_answer_multi + $sql = 'INSERT IGNORE INTO {quiz_multichoice_user_answer_multi} + (user_answer_id, answer_id) + VALUES(%d, %d)'; + // TODO Please convert this statement to the D7 database API syntax. + /* db_query($sql, $sandbox['last_id'], $res_o->answer_id) */ + NULL; + $progress_to_add++; + } + // We move on if all user answers have been moved + if ($sandbox['step_progress'] >= $sandbox['step_max']) { + _multichoice_next_step($to_return, $sandbox); + } +} + +/** + * We delete fields not needed after the user_answer data was moved from the old data model + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_alter_user_answers2(&$to_return, &$sandbox = NULL) { + db_drop_field('quiz_multichoice_user_answers', 'answer_id'); +} + +/** + * We create a new table to store multichoice properties in + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_create_properties(&$to_return, &$sandbox = NULL) { + db_create_table('quiz_multichoice_properties', array( + 'fields' => array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'choice_multi' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_random' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'choice_boolean' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array( + 'nid', 'vid' + ), + )); +} + +/** + * We alter the quiz_multichoice_answers table to fit the new data model + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_alter_answers(&$to_return, &$sandbox = NULL) { + //db_drop_primary_key($to_return, 'quiz_multichoice_answers'); + db_change_field('quiz_multichoice_answers', 'answer_id', 'id', array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + )); + db_change_field('quiz_multichoice_answers', 'nid', 'question_nid', array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + )); + db_change_field('quiz_multichoice_answers', 'vid', 'question_vid', array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + )); + db_change_field('quiz_multichoice_answers', 'feedback', 'feedback_if_chosen', array( + 'type' => 'text', + )); + db_add_field('quiz_multichoice_answers', 'feedback_if_chosen_format', array( + 'type' => 'int', + )); + db_add_field('quiz_multichoice_answers', 'feedback_if_not_chosen', array( + 'type' => 'text', + )); + db_add_field('quiz_multichoice_answers', 'feedback_if_not_chosen_format', array( + 'type' => 'int', + )); + db_add_field('quiz_multichoice_answers', 'answer_format', array( + 'type' => 'int', + )); + db_change_field('quiz_multichoice_answers', 'is_correct', 'score_if_chosen', array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not_null' => TRUE, + 'default' => 0, + )); + db_add_field('quiz_multichoice_answers', 'score_if_not_chosen', array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not_null' => TRUE, + 'default' => 0, + )); + db_drop_field('quiz_multichoice_answers', 'result_option'); +} + +/** + * We go through the alternatives and update question properties and field formats + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_check_answers(&$to_return, &$sandbox) { + // Init persistent variables + if (!isset($sandbox['multichoice_check_answers'])) { + $sandbox['step_progress'] = 0; + $sandbox['multichoice_check_answers'] = TRUE; + $sandbox['last_nid'] = 0; + $sandbox['last_vid'] = 0; + $sandbox['step_max'] = db_query('SELECT COUNT(DISTINCT id) FROM {quiz_multichoice_answers}')->fetchField(); + } + $sandbox['num_corrects'] = 0; + $sql = 'SELECT id, question_nid, question_vid, score_if_chosen, score_if_not_chosen + FROM {quiz_multichoice_answers} + WHERE question_nid >= %d AND question_vid >= %d + ORDER BY question_nid, question_vid'; + $res = db_query_range('SELECT id, question_nid, question_vid, score_if_chosen, score_if_not_chosen + FROM {quiz_multichoice_answers} + WHERE question_nid >= :question_nid AND question_vid >= :question_vid + ORDER BY question_nid, question_vid', array(':question_nid' => $sandbox['last_nid'], ':question_vid' => $sandbox['last_vid'])); + $progress_to_add = 0; + while ($res_o = db_fetch_object($res)) { + if ($res_o->question_nid == $sandbox['last_nid'] && $res_o->question_vid == $sandbox['last_vid']) { + // This is the same node as we processed in the last loop + if ($progress_to_add + $sandbox['step_progress'] + 1 >= $sandbox['step_max']) { + $sandbox['step_progress'] = $sandbox['step_max']; + } + } + else { + // New node + $sandbox['step_progress'] += $progress_to_add; + $progress_to_add = 0; + $sandbox['last_nid'] = $res_o->question_nid; + $sandbox['last_vid'] = $res_o->question_vid; + $sandbox['num_corrects'] = 0; + + // Store the format for this node + $sql = 'SELECT format + FROM {node_revision} + WHERE vid = %d'; + $res2 = db_query('SELECT format + FROM {node_revision} + WHERE vid = :vid', array(':vid' => $res_o->question_vid)); + $sandbox['last_format'] = $res2->fetchField(); + $sql = 'INSERT INTO {quiz_multichoice_properties} + (nid, vid, choice_boolean) + VALUES(%d, %d, 1)'; + // TODO Please convert this statement to the D7 database API syntax. + /* db_query($sql, $res_o->question_nid, $res_o->question_vid) */ + NULL; + } + + if ($res_o->score_if_chosen == 1) { + $sandbox['num_corrects'] ++; + if ($sandbox['num_corrects'] == 2) { + // If more than one answer is correct we set the choice_multi property to one. + $sql = 'UPDATE {quiz_multichoice_properties} + SET choice_multi = 1 + WHERE nid = %d AND vid = %d'; + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query($sql, $res_o->question_nid, $res_o->question_vid) */ + db_update('quiz_multichoice_properties') + ->fields(array( + 'choice_multi' => 1, + )) + ->condition('nid', $res_o->question_nid) + ->condition('vid', $res_o->question_vid) + ->execute(); + } + } + // Update all the formats + $sql = 'UPDATE {quiz_multichoice_answers} + SET answer_format = %d, feedback_if_chosen_format = %d, feedback_if_not_chosen_format = %d + WHERE question_vid = %d'; // This table haven't been indexed yet, making this query very slow... :/ + $lf = $sandbox['last_format']; + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query($sql, $lf, $lf, $lf, $res_o->question_vid) */ + db_update('quiz_multichoice_answers') + ->fields(array( + 'answer_format' => $lf, + 'feedback_if_chosen_format' => $lf, + 'feedback_if_not_chosen_format' => $lf, + )) + ->condition('question_vid', $res_o->question_vid) + ->execute(); + $progress_to_add++; + } + $sandbox['step_progress'] += $progress_to_add; + // Check if we are finished, and jump to the next step if we are + if ($sandbox['step_progress'] >= $sandbox['step_max']) { + _multichoice_next_step($to_return, $sandbox); + } +} + +/** + * We create the user settings table + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_create_user_settings(&$to_return, &$sandbox = NULL) { + db_create_table('quiz_multichoice_user_settings', array( + 'fields' => array( + 'uid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'last_nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'last_vid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array( + 'uid' + ), + )); +} + +/** + * Helper function to switch steps in the update process + * + * @param $to_return + * Array where progress can be reported + * @param $sandbox + * Array where persistent data can be stored, and progress can be found + */ +function _multichoice_next_step(&$to_return, &$sandbox) { + $sandbox['current_step'] ++; +} diff --git a/modules/question_types/multichoice/tests/MultichoiceTestCase.test b/modules/question_types/multichoice/tests/MultichoiceTestCase.test new file mode 100644 index 0000000..bb3fc32 --- /dev/null +++ b/modules/question_types/multichoice/tests/MultichoiceTestCase.test @@ -0,0 +1,175 @@ + t('Multichoice'), + 'description' => t('Unit test for the multichoice question type.'), + 'group' => t('Quiz'), + ); + } + + public function setUp() { + parent::setUp(array('multichoice')); + } + + /** + * Create a default MCQ with default settings. + */ + public function testCreateQuizQuestion($settings = array()) { + $settings += array( + 'title' => 'MCQ 1 Title', + 'type' => 'multichoice', + 'choice_multi' => 0, + 'choice_random' => 0, + 'choice_boolean' => 0, + 'body' => array(LANGUAGE_NONE => array(array('value' => 'MCQ 1 body text'))), + ); + + // Set up some alternatives. + $settings['alternatives'][0]['answer']['value'] = 'A'; + $settings['alternatives'][0]['answer']['format'] = 'filtered_html'; + $settings['alternatives'][0]['feedback_if_chosen']['value'] = 'You chose A'; + $settings['alternatives'][0]['feedback_if_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][0]['feedback_if_not_chosen']['value'] = 'You did not choose A'; + $settings['alternatives'][0]['feedback_if_not_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][0]['score_if_chosen'] = 1; + $settings['alternatives'][0]['score_if_not_chosen'] = 0; + + $settings['alternatives'][1]['answer']['value'] = 'B'; + $settings['alternatives'][1]['answer']['format'] = 'filtered_html'; + $settings['alternatives'][1]['feedback_if_chosen']['value'] = 'You chose B'; + $settings['alternatives'][1]['feedback_if_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][1]['feedback_if_not_chosen']['value'] = 'You did not choose B'; + $settings['alternatives'][1]['feedback_if_not_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][1]['score_if_chosen'] = 0; + $settings['alternatives'][1]['score_if_not_chosen'] = 0; + + $settings['alternatives'][2]['answer']['value'] = 'C'; + $settings['alternatives'][2]['answer']['format'] = 'filtered_html'; + $settings['alternatives'][2]['feedback_if_chosen']['value'] = 'You chose C'; + $settings['alternatives'][2]['feedback_if_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][2]['feedback_if_not_chosen']['value'] = 'You did not choose C'; + $settings['alternatives'][2]['feedback_if_not_chosen']['format'] = 'filtered_html'; + $settings['alternatives'][2]['score_if_chosen'] = 0; + $settings['alternatives'][2]['score_if_not_chosen'] = 0; + + $question = $this->drupalCreateNode($settings); + $question = node_load($question->nid); + + $this->assertNotNull($question->alternatives[0]['id'], 'Alternative A was created as part of question save.'); + $this->assertNotNull($question->alternatives[1]['id'], 'Alternative B was created as part of question save.'); + $this->assertNotNull($question->alternatives[2]['id'], 'Alternative C was created as part of question save.'); + + $this->assertEqual($question->alternatives[0]['answer']['value'], 'A', 'Alternative text A was saved and loaded correctly.'); + $this->assertEqual($question->alternatives[1]['answer']['value'], 'B', 'Alternative text B was saved and loaded correctly.'); + $this->assertEqual($question->alternatives[2]['answer']['value'], 'C', 'Alternative text C was saved and loaded correctly.'); + + $this->assertEqual($question->alternatives[0]['answer']['format'], 'filtered_html', 'Alternative format A was saved and loaded correctly.'); + $this->assertEqual($question->alternatives[1]['answer']['format'], 'filtered_html', 'Alternative format B was saved and loaded correctly.'); + $this->assertEqual($question->alternatives[1]['answer']['format'], 'filtered_html', 'Alternative format C was saved and loaded correctly.'); + + return $question; + } + + public function testQuestionFeedback() { + $this->drupalLogin($this->admin); + + $question = $this->testCreateQuizQuestion(); + $quiz = $this->linkQuestionToQuiz($question); + + // Login as non-admin. + $this->drupalLogin($this->user); + + // Test incorrect question. Feedback, answer. + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array( + "question[$question->nid][user_answer]" => $question->alternatives[1]['id'], + ), t('Finish')); + $this->assertPattern('/quiz-score-icon selected/', 'Found selected answer.'); + $this->assertPattern('/quiz-score-icon should/', 'Found should answer.'); + $this->assertPattern('/quiz-score-icon incorrect/', 'Found incorrect answer.'); + $this->assertText('You did not choose A'); + $this->assertText('You chose B'); + $this->assertText('You did not choose C'); + } + + /** + * Test multiple answers. + */ + function testMultipleAnswers() { + $this->drupalLogin($this->admin); + $question = $this->testCreateQuizQuestion(array('choice_multi' => 1)); + $quiz = $this->linkQuestionToQuiz($question); + + $this->drupalLogin($this->user); + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array( + "question[$question->nid][user_answer][1]" => 1, + "question[$question->nid][user_answer][3]" => 3, + ), t('Finish')); + // 0 of 1, because user picked a correct answer and an incorrect answer. + $this->assertText('You got 0 of 1 possible points.'); + $this->assertText('Your score: 0%'); + + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array("question[$question->nid][user_answer][1]" => 1), t('Finish')); + // 1 of 1, because user picked a correct answer and not an incorrect answer. + $this->assertText('You got 1 of 1 possible points.'); + $this->assertText('Your score: 100%'); + } + + /** + * Test random order of choices. + * @todo I don't know how we would test random questions. + */ + function testRandomOrder() { + $this->drupalLogin($this->admin); + $question = $this->testCreateQuizQuestion(array('choice_random' => 1)); + $quiz = $this->linkQuestionToQuiz($question); + + $this->drupalLogin($this->user); + + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array( + "question[$question->nid][user_answer]" => $question->alternatives[0]['id'], + ), t('Finish')); + } + + /** + * Test simple scoring. + */ + function testSimpleScoring() { + $this->drupalLogin($this->admin); + $settings = array(); + $settings['alternatives'][1]['score_if_chosen'] = 0; + $settings['alternatives'][1]['score_if_not_chosen'] = 0; + $settings['choice_multi'] = 1; + $settings['choice_boolean'] = 1; + + $question = $this->testCreateQuizQuestion($settings); + $quiz = $this->linkQuestionToQuiz($question); + + $this->drupalLogin($this->user); + + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array( + "question[$question->nid][user_answer][1]" => 1, + "question[$question->nid][user_answer][3]" => 3, + ), t('Finish')); + $this->assertText('You got 0 of 1 possible points.'); + $this->assertText('Your score: 0%'); + + $this->drupalGet("quiz/$quiz->qid/take"); + $this->drupalPost(NULL, array("question[$question->nid][user_answer][1]" => 1), t('Finish')); + $this->assertText('You got 1 of 1 possible points.'); + $this->assertText('Your score: 100%'); + } + +} diff --git a/modules/question_types/multichoice/theme/multichoice-alternative-creation.js b/modules/question_types/multichoice/theme/multichoice-alternative-creation.js new file mode 100644 index 0000000..ce1b9c9 --- /dev/null +++ b/modules/question_types/multichoice/theme/multichoice-alternative-creation.js @@ -0,0 +1,34 @@ +(function($) { +/** + * @file + * JS enabling one filter fieldset to controll filter formats for all textareas in alternatives. + */ +Drupal.behaviors.multichoiceBehavior = { + attach: function (context, settings) { + // When the top input filter selector is clicked change the rest of the selectors to the same value + $('.quiz-filter:first :radio').click(function(){ + var myValue = $(this).val(); + $('.quiz-filter:not(:first) :radio[value='+myValue+']').click(); + $('.quiz-filter:not(:first) :radio[value='+myValue+']').change(); + }); + + // Change all format selectors to have the same value as the first + var defaultValue = $('.quiz-filter:first :radio[checked=1]').val(); + $('.quiz-filter:not(:first):not(.multichoiceBehavior-processed) :radio[value='+defaultValue+']').click().change().addClass('multichoiceBehavior-processed'); + + // Hide all format selectors except the first + $('.quiz-filter:not(:first)').hide().addClass('multichoiceStayHidden'); + + // Move the first input selector to the input-all-ph helper tag + $('.quiz-filter:first').insertAfter('#input-all-ph'); + + // Make sure the format selectors stay hidden when a fieldset is unfolded + var oldToggle = Drupal.toggleFieldset; + Drupal.toggleFieldset = function(context) { + oldToggle(context); + $('.multichoiceStayHidden').hide(); + }; + } +}; + +})(jQuery); diff --git a/modules/question_types/multichoice/theme/multichoice-alternative-creation.tpl.php b/modules/question_types/multichoice/theme/multichoice-alternative-creation.tpl.php new file mode 100644 index 0000000..2a48c48 --- /dev/null +++ b/modules/question_types/multichoice/theme/multichoice-alternative-creation.tpl.php @@ -0,0 +1,39 @@ + *' : ''; + +// We store the title for the answer section as well +$title_answer = check_plain($form['answer']['#title']) . $suf; +$form['answer']['#title'] = ''; + +// Now we can render the table +$row[] = drupal_render($form['correct']); +$row[] = drupal_render($form['answer']); +$rows[] = $row; +$header[] = array('data' => $title_correct); +$header[] = array('data' => $title_answer); +print theme('table', array('header' => $header, 'rows' => $rows)); + +// These lines make things look alot beter if user only has one input format available: +quiz()->formatMod($form['format']); +quiz()->formatMod($form['advanced']['format']); +quiz()->formatMod($form['advanced']['helper']['format']); + +print drupal_render($form['format']); +print drupal_render($form['advanced']); diff --git a/modules/question_types/multichoice/theme/multichoice-alternative.tpl.php b/modules/question_types/multichoice/theme/multichoice-alternative.tpl.php new file mode 100644 index 0000000..d72a412 --- /dev/null +++ b/modules/question_types/multichoice/theme/multichoice-alternative.tpl.php @@ -0,0 +1,36 @@ + $value) { + $fullOptions[$key] = $form['user_answer'][$key]; + $titles[$key] = $form['user_answer'][$key]['#title']; + $fullOptions[$key]['#title'] = ''; + unset($form['user_answer'][$key]); +} +unset($form['user_answer']['#options']); +print drupal_render_children($form); + +// We use the stored checkboxes and titles to generate a table for the +// alternatives +foreach ($titles as $key => $value) { + $rows[] = array( + 'class' => array('multichoice_row'), + 'data' => array( + array('data' => drupal_render($fullOptions[$key]), 'width' => 35, 'class' => 'selector-td'), + $value + )); +} +print theme('table', array('header' => array(), 'rows' => $rows)); diff --git a/modules/question_types/multichoice/theme/multichoice-answering-form.tpl.php b/modules/question_types/multichoice/theme/multichoice-answering-form.tpl.php new file mode 100644 index 0000000..8607b31 --- /dev/null +++ b/modules/question_types/multichoice/theme/multichoice-answering-form.tpl.php @@ -0,0 +1,11 @@ + 0) { + $form[$i]['#collapsed'] = FALSE; + } + } + } + return drupal_render_children($form); +} + +/** + * Theme the answer part of the node view + * + * @param $alternatives + * Array of alternatives. Each alternative is also an array with all the + * data for each alternative. + * @param $show_correct + * True if the user is allowed to view the solution + */ +function theme_multichoice_answer_node_view($variables) { + $alternatives = $variables['alternatives']; + $show_correct = $variables['show_correct']; + $header = array('', ''); + + $p = drupal_get_path('module', 'multichoice'); + drupal_add_css($p . '/theme/multichoice.css'); + + foreach ($alternatives as $i => $short) { + $answer_markup = check_markup($short['answer']['value'], $short['answer']['format']); + // Find the is_correct status + $is_correct = ($short['score_if_chosen'] > $short['score_if_not_chosen']); + $image = $is_correct ? 'correct' : 'wrong'; + if (!$show_correct) { + $image = 'unknown'; + } + + $rows[] = array( + array( + 'data' => array( + '#theme' => 'html_tag', + '#tag' => 'span', + '#attributes' => array( + 'class' => array( + 'multichoice-icon', + $image, + ), + 'title' => $show_correct ? + t('Score if chosen: @sc Score if not chosen: @nc', array( + '@sc' => $short['score_if_chosen'], + '@nc' => $short['score_if_not_chosen']) + ) : + t('You are not allowed to view the solution for this question'), + ), + ), + 'class' => array('multichoice-icon-cell'), + ), + $answer_markup + ); + } + return theme('table', array('header' => $header, 'rows' => $rows)); +} + +/** + * Theme function for the multichoice report + * + * @param $data + * Array of data to be presented in the report + */ +function theme_multichoice_response($variables) { + static $css_added; + if (!$css_added) { + drupal_add_css(drupal_get_path('module', 'multichoice') . '/theme/multichoice.css'); + $css_added = TRUE; + } + + $rows = array(); + foreach ($variables['data'] as &$alternative) { + if ($alternative['is_chosen']) { + switch ($alternative['is_correct']) { + case 0: + $icon = ''; + break; + case 1: + $icon = ''; + break; + case 2: + $icon = ''; + break; + case 3: + // The answer is unknown. + $icon = ''; + break; + } + } + else { + $icon = $alternative['is_correct'] == 2 ? '' : ''; + } + $rowspan = $alternative['feedback'] ? 2 : 1; + $rows[] = array( + array( + 'data' => $icon, + 'rowspan' => $rowspan, + 'class' => 'selector-td multichoice-icon-cell', + ), + $alternative['answer'] + ); + if ($rowspan == 2) { + $rows[] = array('
' . t('Feedback') . ':
' . $alternative['feedback'] . '
'); + } + } + return theme('table', array('header' => NULL, 'rows' => $rows)); +} diff --git a/modules/question_types/quiz_ddlines/js/colorwheel.js b/modules/question_types/quiz_ddlines/js/colorwheel.js new file mode 100644 index 0000000..6562f53 --- /dev/null +++ b/modules/question_types/quiz_ddlines/js/colorwheel.js @@ -0,0 +1,310 @@ +/* +* Colorwheel +* Copyright (c) 2010 John Weir (http://famedriver.com) +* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. +* +* requires jQuery & Raphael +* http://jquery.com http://raphaeljs.com +* +* see http://jweir.github.com/colorwheel for Usage +* +*/ +(function ($) { +Raphael.colorwheel = function(target, color_wheel_size, no_segments){ + var canvas, + current_color, + size, + segments = no_segments || 60, + bs_square = {}, + hue_ring = {}, + tri_size, + cursor = {}, + drag_target, + input_target, + center, + parent, + change_callback, + drag_callbacks = [function(){}, function(){}], + offset, + padding = 2, + sdim; // holds the dimensions for the saturation square + + function point(x, y){ return {x:x, y:y};} + function radians(a){ return a * (Math.PI/180);} + + function angle(x,y){ + var q = x > 0 ? 0 : 180; + return q+Math.atan((0 - y)/(0 - x))*180/(Math.PI); + } + + function create(target, color_wheel_size){ + size = color_wheel_size; + tri_size = size/20; + center = size/2; + parent = $(target); + canvas = Raphael(parent[0],size, size); + canvas.safari(); + + create_bs_square(); + create_hue_ring(); + hue_ring.cursor = cursor_create(tri_size); + bs_square.cursor = cursor_create(tri_size*0.5); + events_setup(); + parent.css({height:size+"px", width:size+"px"}); + disable_select(parent); + return public_methods(); + } + + function disable_select(target){ + $(target).css({"unselectable": "on","-moz-user-select": "none","-webkit-user-select": "none"}); + } + + function public_methods(){ + return { + input: input, + onchange: onchange, + ondrag : ondrag, + color : public_set_color + }; + } + + // Sets a textfield for user input of hex color values + // TODO don't clear the change callback + // TODO allow a null target to unbind the input + function input(target){ + change_callback = null; + input_target = target; + $(target).keyup(function(){ + if(this.value.match(/^#([0-9A-F]){3}$|^#([0-9A-F]){6}$/img)){ + set_color(this.value); + update_color(true); + run_onchange_event(); + } + }); + set_color(target.value); + update_color(true); + + return public_methods(); + } + + function onchange(callback){ + change_callback = callback; + update_color(false); + return public_methods(); + } + + function ondrag(start_callback, end_callback){ + drag_callbacks = [start_callback || function(){}, end_callback || function(){}]; + return public_methods(); + } + + function drag(e){ + var x = e.pageX - (parent.offset().left + center), + y = e.pageY - (parent.offset().top + center); + + if(drag_target == hue_ring){ + set_hue_cursor(x,y); + update_color(); + run_onchange_event(); + return true; + } + if(drag_target == bs_square){ + set_bs_cursor(x,y); + update_color(); + run_onchange_event(); + return true; + } + } + + function start_drag(event, target){ + $(document).mouseup(stop_drag); + $(document).mousemove(drag); + drag_target = target; + drag(event); + drag_callbacks[0](current_color); + } + + function stop_drag(){ + $(document).unbind("mouseup",stop_drag); + $(document).unbind("mousemove",drag); + drag_callbacks[1](current_color); + run_onchange_event(); + } + + function event_drag_stop(event,o){ + o.mousemove = null; + drag_target=null; + } + + function events_setup(){ + $([hue_ring.event.node,hue_ring.cursor[0].node]).mousedown(function(e){start_drag(e,hue_ring);}); + $([bs_square.b.node, bs_square.cursor[0].node]).mousedown(function(e){start_drag(e,bs_square);}); + } + + function cursor_create(size){ + var set = canvas.set().push( + canvas.circle(0, 0, size).attr({"stroke-width":4, stroke:"#333"}), + canvas.circle(0, 0, size+2).attr({"stroke-width":1, stroke:"#FFF", opacity:0.5}) + ); + + set[0].node.style.cursor = "crosshair"; + + return set; + } + + function set_bs_cursor(x,y){ + x = x+center; + y = y+center; + if(x < sdim.x) x = sdim.x; + if(x > sdim.x+sdim.l) x = sdim.x+sdim.l; + if(y < sdim.y) y = sdim.y; + if(y > sdim.y+sdim.l) y = sdim.y + sdim.l; + + bs_square.cursor.attr({cx:x, cy:y}).transform("t0,0"); + } + + + function set_hue(color){ + var hex = Raphael.getRGB(color).hex; + bs_square.h.attr("fill", hex); + } + + function hue(){ + return Raphael.rgb2hsb(bs_square.h.attr("fill")).h; + } + + function public_set_color(value){ + var ret = set_color(value); + update_color(false); + return ret; + } + + function set_color(value){ + if(value === undefined){ return current_color; } + + var temp = canvas.rect(1,1,1,1).attr({fill:value}), + hsb = canvas.raphael.rgb2hsb(temp.attr("fill")); + + set_bs_cursor( + (0-sdim.l/2) + (sdim.l*hsb.s), + sdim.l/2 - (sdim.l*hsb.b)); + set_hue_cursor((360*(hsb.h))-90); + temp.remove(); + return public_methods(); + } + + // Could optimize this method + function update_color(dont_replace_input_value){ + var x = bs_square.cursor.items[0].attr("cx"), + y = bs_square.cursor.items[0].attr("cy"), + hsb = { + b: 1-(y-sdim.y)/sdim.l, + s: (x-sdim.x)/sdim.l, + h: hue() + }; + + current_color = Raphael.hsb2rgb(hsb.h, hsb.s,hsb.b); + + if(input_target){ + var c = current_color.hex; + if(dont_replace_input_value != true) { input_target.value = c;} + if(hsb.b < 0.5){ + $(input_target).css("color", "#FFF"); + } else { + $(input_target).css("color", "#000"); + } + input_target.style.background = c; + } + + } + + // accepts either x,y or d (degrees) + function set_hue_cursor(mixed_args){ + var d; + if(arguments.length == 2){ + d = angle(arguments[0],arguments[1]); + } else { + d = arguments[0]; + } + + var x = Math.cos(radians(d)) * (center-tri_size-padding); + var y = Math.sin(radians(d)) * (center-tri_size-padding); + hue_ring.cursor.attr({cx:x+center, cy:y+center}).transform("t0,0"); + set_hue("hsb("+(d+90)/360+",1,1)"); + } + + function bs_square_dim(){ + if(sdim){ return sdim;} + var s = size - (tri_size * 4); + sdim = { + x:(s/6)+tri_size*2+padding, + y:(s/6)+tri_size*2+padding, + l:(s * 2/3)-padding*2 + }; + return sdim; + } + + function create_bs_square(){ + bs_square_dim(); + box = [sdim.x, sdim.y, sdim.l, sdim.l]; + + bs_square.h = canvas.rect.apply(canvas, box).attr({ + stroke:"#EEE", gradient: "0-#FFF-#000", opacity:1}); + bs_square.s = canvas.rect.apply(canvas, box).attr({ + stroke:null, gradient: "0-#FFF-#FFF", opacity:0}); + bs_square.b = canvas.rect.apply(canvas, box).attr({ + stroke:null, gradient: "90-#000-#FFF", opacity:0}); + bs_square.b.node.style.cursor = "crosshair"; + } + + function hue_segement_shape(){ + var path = "M -@W 0 L @W 0 L @W @H L -@W @H z"; + return path.replace(/@H/img, tri_size*2).replace(/@W/img,tri_size); + } + + function copy_segment(r, d, k){ + var n = r.clone(); + var hue = d*(255/k); + + var s = size/2, + t = tri_size, + p = padding; + + n.transform("t"+s+","+(s-t)+"r"+(360/k)*d+"t0,-"+(s-t-p)+""); + + n.attr({"stroke-width":0, fill:"hsb("+d*(1/k)+", 1, 0.85)"}); + hue_ring.hues.push(n); + } + + function create_hue_ring(){ + var s = hue_segement_shape(), + tri = canvas.path(s).attr({stroke:"rgba(0,0,0,0)"}).transform("t"+(size/2)+","+padding), + k = segments; // # of segments to use to generate the hues + + hue_ring.hues = canvas.set(); + + for(n=0; n p[j].x) && ((i != 0 && j != 5) || p[i].y > p[j].y) && ((i != 1 && j != 4) || p[i].y < p[j].y))) { + dis.push(dx + dy); + d[dis[dis.length - 1]] = [i, j]; + } + } + } + if (dis.length == 0) { + var res = [0, 4]; + } else { + res = d[Math.min.apply(Math, dis)]; + } + var x1 = p[res[0]].x, + y1 = p[res[0]].y, + x4 = p[res[1]].x, + y4 = p[res[1]].y; + dx = Math.max(Math.abs(x1 - x4) / 2, 10); + dy = Math.max(Math.abs(y1 - y4) / 2, 10); + var x2 = [x1, x1, x1 - dx, x1 + dx][res[0]].toFixed(3), + y2 = [y1 - dy, y1 + dy, y1, y1][res[0]].toFixed(3), + x3 = [0, 0, 0, 0, x4, x4, x4 - dx, x4 + dx][res[1]].toFixed(3), + y3 = [0, 0, 0, 0, y1 + dy, y1 - dy, y4, y4][res[1]].toFixed(3); + var path = ["M", x1.toFixed(3), y1.toFixed(3), "C", x2, y2, x3, y3, x4.toFixed(3), y4.toFixed(3)].join(","); + if (line && line.line) { + line.bg && line.bg.attr({path: path}); + line.line.attr({path: path}); + } else { + var color = typeof line == "string" ? line : "#000"; + return { + bg: bg && bg.split && this.path(path).attr({stroke: bg.split("|")[0], fill: "none", "stroke-width": bg.split("|")[1] || 3})/*.toBack()*/, + line: this.path(path).attr({stroke: color, fill: "none", "stroke-width":3}), + from: obj1, + to: obj2 + }; + } +}; + +(function ($) { +var QuizUtil = { + // The minimum width of the label + LABEL_MIN_WIDTH: 40, + + CANVAS_PADDING: 10, + + // The glow implementation should be moved into a class, + // but will do for now + current_glow: null, + + current_editor: null, + + drag_mode: false, + + imageChanged: false, + + defined: function (a) { + return (typeof a !== 'undefined'); + }, + + bboxUnion: function(bbox1, bbox2) { + bbox1.x = bbox1.x < bbox2.x ? bbox1.x : bbox2.x; + bbox1.y = bbox1.y < bbox2.y ? bbox1.y : bbox2.y; + bbox1.x2 = bbox1.x2 > bbox2.x2 ? bbox1.x2 : bbox2.x2; + bbox1.y2 = bbox1.y2 > bbox2.y2 ? bbox1.y2 : bbox2.y2; + + return bbox1; + } +}; +/** + * A list of quiz ddlines elements. + * + * Responsible for: + * - Holding the elements in-memory + * - Creating/Parsing the jsondata + * - Making the form input field being in-sync + */ +var QuizElementList = { + elements: [], + engine: null, + add: function(element) { + this.elements.push(element); + this.updateForm(); + }, + remove: function(element) { + // Remove from list: + for(var i=0; i