lams-github / lams_tool_scratchie / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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 16 Nov 2019
6:09 am

Andrey Balan

LDEV-4903 Fixed importing LD using a blank DB

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
  2. … 1 more file in changeset.
3:49 am

Andrey Balan

LDEV-4875 Fix scratching of MCQ questions

Options
    • -2
    • +6
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  2. … 1 more file in changeset.
Friday 15 Nov 2019
4:10 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
10:28 pm

Andrey Balan

LDEV-4897 Update Scratchie to use new Excel exporting methods

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 1 more file in changeset.
9:34 pm

Andrey Balan

LDEV-4745 Set general burning question's uid to 0

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

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

Options
    • -0
    • +8
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 60 more files 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
    • -2
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -291
    • +224
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +10
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -7
    • +9
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -45
    • +29
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  6. … 23 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
    • -24
    • +48
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -44
    • +40
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  3. … 7 more files in changeset.
Wednesday 06 Nov 2019
1:06 am

Andrey Balan

LDEV-4897 Handle empty "extraPoint" parameter

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 05 Nov 2019
4:51 am

Marcin Cieslak

LDEV-4898 Fix notifyCloseURL passing in Scratchie

Options
    • -1
    • +12
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

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

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -276
    • +215
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -5
    • +7
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -39
    • +24
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  5. … 12 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/scratchie/service/IScratchieService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  5. … 29 more files in changeset.
Tuesday 29 Oct 2019
6:06 pm

Marcin Cieslak

LDEV-4895 Fix correct option setting in Scratchie

Options
    • -3
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
5:59 pm

Marcin Cieslak

LDEV-4895 Fix learner answer recalculation in Scratchie after QB edit

Options
    • -29
    • +25
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Thursday 24 Oct 2019
9:02 pm

Marcin Cieslak

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

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

Marcin Cieslak

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

Options
    • -1
    • +19
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.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
    • -27
    • +39
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 9 more files in changeset.
Wednesday 23 Oct 2019
6:43 pm

Marcin Cieslak

LDEV-4745 Fix TBL template Scratchie question adding in authoring

Even if there were RAT multiple questions added, only one showed up in

Scratchie.

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
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
    • +1
    ./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -147
    • +377
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 8 more files in changeset.
Monday 21 Oct 2019
10:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -36
    • +45
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
8:12 pm

Andrey Balan

LDEV-4885 Remove all white space characters from preset marks setting

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 18 Oct 2019
8:59 pm

Andrey Balan

LDEV-4875 Respect QbQuestion's case sensitive setting

* Simplify learning.jsp, so it gets most of the data from the server

rather than tries to figure it out on a client side

* Optimize the way answers get fetched from Assessment

* Fix the following issue: if there is no activity selected to fetch

assessment answers from, then Scratchie don't show user answers

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -19
    • +20
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -8
    • +2
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -10
    • +7
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -70
    • +71
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -34
    • +63
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  7. … 2 more files in changeset.
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -13
    • +42
    ./lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -49
    • +54
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -9
    • +4
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -5
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -5
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  9. … 15 more files in changeset.
Wednesday 09 Oct 2019
5:27 am

Andrey Balan

LDEV-4875 Recalculate all assessments and scratchies after answer allocation into group

Options
    • -1
    • +8
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +14
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -12
    • +0
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -17
    • +25
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +0
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  9. … 9 more files in changeset.
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -14
    • +4
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +10
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -5
    • +29
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +150
    ./lamsfoundation/lams/tool/scratchie/dto/OptionDTO.java
    • -93
    • +0
    ./lamsfoundation/lams/tool/scratchie/dto/QbOptionDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -0
    • +30
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -9
    • +12
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -16
    • +32
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -106
    • +313
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -39
    • +81
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -42
    • +101
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +22
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  16. … 61 more files in changeset.
Monday 30 Sep 2019
9:07 pm

Marcin Cieslak

LKC-221 Fill Scratchie and Assessment with WA questions

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -1
    • +30
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 4 more files in changeset.
Tuesday 10 Sep 2019
2:29 pm

Andrey Balan

LDEV-4868 Fix Scratchie so it can show more than one question

* Also fix confidence levels feature in Scratchie

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
  2. … 1 more file in changeset.
Friday 16 Aug 2019
12:52 am

Marcin Cieslak

LDEV-4846 Export/import QB questions' content folders

Options
    • -1
    • +20
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.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
    • -20
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.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
    • -1
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 4 more files in changeset.