Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/mc/dao/IMcConfigDAO.java
    • -0
    • +35
    ./java/org/lamsfoundation/lams/tool/mc/web/form/McAdminForm.java
  1. … 2 more files in changeset.
LDEV-4920 Import QTI questions to Scratchie after adding them to QB

  1. … 4 more files in changeset.
LDEV-4920 Import QTI questions to MCQ after adding them to QB

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

  1. … 1 more file in changeset.
LDEV-4916 Static fields can not be autowired

Spring does not support it.

  1. … 6 more files in changeset.
LDEV-4861 Prevent adding the same question twice

  1. … 5 more files in changeset.
LDEV-4880 Add confidence level variations

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 18 more files in changeset.
LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

  1. … 60 more files in changeset.
LDEV-4900 Fix issues

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

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/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.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/service/AssessmentServiceImpl.java

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 26 more files in changeset.
LDEV-4900 Mark autosave result as final and copy results to non leaders on leader's force completion

* Finalize non-leaders on leader's finish or force-completion

  1. … 7 more files in changeset.
LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

  1. … 15 more files in changeset.
LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

  1. … 32 more files in changeset.
LDEV-4895 Fix detection whether MCQ has already been attempted

LDEV-4884 Several minor fixes for UUID and description QTI import

  1. … 2 more files in changeset.
LDEV-4745 Add QB questions to private collection for TBL template

  1. … 2 more files in changeset.
LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

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

Conflicts:

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 9 more files in changeset.
LDEV-4745 Fix authoring templates for new QB structure

  1. … 3 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. … 3 more files in changeset.
LKC-221 Fill Scratchie and Assessment with WA questions

  1. … 5 more files in changeset.
LKC-221 Fill MCQ with RAT questions.

  1. … 1 more file in changeset.
LDEV-4872 McSession to save users as Set instead of List

LDEV-4872 McSession to save users as Set instead of List

LDEV-4745 Set tool content ID in MCQ questions when importing a LD

LDEV-4846 Export/import QB questions' content folders

  1. … 5 more files in changeset.
LDEV-4846 Set LD's content folder ID when importing old questions

In pre-QB LAMS version only LD had content folder ID. In QB each

question has its own content folder ID. When importing pre-QB questions

and converting them into QB questions, we give them the LD's (shared)

content folder ID.

  1. … 5 more files in changeset.
LDEV-4847 Do not export question IDs, versions etc. when exporting a LD

  1. … 4 more files in changeset.
LDEV-4847 Look for existing QB question UUIDs when importing a LD

  1. … 5 more files in changeset.