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
Thursday 31 Oct 2019
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.
8:31 pm

Marcin Cieslak

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

Options
    • -2
    • +10
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.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/scratchie/service/ScratchieServiceImpl.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/scratchie/service/ScratchieServiceImpl.java
  2. … 4 more files in changeset.
7:10 pm

Marcin Cieslak

LDEv-4845 Add imported QB questions to public collection

Options
    • -1
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files 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/scratchie/service/ScratchieImportContentVersionFilter.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/scratchie/service/ScratchieImportContentVersionFilter.java
  2. … 5 more files in changeset.
Tuesday 13 Aug 2019
3:42 am

Marcin Cieslak

LDEv-4845 LD XML transformation for Assessment MC questions

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

Marcin Cieslak

LDEv-4845LD LD XML transformation for Scratchie tool

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -0
    • +3
    ./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -2
    • +81
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -0
    • +28
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  5. … 1 more file in changeset.
1:24 am

Marcin Cieslak

LDEv-4845 Remove pre-QB code preventing Scratchie export

Options
    • -11
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Sunday 04 Aug 2019
5:10 am

Andrey Balan

LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

Options
    • -2
    • +0
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -5
    • +0
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -14
    • +0
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -34
    • +10
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -173
    • +125
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -97
    • +0
    ./lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
  8. … 8 more files in changeset.
Tuesday 23 Jul 2019
8:31 pm

Marcin Cieslak

LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 17 more files in changeset.