candidateAnswersList.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp

  1. … 3 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 192 more files in changeset.
LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

  1. … 6 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 54 more files in changeset.
LDEV-4775 update marks more skillfully after edit in monitor

  1. … 13 more files in changeset.
LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

  1. … 13 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 391 more files in changeset.
LDEV-4746 Use QB option directly instead of MCQ option

Keeping a reference from MCQ option to QB option proved unnecessary and

problematic. It is sufficient for QB question to keep this reference.

  1. … 25 more files in changeset.
LDEV-4746 Redesign flow for saving MCQ questions

Detached QB entities act as their own DTOs.

Question options modification is detected and processed.

  1. … 8 more files in changeset.
LDEV-4746 Add Question Bank option and process it in MCQ tool

  1. … 7 more files in changeset.
LDEV-4440 Clean up shared files

  1. … 206 more files in changeset.
Merge Asia's Image Gallery

  1. … 76 more files in changeset.
LDEV-4440 Started migration of Multiple Choices

  1. … 52 more files in changeset.
LDEV-2866 Authoring code refactoring

  1. … 56 more files in changeset.
LDEV-2866 Code refactoring

  1. … 47 more files in changeset.
LDEV-3813: Bootstrap authoring and monitoring

  1. … 51 more files in changeset.
LDEV-2866 * Got rid of duplicative jsp parts in Ozgur's tools * Some initial refactoring of the code

  1. … 107 more files in changeset.
LDEV-2866 * Got rid of duplicative jsp parts in Ozgur's tools * Some initial refactoring of the code

  1. … 106 more files in changeset.
LDEV-3228 Ability to change, add, remove MCQ questions even after student have reached it

  1. … 69 more files in changeset.
LDEV-3079 * use thickbox pages and ajax calls * Use CKEditors as MCQ answers tags

  1. … 18 more files in changeset.
updated mcq fro RTL + editable notebook entry

  1. … 37 more files in changeset.
Fix for (LDEV-966) MCQ to have only one correct answer... Fixed Authoring module. Learner module fix sent soon

  1. … 11 more files in changeset.
Fix for LDEV-932 When adding a question and there are two candidate answers marked as correct...

  1. … 11 more files in changeset.
Cleaned up jsp pages.

  1. … 13 more files in changeset.
Updated authoring pages.

  1. … 34 more files in changeset.
Fix for: LDEV-829 Replace all instances of bean:message with fmt:message

  1. … 36 more files in changeset.
Major authoring rewrite and layout changes

    • -0
    • +124
    ./candidateAnswersList.jsp
  1. … 81 more files in changeset.