lams-github

lams_monitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
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 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +47
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +548
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -13
    • +43
    ./src/java/org/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
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +18
    ./web/css/_monitorLesson_base.scss
    • -0
    • +22
    ./web/includes/javascript/monitorLesson.js
    • -4
    • +19
    ./web/monitor.jsp
    • -0
    • +15
    ./web/monitorTour.jsp
  9. … 1 more file 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
    ./src/java/org/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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +71
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +33
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -1
    • +1
    ./web/gate/gateStatus.jsp
    • -0
    • +66
    ./web/gate/scheduleGateContent.jsp
  8. … 9 more files in changeset.
8:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4477 Disable lesson on schedule

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +19
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -56
    • +118
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +19
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -1
    • +0
    ./web/css/_monitorLesson_base.scss
    • -22
    • +76
    ./web/includes/javascript/monitorLesson.js
    • -7
    • +27
    ./web/monitor.jsp
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
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +5
    ./web/css/_monitorLesson_base.scss
    • -3
    • +1
    ./web/includes/javascript/monitorLesson.js
    • -4
    • +5
    ./web/monitor.jsp
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
    ./src/java/org/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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +47
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +8
    ./web/css/_monitorLesson_base.scss
    • -21
    • +49
    ./web/grouping/viewGroups.jsp
  5. … 7 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 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
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +65
    ./src/java/org/lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -0
    • +403
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -1
    • +1
    ./web/grouping/chosenGrouping.jsp
  6. … 11 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Tuesday 14 Nov 2017
6:55 pm

Marcin Cieslak

LDEV-4459 Add icons to navigation buttons

Options
    • -2
    • +2
    ./web/emailnotifications/courseNotifications.jsp
    • -2
    • +2
    ./web/emailnotifications/lessonNotifications.jsp
6:51 pm

Marcin Cieslak

LDEV-4459 Export archived email notification

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +52
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +50
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -1
    • +15
    ./web/emailnotifications/archivedEmailList.jsp
5:38 pm

Marcin Cieslak

LDEV-4459 Display a paged list of email notification recipients

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +61
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -7
    • +32
    ./web/emailnotifications/archivedEmailList.jsp
  6. … 3 more files in changeset.
Monday 13 Nov 2017
11:59 pm

Marcin Cieslak

LDEV-4459 Display archived email notifications

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -10
    • +18
    ./web/emailnotifications/archivedEmailList.jsp
11:41 pm

Marcin Cieslak

LDEV-4459 Archive immediate or scheduled email notifications

Options
    • -4
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -3
    • +7
    ./web/emailnotifications/courseNotifications.jsp
    • -5
    • +7
    ./web/emailnotifications/lessonNotifications.jsp
  7. … 4 more files in changeset.
6:25 pm

Marcin Cieslak

LDEV-4459 Archived notifications front end

Options
    • -1
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -23
    • +56
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -12
    • +0
    ./web/emailnotifications/additionalSettings.jsp
    • -0
    • +90
    ./web/emailnotifications/archivedEmailList.jsp
    • -1
    • +15
    ./web/emailnotifications/courseNotifications.jsp
    • -1
    • +15
    ./web/emailnotifications/lessonNotifications.jsp
Wednesday 01 Nov 2017
7:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4450: Learner icons in progress tab have portraits

Options
    • -17
    • +36
    ./web/includes/javascript/monitorLesson.js
  2. … 4 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
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -63
    • +74
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +12
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 6 more files in changeset.
Tuesday 17 Oct 2017
7:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -11
    • +14
    ./web/emailnotifications/courseNotifications.jsp
    • -9
    • +13
    ./web/emailnotifications/lessonNotifications.jsp
    • -5
    • +0
    ./web/monitor.jsp
  4. … 13 more files in changeset.
Friday 13 Oct 2017
9:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -12
    • +14
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 12 Oct 2017
11:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Spanish for various projects

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 5 more files in changeset.
Wednesday 11 Oct 2017
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4415' Marks can now be weighted

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
12:39 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 27 Sep 2017
3:43 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Course export uses percentages, tour supports weights

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    ./web/monitorTour.jsp
  3. … 1 more file 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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +40
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 22 Sep 2017
11:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

Options
    • -14
    • +1
    ./web/css/_monitorLesson_base.scss
    • -1
    • +2
    ./web/grouping/viewGroups.jsp
    • -7
    • +17
    ./web/includes/javascript/monitorLesson.js
    • -0
    • +1
    ./web/monitor.jsp
  5. … 9 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 more files 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
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java