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 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.
Monday 22 Jul 2019
6:04 pm

Marcin Cieslak

LDEV-4745 Make service methods do what they claim to do

Getting max question ID and version returned already incremented version

instead of actual max. Now they return real max value and need to be

manually incremented afterwards.

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 4 more files in changeset.
Thursday 18 Jul 2019
9:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -13
    • +10
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 6 more files in changeset.
Saturday 13 Jul 2019
6:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 7 more files in changeset.
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -9
    • +3
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 76 more files in changeset.
Thursday 04 Jul 2019
3:25 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -5
    • +7
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  3. … 53 more files in changeset.
Tuesday 02 Jul 2019
9:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 14 more files in changeset.
Wednesday 19 Jun 2019
6:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -2
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  4. … 26 more files in changeset.
Monday 17 Jun 2019
9:26 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
    • -10
    • +6
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -122
    • +0
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 12 more files in changeset.
Wednesday 29 May 2019
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -3
    • +4
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 9 more files in changeset.
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -0
    • +19
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
7:27 am

Andrey Balan

LDEV-4823 Fix exception on adding and removing questions simultaneously

Options
    • -10
    • +6
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Saturday 18 May 2019
7:16 am

Andrey Balan

LDEV-4821 Switch to using qbQuestionUid for competence levels

Options
    • -8
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -11
    • +11
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -6
    • +5
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +93
    ./lamsfoundation/lams/tool/scratchie/dto/QbOptionDTO.java
    • -17
    • +15
    ./lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -93
    • +0
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -10
    • +11
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -2
    • +8
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -150
    • +143
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -100
    • +100
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -19
    • +19
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -8
    • +8
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -6
    • +6
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  16. … 12 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 5 more files in changeset.
Wednesday 15 May 2019
4:54 am

Andrey Balan

LDEV-4746 Fix issues that arose after migration to QB questions

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +5
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  3. … 5 more files in changeset.
Friday 10 May 2019
10:29 pm

Marcin Cieslak

LDEV-4817 Do not create blank burning questions, delete existing ones

Options
    • -0
    • +17
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -6
    • +10
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java