lams-github / lams_tool_scratchie / src / java / org / lamsfoundation

lams

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
Sunday 31 Mar 2024
2:32 pm

Marcin Cieslak

LDEV-5440 Replace deprecated Long constructor

Options
    • -1
    • +1
    ./tool/scratchie/dto/Summary.java
    • -1
    • +1
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./tool/scratchie/web/servlet/PopulateMarksServlet.java
  4. … 114 more files in changeset.
Thursday 28 Mar 2024
6:20 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

Options
    • -29
    • +60
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 5 more files in changeset.
Saturday 16 Mar 2024
6:17 pm

Marcin Cieslak

LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

Options
    • -26
    • +57
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 8 more files in changeset.
Thursday 07 Mar 2024
2:32 pm

Marcin Cieslak

LDEV-4993 Show all correct answers in Scratchie student choices table

Options
    • -3
    • +3
    ./tool/scratchie/service/ScratchieServiceImpl.java
Thursday 29 Feb 2024
12:32 pm

Marcin Cieslak

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

Options
    • -7
    • +6
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
Thursday 22 Feb 2024
9:23 pm

Andrey Balan

LDEV-5424 bootstrap5 Scratchie monitoring

Options
    • -3
    • +6
    ./tool/scratchie/web/controller/TblMonitorController.java
  2. … 16 more files in changeset.
Tuesday 20 Feb 2024
1:53 pm

Marcin Cieslak

LDEV-5440 Further code upgrade to conform new WF libraries

Options
    • -3
    • +4
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +3
    ./tool/scratchie/web/controller/MonitoringController.java
  3. … 60 more files in changeset.
Friday 16 Feb 2024
1:36 pm

Marcin Cieslak

LDEV-5446 Ensure that UUIDs are unique but retained on import

Options
    • -0
    • +2
    ./tool/scratchie/web/controller/AuthoringController.java
  2. … 4 more files in changeset.
Tuesday 30 Jan 2024
11:03 pm

Andrey Balan

LDEV-5425 delete notebook leftovers

Options
    • -8
    • +0
    ./tool/scratchie/ScratchieConstants.java
  2. … 1 more file in changeset.
Sunday 21 Jan 2024
10:30 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +5
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -24
    • +23
    ./tool/scratchie/web/controller/MonitoringController.java
  3. … 9 more files in changeset.
Friday 19 Jan 2024
12:45 pm

Marcin Cieslak

LDEV-5401 Hide individual extension from widget after learner finished

Options
    • -0
    • +5
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -25
    • +31
    ./tool/scratchie/web/controller/MonitoringController.java
  3. … 8 more files in changeset.
Thursday 18 Jan 2024
11:47 am

Marcin Cieslak

LDEV-5441 Finish user attempts and session after timer expired

Options
    • -7
    • +12
    ./tool/scratchie/service/IScratchieService.java
    • -0
    • +36
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -25
    • +31
    ./tool/scratchie/web/controller/MonitoringController.java
    • -18
    • +17
    ./tool/scratchie/web/controller/TblMonitorController.java
  5. … 10 more files in changeset.
Tuesday 16 Jan 2024
10:38 am

Marcin Cieslak

LDEV-5440 Revert some unnecessary package name changes

Options
    • -2
    • +2
    ./tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -1
    • +1
    ./tool/scratchie/model/Scratchie.java
    • -1
    • +1
    ./tool/scratchie/model/ScratchieItem.java
    • -1
    • +1
    ./tool/scratchie/model/ScratchieUser.java
    • -1
    • +1
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningWebsocketServer.java
    • -1
    • +1
    ./tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +1
    ./tool/scratchie/web/form/ScratchieForm.java
    • -1
    • +1
    ./tool/scratchie/web/servlet/PopulateMarksServlet.java
  13. … 453 more files in changeset.
10:01 am

Marcin Cieslak

LDEV-5440 Refactor packages of imported classes

Options
    • -1
    • +1
    ./tool/scratchie/model/Scratchie.java
    • -1
    • +1
    ./tool/scratchie/model/ScratchieItem.java
    • -1
    • +1
    ./tool/scratchie/model/ScratchieUser.java
    • -2
    • +2
    ./tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -1
    • +1
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningWebsocketServer.java
    • -1
    • +1
    ./tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +1
    ./tool/scratchie/web/form/ScratchieForm.java
    • -1
    • +1
    ./tool/scratchie/web/servlet/PopulateMarksServlet.java
  13. … 470 more files in changeset.
Monday 15 Jan 2024
4:11 pm

Marcin Cieslak

LDEV-5440 Rewrite config files and library references

Options
    • -4
    • +4
    ./tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -1
    • +1
    ./tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -10
    • +10
    ./tool/scratchie/model/BurningQuestionLike.java
    • -12
    • +12
    ./tool/scratchie/model/Scratchie.java
    • -4
    • +4
    ./tool/scratchie/model/ScratchieAnswerVisitLog.java
    • -10
    • +10
    ./tool/scratchie/model/ScratchieBurningQuestion.java
    • -7
    • +7
    ./tool/scratchie/model/ScratchieConfigItem.java
    • -6
    • +6
    ./tool/scratchie/model/ScratchieItem.java
    • -10
    • +10
    ./tool/scratchie/model/ScratchieSession.java
    • -15
    • +15
    ./tool/scratchie/model/ScratchieUser.java
    • -3
    • +3
    ./tool/scratchie/service/ScratchieImportContentVersionFilter.java
    • -3
    • +3
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +3
    ./tool/scratchie/web/controller/AdminController.java
    • -6
    • +6
    ./tool/scratchie/web/controller/AuthoringController.java
    • -4
    • +4
    ./tool/scratchie/web/controller/ClearSessionController.java
  16. … 941 more files in changeset.
