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
Tuesday 19 Dec 2017
8: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
9: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
9: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
4:04 pm

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.
8: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
1:13 pm

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
10: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
10: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
7: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
6:51 pm

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.
5:38 pm

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
11: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.
11: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.
6:25 pm

Marcin Cieslak

LDEV-4459 Archived notifications front end

Options
    • -23
    • +56
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
  2. … 7 more files in changeset.
Tuesday 31 Oct 2017
12:59 am

Marcin Cieslak

LDEV-4453 Add "gradebook on lesson complete" field to Lesson

Options
    • -7
    • +9
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -63
    • +74
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +12
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 6 more files in changeset.
Sunday 24 Sep 2017
9:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4420 Lesson status changes recorded in audit log.

Options
    • -3
    • +40
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 1 more file in changeset.
Friday 15 Sep 2017
10:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4412: Audit log entries are created when lessons are removed.

Options
    • -0
    • +8
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 1 more file in changeset.
Friday 18 Aug 2017
4:04 am

Andrey Balan

LDEV-4407 Move ContributeDTOFactory to the proper package

ContributeDTOFactory were moved to

org.lamsfoundation.lams.monitoring.service package.

(To access file's earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -170
    • +0
    ./lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -0
    • +170
    ./lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -49
    • +51
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -28
    • +27
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -26
    • +29
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -82
    • +77
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  5. … 132 more files in changeset.
Thursday 01 Jun 2017
3:31 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4274: Initial implementation of a Learner Progress Report email, to be sent to Monitors on a set of dates. Dates are entered via a new dialog box in monitoring. The code works as long as the mailserver is running when the reports are emailed but if it fails then the emails do not resend properly.

Options
    • -0
    • +60
    ./lamsfoundation/lams/monitoring/dto/EmailProgressActivityDTO.java
    • -0
    • +2
    ./lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +52
    ./lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java
    • -15
    • +0
    ./lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -8
    • +17
    ./lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
    • -0
    • +107
    ./lamsfoundation/lams/monitoring/service/EmailProgressActivitiesProcessor.java
    • -0
    • +4
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +118
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +325
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
  10. … 9 more files in changeset.
Friday 12 May 2017
10:28 pm

Andrey Balan

LDEV-4341 Ability to save lesson grouping as a course grouping

Options
    • -23
    • +103
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  2. … 4 more files in changeset.
Tuesday 18 Apr 2017
11:37 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4301:Incurate pie chart in monitor

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
Wednesday 05 Apr 2017
9:20 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4301:Incurate pie chart in monitor

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 28 Mar 2017
5:48 pm

Andrey Balan

LDEV-4294 Add audit log for notifications

Options
    • -4
    • +7
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
2:40 am

Andrey Balan

LDEV-4294 Add audit log for notifications

Options
    • -41
    • +51
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
Friday 24 Mar 2017
2:58 am

Marcin Cieslak

LDEV-4288: Archive gradebook on lesson retry. Remove activity content on lesson retry.

Options
    • -1
    • +4
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -8
    • +20
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -6
    • +6
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 13 more files in changeset.
Friday 10 Mar 2017
6:35 pm

Andrey Balan

LDEV-4264 Fix archive lessons feature

Options
    • -2
    • +13
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -52
    • +7
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  3. … 2 more files in changeset.
Thursday 02 Mar 2017
6:33 pm

Marcin Cieslak

LDEV-4224: Fix method references.

Options
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Wednesday 15 Feb 2017
1:06 pm

Marcin Cieslak

LDEV-4224: Pass IDs instead of objects into transactional methods so the objects are not cached and reused in subsequent retries.

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 3 more files in changeset.
Monday 06 Feb 2017
7:16 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4199: Branching activities screens were missing when the green dots were clicked in the sequence screen. The screens are not wanted so have changed it so the dots don't work.

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java