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
Wednesday 02 May 2018
6:23 am

Andrey Balan

LDEV-4570 Properly implementing refresh the page feature

After refreshing the page (either by cmd+R or Refresh button) it

should refresh currently opened tab and not "sequence" one as it

used to be.

Options
    • -18
    • +19
    ./web/tblmonitor/tblmonitor.jsp
Tuesday 01 May 2018
11:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4560 Improved Audit message for force complete

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +20
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
5:02 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569 TBL UI: adjustments

minor adjustments to .courses-title

Options
    • -1
    • +3
    ./web/css/_tblmonitor_base.scss
3:35 am

Andrey Balan

LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

Options
    • -0
    • +404
    ./web/css/_tblmonitor_base.scss
    • -0
    • +2
    ./web/css/defaultHTML_tblmonitor.scss
    • -0
    • +2
    ./web/css/purple_tblmonitor.scss
    • -407
    • +0
    ./web/css/tblmonitor.scss
    • -6
    • +4
    ./web/tblmonitor/tblmonitor.jsp
  6. … 1 more file in changeset.
Saturday 28 Apr 2018
5:04 am

Andrey Balan

LDEV-4567 Skip adding users to grouping if they don't belong to the org

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Wednesday 25 Apr 2018
7:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating Norwegian

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 24 Apr 2018
6:01 am

Andrey Balan

LDEV-4563 Prevent adding non lesson learners to groupings

Options
    • -41
    • +57
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Thursday 12 Apr 2018
3:32 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: fixing Greek quotes in javascript

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
Wednesday 11 Apr 2018
6:18 pm

Marcin Cieslak

LDEV-4552 Make Edit Class dialog wider and fit its space better

Options
    • -1
    • +1
    ./web/includes/javascript/monitorLesson.js
    • -2
    • +2
    ./web/monitor.jsp
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
7:39 pm

Marcin Cieslak

LDEV-4540 Add "disclose all" buttons to TBL monitor

Options
    • -0
    • +4
    ./web/css/tblmonitor.scss
  2. … 2 more files in changeset.
5:53 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4538'

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
Sunday 08 Apr 2018
9:41 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4538 Timeago converting gates to relative times

Options
    • -0
    • +10
    ./web/gate/gateStatus.jsp
    • -0
    • +8
    ./web/tblmonitor/gates.jsp
1:32 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -4
    • +40
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 1 more file in changeset.
Friday 06 Apr 2018
10:55 pm

Marcin Cieslak

LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

Options
    • -0
    • +4
    ./web/css/tblmonitor.scss
  2. … 12 more files in changeset.
Tuesday 03 Apr 2018
8:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -4
    • +56
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -19
    • +48
    ./conf/language/lams/ApplicationResources.properties
    • -10
    • +28
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 55 more files in changeset.
Thursday 29 Mar 2018
7:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +23
    ./src/java/org/lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -38
    • +50
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -27
    • +28
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -1
    • +1
    ./web/css/tblmonitor.scss
    • -2
    • +10
    ./web/gate/gateStatus.jsp
    • -4
    • +12
    ./web/tblmonitor/gates.jsp
  11. … 3 more files in changeset.
4:33 am

Andrey Balan

LDEV-4536 Add portrait pics to teams tabs in TBL monitoring

Options
    • -14
    • +17
    ./web/tblmonitor/teams.jsp
Wednesday 28 Mar 2018
5:51 am

Andrey Balan

LDEV-4537 Add Peer Review tab to TBL monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -0
    • +62
    ./web/tblmonitor/peerreview.jsp
    • -0
    • +15
    ./web/tblmonitor/tblmonitor.jsp
  6. … 4 more files in changeset.
Saturday 24 Mar 2018
2:12 am

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
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -23
    • +108
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +15
    ./web/WEB-INF/web.xml
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -7
    • +17
    ./web/error.jsp
  2. … 34 more files in changeset.
Tuesday 13 Mar 2018
9:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4529 Notification lesson list restricted on Monitor access

Options
    • -14
    • +28
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +2
    ./web/emailnotifications/courseNotifications.jsp
6:48 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4528 Empty Courses can only have not started notifications

Options
    • -0
    • +10
    ./web/emailnotifications/courseNotifications.jsp
Monday 05 Mar 2018
8: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
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 34 more files in changeset.
Sunday 04 Mar 2018
9: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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -47
    • +33
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -10
    • +14
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -13
    • +10
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  5. … 10 more files in changeset.
Saturday 03 Mar 2018
6:13 am

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
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -8
    • +4
    ./web/tblmonitor/tblmonitor.jsp
  3. … 12 more files in changeset.
Wednesday 28 Feb 2018
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -2
    • +2
    ./web/includes/javascript/monitorLesson.js
  4. … 6 more files in changeset.
7:52 am

Andrey Balan

LDEV-4520 Fix several CSS issues

Options
    • -5
    • +4
    ./web/css/tblmonitor.scss
    • -2
    • +2
    ./web/tblmonitor/teams.jsp
7: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
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java