Tuesday 09 Jan 2024
9:41 am

Marcin Cieslak

LDEV-5436 Project-wide user sorting by last then first name

Options
    • -7
    • +8
    ./tool/scratchie/model/ScratchieUser.java
    • -7
    • +6
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +5
    ./tool/scratchie/web/controller/LearningController.java
  4. … 148 more files in changeset.
Tuesday 02 Jan 2024
3:33 pm

Marcin Cieslak

LDEV-5420 Add questions print button to Scratchie

Options
    • -0
    • +21
    ./tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Friday 29 Dec 2023
10:38 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

Options
    • -1
    • +15
    ./tool/scratchie/ScratchieConstants.java
  2. … 9 more files in changeset.
Wednesday 27 Dec 2023
10:09 pm

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -81
    • +0
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
10:09 pm

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -81
    • +0
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
9:04 pm

Andrey Balan

LDEV-5425 Remove "End of activity" notebook from *all* tools

Options
    • -12
    • +0
    ./tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./tool/scratchie/dbupdates/patch20231221.sql
    • -50
    • +0
    ./tool/scratchie/dto/ReflectDTO.java
    • -22
    • +0
    ./tool/scratchie/model/Scratchie.java
    • -1
    • +0
    ./tool/scratchie/scratchieApplicationContext.xml
    • -38
    • +0
    ./tool/scratchie/service/IScratchieService.java
    • -81
    • +1
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -151
    • +1
    ./tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningWebsocketServer.java
    • -9
    • +8
    ./tool/scratchie/web/controller/MonitoringController.java
    • -67
    • +0
    ./tool/scratchie/web/form/ReflectionForm.java
  12. … 509 more files in changeset.
2:13 pm

Marcin Cieslak

LDEV-5363 Make RAT questions sync optional

Options
    • -0
    • +2
    ./tool/scratchie/ScratchieConstants.java
    • -56
    • +61
    ./tool/scratchie/web/controller/AuthoringController.java
  3. … 12 more files in changeset.
Friday 22 Dec 2023
4:00 pm

Marcin Cieslak

LDEV-5433 Squash DB patches and update versions

Options
    • -14
    • +0
    ./tool/scratchie/dbupdates/patch20220920.sql
    • -14
    • +0
    ./tool/scratchie/dbupdates/patch20230220.sql
    • -14
    • +0
    ./tool/scratchie/dbupdates/patch20230410.sql
    • -0
    • +12
    ./tool/scratchie/dbupdates/patch20230410_updateTo47.sql
    • -0
    • +13
    ./tool/scratchie/dbupdates/patch20230411.sql
  6. … 103 more files in changeset.
Thursday 21 Dec 2023
9:42 am

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -47
    • +63
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 38 more files in changeset.
Tuesday 17 Oct 2023
1:05 pm

Marcin Cieslak

LDEV-5401 Fix timer not starting on multiple learners entering activity

Options
    • -1
    • +1
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Thursday 28 Sep 2023
10:05 pm

Andrey Balan

LDEV-5397 Switch to server side redirects

Options
    • -5
    • +3
    ./tool/scratchie/ScratchieConstants.java
    • -8
    • +3
    ./tool/scratchie/web/controller/LearningController.java
  3. … 20 more files in changeset.
Thursday 24 Aug 2023
1:54 am

Andrey Balan

LDEV-5410 fix exception on trying to submit notebook after SubmissionDeadline date is set

Options
    • -12
    • +12
    ./tool/scratchie/web/controller/LearningController.java
Friday 23 Jun 2023
5:33 pm

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute timer to other tools

Options
    • -1
    • +4
    ./tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./tool/scratchie/dbupdates/patch20230621.sql
    • -15
    • +25
    ./tool/scratchie/model/Scratchie.java
    • -0
    • +37
    ./tool/scratchie/service/ScratchieServiceImpl.java
    • -15
    • +18
    ./tool/scratchie/web/controller/LearningController.java
    • -1
    • +2
    ./tool/scratchie/web/controller/LearningWebsocketServer.java
    • -19
    • +27
    ./tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +8
    ./tool/scratchie/web/controller/TblMonitorController.java
  9. … 35 more files in changeset.
Wednesday 21 Jun 2023
8:10 pm

Marcin Cieslak

LDEV-5401 Add learner-triggered absolute time limit authoring and learning

Options
    • -1
    • +1
    ./tool/scratchie/web/controller/LearningWebsocketServer.java
  2. … 16 more files in changeset.
Tuesday 30 May 2023
9:35 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -77
    • +93
    ./tool/scratchie/service/ScratchieServiceImpl.java
  2. … 10 more files in changeset.