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

tool

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
Friday 29 Mar 2024
1:20 am

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
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 5 more files in changeset.
Sunday 17 Mar 2024
1:17 am

Marcin Cieslak

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

Also fix existing learners' answers rewiring.

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

Marcin Cieslak

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

Options
    • -3
    • +3
    ./scratchie/service/ScratchieServiceImpl.java
Thursday 29 Feb 2024
7: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
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
Friday 16 Feb 2024
8:36 pm

Marcin Cieslak

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

Options
    • -0
    • +2
    ./scratchie/web/controller/AuthoringController.java
  2. … 4 more files in changeset.
Wednesday 31 Jan 2024
6:03 am

Andrey Balan

LDEV-5425 delete notebook leftovers

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

Marcin Cieslak

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

# Conflicts:

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

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

Marcin Cieslak

LDEV-5401 Hide individual extension from widget after learner finished

Options
    • -0
    • +5
    ./scratchie/service/ScratchieServiceImpl.java
    • -25
    • +31
    ./scratchie/web/controller/MonitoringController.java
  3. … 8 more files in changeset.
Tuesday 09 Jan 2024
4:41 pm

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-5420 Add questions print button to Scratchie

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

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
    ./scratchie/ScratchieConstants.java
  2. … 9 more files in changeset.
Thursday 28 Dec 2023
5:09 am

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
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
4:04 am

Andrey Balan

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

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

Marcin Cieslak

LDEV-5363 Make RAT questions sync optional

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

Marcin Cieslak

LDEV-5433 Squash DB patches and update versions

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

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

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

Marcin Cieslak

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

Options
    • -1
    • +1
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Friday 29 Sep 2023
4:05 am

Andrey Balan

LDEV-5397 Switch to server side redirects

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

Andrey Balan

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

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

Marcin Cieslak

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

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

Marcin Cieslak

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

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

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
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 10 more files in changeset.
Monday 22 May 2023
3:55 pm

Marcin Cieslak

LDEV-5121 Allow choosing QB collection in TBL wizard

Options
    • -137
    • +114
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 8 more files in changeset.
Wednesday 12 Apr 2023
2:08 am

Marcin Cieslak

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

Options
    • -25
    • +23
    ./scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    ./scratchie/web/controller/LearningController.java
Tuesday 11 Apr 2023
4:22 am

Marcin Cieslak

LDEV-5385 Allow real numbers in Scratchie marks

Options
    • -3
    • +3
    ./scratchie/dao/ScratchieSessionDAO.java
    • -3
    • +4
    ./scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +14
    ./scratchie/dbupdates/patch20230410.sql
    • -3
    • +3
    ./scratchie/dto/GroupSummary.java
    • -18
    • +18
    ./scratchie/dto/LeaderResultsDTO.java
    • -4
    • +4
    ./scratchie/dto/ScratchieItemDTO.java
    • -3
    • +3
    ./scratchie/model/ScratchieItem.java
    • -5
    • +3
    ./scratchie/model/ScratchieSession.java
    • -6
    • +3
    ./scratchie/service/IScratchieService.java
    • -4
    • +4
    ./scratchie/service/ScratchieOutputFactory.java
    • -28
    • +26
    ./scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    ./scratchie/web/controller/LearningController.java
    • -3
    • +2
    ./scratchie/web/controller/MonitoringController.java
  14. … 1 more file in changeset.
Monday 20 Feb 2023
6:24 pm

Marcin Cieslak

LDEV-5361 Add "require all answers" setting to Scratchie

Options
    • -0
    • +14
    ./scratchie/dbupdates/patch20230220.sql
    • -4
    • +11
    ./scratchie/model/Scratchie.java
  3. … 3 more files in changeset.
Wednesday 01 Feb 2023
9:34 pm

Marcin Cieslak

LKC-221 Set question mark when replacing question from QA

Options
    • -0
    • +1
    ./scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Friday 06 Jan 2023
4:29 pm

Marcin Cieslak

LDEV-5200, LKC-106 Make question numbering consistent between views

Options
    • -1
    • +1
    ./scratchie/web/controller/TblMonitorController.java
  2. … 1 more file in changeset.
Wednesday 30 Nov 2022
11:34 pm

Marcin Cieslak

LDEV-5347 Add Flux update to Burning Questions tab

Also indicate when there are no burning questions yet.

Options
    • -1
    • +3
    ./scratchie/ScratchieConstants.java
    • -1
    • +9
    ./scratchie/service/ScratchieServiceImpl.java
    • -8
    • +24
    ./scratchie/web/controller/TblMonitorController.java
  4. … 3 more files in changeset.
Thursday 13 Oct 2022
4:06 pm

Marcin Cieslak

LDEV-5332 Update QB option for VSA when correct option changes

Options
    • -1
    • +1
    ./scratchie/service/ScratchieServiceImpl.java