lams-github / lams_monitoring / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.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/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -27
    • +41
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -23
    • +108
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  3. … 82 more files in changeset.
Tuesday 13 Mar 2018
2:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4529 Notification lesson list restricted on Monitor access

Options
    • -14
    • +28
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  2. … 1 more file in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 34 more files in changeset.
Sunday 04 Mar 2018
2:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -47
    • +33
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -10
    • +14
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -13
    • +10
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 11 more files in changeset.
Friday 02 Mar 2018
11:13 pm

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  2. … 13 more files in changeset.
Wednesday 28 Feb 2018
7:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +5
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  3. … 7 more files in changeset.
12:52 am

Andrey Balan

LDEV-4520 Change the way TBL activity is detected

TBL activity should contain the following sequence Grouping->(MCQ or

Assessment)->Leader Selection->Scratchie but it might have some other

gates or activities in the middle though.

Options
    • -44
    • +68
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 27 Feb 2018
3:42 am

Andrey Balan

LKC-89 Move TBL Monitoring interface from lams-private

Add a switch that would display TBL UI monitoring interface. It

should be available only to the TBL template lessons.

Besides, modify the TBL UI monitor as in some cases the iRA (the first

assessment is not only just MCQ, but Assessment). So the change would be

to add as iRA the first assessment activity whether this is MCQ or

assessment.

Options
    • -0
    • +81
    ./lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -0
    • +92
    ./lamsfoundation/lams/monitoring/dto/TblGroupDTO.java
    • -0
    • +32
    ./lamsfoundation/lams/monitoring/dto/TblUserDTO.java
    • -0
    • +435
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  5. … 10 more files in changeset.
3:29 am

Andrey Balan

LKC-89 add auxiliary methods required for TBL monitoring

Options
    • -0
    • +61
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 4 more files in changeset.
Thursday 22 Feb 2018
2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -47
    • +33
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 65 more files in changeset.
Thursday 15 Feb 2018
4:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  2. … 33 more files in changeset.
Tuesday 06 Feb 2018
5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -13
    • +13
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -10
    • +14
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -13
    • +10
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  5. … 59 more files in changeset.
Friday 02 Feb 2018
10:16 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -9
    • +9
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  2. … 56 more files in changeset.
12:10 am

Andrey Balan

LDEV-4407 Introduce new IMonitorFullService interface

MonitorService interfaces are redefined now:

1. IMonitorService is going to be used by core modules.

2. IMonitorFullService is used inside of lams_monitoring only and

nowhere else, as it contains lams_monitoring's internal logic and

classes.

Options
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/CloseScheduleGateJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -0
    • +363
    ./lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -723
    • +0
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -8
    • +19
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -67
    • +0
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceException.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -2
    • +3
    ./lamsfoundation/lams/monitoring/web/BranchingAction.java
    • -6
    • +3
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
    • -7
    • +8
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  16. … 17 more files in changeset.
Thursday 01 Feb 2018
11:11 pm

Andrey Balan

LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

Options
    • -7
    • +6
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -11
    • +2
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  5. … 31 more files in changeset.
Friday 26 Jan 2018
2:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  3. … 77 more files in changeset.
Tuesday 19 Dec 2017
1:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.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/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.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_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_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.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_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_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

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

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

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

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

Options
    • -5
    • +160
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +47
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +548
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -13
    • +43
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  5. … 42 more files in changeset.
Sunday 17 Dec 2017
2:27 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4487 Toggle display activity scores option in monitor

Options
    • -0
    • +3
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +9
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +19
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 6 more files in changeset.
Wednesday 13 Dec 2017
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4477 Disable trigger removed when status changed.

Options
    • -7
    • +20
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

Options
    • -0
    • +3
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +71
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +33
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  4. … 13 more files in changeset.
1:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4477 Disable lesson on schedule

Options
    • -0
    • +1
    ./lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +19
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -56
    • +118
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +19
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  6. … 4 more files in changeset.
Sunday 10 Dec 2017
6:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4476: Monitor can change the scheduled start date.

Options
    • -22
    • +28
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 3 more files in changeset.
Wednesday 06 Dec 2017
3:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

Options
    • -63
    • +200
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
  2. … 4 more files in changeset.
Tuesday 05 Dec 2017
3:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4484 Print Grouping Page

Options
    • -2
    • +47
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  2. … 10 more files in changeset.
Tuesday 21 Nov 2017
12:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Create groupings based on file upload

Options
    • -0
    • +5
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +50
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +65
    ./lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -0
    • +403
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
  5. … 12 more files in changeset.
Tuesday 14 Nov 2017
11:51 am

Marcin Cieslak

LDEV-4459 Export archived email notification

Options
    • -0
    • +7
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +52
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +50
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  4. … 2 more files in changeset.
10:38 am

Marcin Cieslak

LDEV-4459 Display a paged list of email notification recipients

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +11
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +61
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  5. … 4 more files in changeset.
Monday 13 Nov 2017
4:59 pm

Marcin Cieslak

LDEV-4459 Display archived email notifications

Options
    • -0
    • +5
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +10
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  4. … 1 more file in changeset.
4:41 pm

Marcin Cieslak

LDEV-4459 Archive immediate or scheduled email notifications

Options
    • -4
    • +11
    ./lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -0
    • +8
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +11
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +10
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  5. … 6 more files in changeset.
11:25 am

Marcin Cieslak

LDEV-4459 Archived notifications front end

Options
    • -23
    • +56
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  2. … 7 more files in changeset.