lams-github / lams_tool_lamc / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Saturday 09 Nov 2019
6:00 am

Andrey Balan

LDEV-4900 Fix issues

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  5. … 1 more file in changeset.
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

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

Options
    • -14
    • +21
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 26 more files in changeset.
6:50 am

Andrey Balan

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

Options
    • -20
    • +33
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -11
    • +19
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 7 more files in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -10
    • +17
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 32 more files in changeset.
Monday 28 Oct 2019
5:36 pm

Marcin Cieslak

LDEV-4895 Fix detection whether MCQ has already been attempted

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
Thursday 24 Oct 2019
9:02 pm

Marcin Cieslak

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

Options
    • -3
    • +4
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 2 more files in changeset.
7:49 pm

Marcin Cieslak

LDEV-4745 Add QB questions to private collection for TBL template

Options
    • -0
    • +17
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 2 more files in changeset.
7:22 pm

Marcin Cieslak

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

Options
    • -18
    • +29
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 9 more files in changeset.
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

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

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 9 more files in changeset.
Monday 21 Oct 2019
10:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Tuesday 15 Oct 2019
6:13 pm

Marcin Cieslak

LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

Options
    • -0
    • +11
    ./lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -14
    • +18
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
  5. … 3 more files in changeset.
Monday 30 Sep 2019
9:07 pm

Marcin Cieslak

LKC-221 Fill Scratchie and Assessment with WA questions

Options
    • -2
    • +7
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 5 more files in changeset.
1:28 pm

Marcin Cieslak

LKC-221 Fill MCQ with RAT questions.

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -1
    • +21
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 1 more file in changeset.
Monday 23 Sep 2019
8:14 pm

Andrey Balan

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

Options
    • -12
    • +14
    ./lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
8:14 pm

Andrey Balan

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

Options
    • -12
    • +14
    ./lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
Friday 16 Aug 2019
7:33 pm

Marcin Cieslak

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

Options
    • -24
    • +24
    ./lamsfoundation/lams/tool/mc/model/McContent.java
12:52 am

Marcin Cieslak

LDEV-4846 Export/import QB questions' content folders

Options
    • -0
    • +19
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
  3. … 5 more files in changeset.
Thursday 15 Aug 2019
11:48 pm

Marcin Cieslak

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.

Options
    • -19
    • +0
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  2. … 5 more files in changeset.
8:53 pm

Marcin Cieslak

LDEV-4847 Do not export question IDs, versions etc. when exporting a LD

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
8:31 pm

Marcin Cieslak

LDEV-4847 Look for existing QB question UUIDs when importing a LD

Options
    • -3
    • +9
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 5 more files in changeset.
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -15
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -15
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
7:10 pm

Marcin Cieslak

LDEv-4845 Add imported QB questions to public collection

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
6:58 pm

Marcin Cieslak

LDEv-4845 Do not remove fields which were removed by previous filters

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  2. … 1 more file in changeset.
Wednesday 14 Aug 2019
1:22 pm

Marcin Cieslak

LDEv-4845 Use LD's content folder ID for new QB questions.

Also minor bug fixes.

Options
    • -4
    • +26
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  2. … 3 more files in changeset.
6:01 am

Marcin Cieslak

LDEv-4845 LD XML transformation for remaining Assessment question types

Options
    • -5
    • +3
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  2. … 5 more files in changeset.
Monday 12 Aug 2019
4:07 am

Marcin Cieslak

LDEv-4845 Minor fix when iterating on imported options

Options
    • -7
    • +8
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
2:05 am

Marcin Cieslak

LDEv-4845 Correctly fill missing options display order

Options
    • -1
    • +4
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
1:50 am

Marcin Cieslak

LDEv-4845 Clean imported MCQ questions same way as during DB migration

Options
    • -5
    • +7
    ./lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
  2. … 2 more files in changeset.