Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4745 Count MCQ attempts only for given question UID

LDEV-4745 Make Assessment questions comparable by order ID

  1. … 3 more files in changeset.
LDEV-4839 Refine import QB questions feature

  1. … 9 more files in changeset.
Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

  1. … 10 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 76 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

  1. … 50 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. … 46 more files in changeset.
LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

  1. … 14 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

  1. … 12 more files in changeset.
LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

  1. … 9 more files in changeset.
LDEV-4825 Display QB stats in MCQ tool monitoring

  1. … 4 more files in changeset.
LDEV-4745 Fix the way confidence levels is calculated in MCQ

LDEV-4821 Switch to using qbQuestionUid for competence levels

  1. … 3 more files in changeset.
LDEV-4821 remove obsolete hash field

  1. … 4 more files in changeset.
LDEV-4820 Show user names for confidence levels

  1. … 5 more files in changeset.
LDEV-4818 Add title property to MCQ questions

  1. … 21 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 78 more files in changeset.
LDEV-4746 Fix a duplicate association in MCQ

LDEV-4777 Search QB interface is now available in MCQ tool

* Further development of QB search feature

  1. … 7 more files in changeset.
LDEV-4746 Set tool content ID also on MCQ clone for lesson

LDEV-4746 Prepare QB model for stats

Tool content ID was added to each tool QB question so we can track which

activity and lesson it belongs to.

Order ID and create date were moved from subclasses to top QB entities.

  1. … 8 more files in changeset.
LDEV-4746 Create a super class and table for tools' answers to inherit

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

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

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

  1. … 5 more files in changeset.
LDEV-4746 Inform author of detected question changes

In MC authoring if a new question or version gets added, the author gets

a pop up displayed.

Further steps are detection of minor changes (update and not create a

new version) and allowing author to choose whether changes are minor or

should lead to new version.

  1. … 3 more files in changeset.
LDEV-4721 Fix version filter method names

  1. … 4 more files in changeset.
LDEV-4746 Introduce QB service and DAO

  1. … 5 more files in changeset.
LDEV-4746 Move QB entities to another package

  1. … 6 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. … 11 more files in changeset.
LDEV-4746 Introduce a super class for tool questions

  1. … 2 more files in changeset.