lams-github / lams_monitoring

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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
Tuesday 09 Jan 2024
4:41 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -7
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  4. … 148 more files in changeset.
Monday 08 Jan 2024
6:47 pm

Marcin Cieslak

LDEV-5436 Add project-wide User sorting on Java level

Options
    • -2
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -7
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  3. … 9 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
    • -21
    • +24
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.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
    • -29
    • +24
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 34 more files in changeset.
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
    • -29
    • +24
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 34 more files in changeset.
4:04 am

Andrey Balan

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

Options
    • -29
    • +24
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 519 more files in changeset.
Thursday 21 Dec 2023
9:02 pm

Marcin Cieslak

LDEV-5431 Do not remove from groups and leaders on "Keep content"

Options
    • -21
    • +24
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 2 more files in changeset.
4:42 pm

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -10
    • +9
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 38 more files in changeset.
Wednesday 13 Dec 2023
10:36 pm

Marcin Cieslak

LDEV-5402 Fix LD path building on Monitoring page

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
9:54 pm

Marcin Cieslak

LDEV-5402 Fix LD path building on Monitoring page

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
Thursday 23 Nov 2023
8:09 pm

Marcin Cieslak

LDEV-5423 Complete Flux on all subscriptions terminated

Also:

* use separate and configurable task executor for async requests

* introduce backlog pressure strategy for Fluxes

* synchronise access to Flux mapping

* add logs

Options
    • -4
    • +12
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 3 more files in changeset.
Friday 27 Oct 2023
7:17 pm

Marcin Cieslak

LDEV-5260 Fix multiple timers Flux

Options
    • -6
    • +44
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
Thursday 19 Oct 2023
12:13 am

Marcin Cieslak

LDEV-5341 Skip privileges when starting lesson via Quartz Job

Links to

https://lamssupport.atlassian.net/browse/LKC-154

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/monitoring/quartz/job/StartScheduleLessonJob.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 1 more file in changeset.
Wednesday 11 Oct 2023
7:37 pm

Marcin Cieslak

LDEV-5407 Show "return to index" link only for non-integrated courses

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 1 more file in changeset.
Thursday 28 Sep 2023
6:36 pm

Marcin Cieslak

LDEV-5341 Skip privileges when suspending lesson via Quartz Job

Following

https://lamssupport.atlassian.net/browse/LKC-145

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 26 Sep 2023
5:31 pm

Marcin Cieslak

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

# Conflicts:

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

# lams_monitoring/web/includes/javascript/monitorLesson.js

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 9 more files in changeset.
Saturday 09 Sep 2023
2:31 pm

Marcin Cieslak

LDEV-5337 Add "return to monitoring button" to Team Setup screen

Options
    • -4
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  2. … 5 more files in changeset.
Saturday 26 Aug 2023
9:35 pm

Marcin Cieslak

LDEV-5337 Inform which learners were skipped during grouping upload

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -125
    • +133
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -23
    • +26
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  4. … 4 more files in changeset.
6:21 pm

Marcin Cieslak

LDEV-5338 Properly set chosen groups even for other grouping types

Options
    • -45
    • +45
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -30
    • +31
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -31
    • +34
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  4. … 5 more files in changeset.
Friday 18 Aug 2023
6:45 pm

Marcin Cieslak

LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 6 more files in changeset.
5:31 pm

Marcin Cieslak

LDEV-5337 Add "return to monitoring button" to Team Setup screen

Options
    • -22
    • +26
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  2. … 3 more files in changeset.
5:31 pm

Marcin Cieslak

LDEV-5337 Add "return to monitoring button" to Team Setup screen

Options
    • -22
    • +26
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
  2. … 3 more files in changeset.
Tuesday 15 Aug 2023
4:10 pm

Marcin Cieslak

LDEV-5407 Remove monitor link to return to index page for integrations

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 1 more file in changeset.
Wednesday 26 Jul 2023
10:01 pm

Marcin Cieslak

SP-9 Rewrite lesson completion chart to new ChartJS

Options
    • -5
    • +8
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 5 more files in changeset.
Friday 14 Jul 2023
12:24 am

Marcin Cieslak

LDEV-5402 Display path to Learning Design in authoring

Options
    • -89
    • +89
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
Wednesday 26 Apr 2023
2:02 pm

Marcin Cieslak

LDEV-5386 Library management

Options
    • -16
    • +3
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 70 more files in changeset.
Monday 24 Apr 2023
6:30 pm

Marcin Cieslak

LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

Options
    • -0
    • +40
    ./java/org/lamsfoundation/lams/monitoring/web/BranchingController.java
    • -91
    • +65
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  3. … 5 more files in changeset.
Tuesday 11 Apr 2023
3:00 am

Marcin Cieslak

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  2. … 6 more files in changeset.
Friday 07 Apr 2023
7:55 pm

Marcin Cieslak

LDEV-5350 Do not remove groups used for branching on spreadsheet upload

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 1 more file in changeset.
Monday 27 Feb 2023
5:53 pm

Marcin Cieslak

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

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -158
    • +9
    ./java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 11 more files in changeset.