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 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
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
    • -5
    • +9
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
6:08 pm

Andrey Balan

LDEV-4746 Fix adding of several items at once and import QTI questions

Options
    • -8
    • +13
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
Wednesday 08 May 2019
5:11 am

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 79 more files in changeset.
Wednesday 24 Apr 2019
7:58 pm

Marcin Cieslak

LDEV-4746 Set tool content ID to Scratchie items on activity copy

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
Friday 05 Apr 2019
3:36 pm

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -9
    • +11
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Tuesday 26 Feb 2019
7:12 am

Andrey Balan

LDEV-4777 Initial implementation of question bank search feature

Options
    • -1
    • +4
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -5
    • +43
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 9 more files in changeset.
Monday 18 Feb 2019
6:02 pm

Marcin Cieslak

LDEV-4746 Prepare QB model for stats

Tool content ID was added to each tool QB question so we can track which

activity and lesson it belongs to.

Order ID and create date were moved from subclasses to top QB entities.

Options
    • -3
    • +1
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -12
    • +4
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -1
    • +4
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/util/ScratchieItemComparator.java
    • -9
    • +12
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  6. … 6 more files in changeset.
Friday 15 Feb 2019
11:32 pm

Marcin Cieslak

LDEV-4746 Create a super class and table for tools' answers to inherit

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -45
    • +5
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -4
    • +6
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 6 more files in changeset.
Tuesday 12 Feb 2019
6:15 pm

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -3
    • +5
    ./lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -10
    • +10
    ./lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -3
    • +2
    ./lamsfoundation/lams/tool/scratchie/dto/Summary.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -115
    • +11
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -7
    • +19
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -99
    • +39
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -27
    • +32
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -81
    • +101
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -47
    • +0
    ./lamsfoundation/lams/tool/scratchie/util/ScratchieAnswerComparator.java
  16. … 17 more files in changeset.
Tuesday 08 Jan 2019
4:11 am

Andrey Balan

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
    • -13
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20130808.sql
    • -13
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20130912.sql
    • -13
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20130923.sql
    • -13
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20131008.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20131009.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20131130.sql
    • -49
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
    • -19
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20140102.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql
    • -28
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20140613.sql
    • -27
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20150903.sql
    • -62
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20151217.sql
    • -22
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20160720.sql
  16. … 125 more files in changeset.
Friday 21 Dec 2018
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 20 more files in changeset.
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -16
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  4. … 140 more files in changeset.
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -69
    • +0
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceProxy.java
    • -11
    • +14
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  3. … 50 more files in changeset.
Monday 26 Nov 2018
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -3
    • +4
    ./lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -7
    • +7
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
    • -13
    • +14
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -8
    • +9
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
  7. … 165 more files in changeset.