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
Wednesday 29 Aug 2018
7:12 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 updated paths to monitoring and central

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 6 more files in changeset.
10:38 am

Marcin Cieslak

Merge Asia's and Michal's progress in core projects

Options
    • -0
    • +449
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
  2. … 5 more files in changeset.
Tuesday 28 Aug 2018
2:46 pm

Andrey Balan

Merge branch 'LDEV-4407'

Options
    • -33
    • +41
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -13
    • +4
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 3 more files in changeset.
Monday 27 Aug 2018
11:53 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

Options
    • -190
    • +0
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -310
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -41
    • +0
    ./lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
  5. … 12 more files in changeset.
Saturday 25 Aug 2018
1:55 pm

Andrey Balan

LDEV-4407 Remove obsolete methods

Options
    • -36
    • +0
    ./lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -18
    • +10
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 2 more files in changeset.
1:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -5
    • +5
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -9
    • +8
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -11
    • +10
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  5. … 106 more files in changeset.
Friday 24 Aug 2018
10:16 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Monitoring - noStruts and no tiles

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -282
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java
    • -0
    • +310
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -571
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -0
    • +577
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -57
    • +52
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
  10. … 48 more files in changeset.
5:18 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of monitoring - changes at jsp files

Options
    • -83
    • +90
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -34
    • +37
    ./lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 24 more files in changeset.
Thursday 23 Aug 2018
9:08 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of monitoring - controllers

Options
    • -190
    • +0
    ./lamsfoundation/lams/monitoring/web/BranchingAction.java
    • -0
    • +190
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -230
    • +0
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
    • -0
    • +219
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java
    • -747
    • +0
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -0
    • +761
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -324
    • +0
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -0
    • +330
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -18
    • +22
    ./lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -364
    • +0
    ./lamsfoundation/lams/monitoring/web/GateAction.java
    • -0
    • +295
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -0
    • +130
    ./lamsfoundation/lams/monitoring/web/GateForm.java
    • -442
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +442
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -1756
    • +0
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  16. … 8 more files in changeset.
Monday 20 Aug 2018
5:51 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Schedule gate monitoring works for a scheduled lesson

Options
    • -0
    • +10
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +17
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 1 more file in changeset.
Saturday 18 Aug 2018
7:44 pm

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

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/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -3
    • +16
    ./lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -76
    • +80
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -29
    • +47
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -5
    • +8
    ./lamsfoundation/lams/monitoring/web/GateAction.java
    • -41
    • +66
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -22
    • +163
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +471
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  9. … 96 more files in changeset.
Wednesday 15 Aug 2018
12:19 pm

Andrey Balan

LDEV-4534 Ability to rename lesson title

Options
    • -0
    • +31
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 3 more files in changeset.
Tuesday 14 Aug 2018
3:01 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning and Gradebook

Options
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  2. … 64 more files in changeset.
Monday 30 Jul 2018
4:40 pm

Marcin Cieslak

LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/dto/TblUserDTO.java
  2. … 19 more files in changeset.
Sunday 24 Jun 2018
2:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -4
    • +17
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 23 more files in changeset.
Monday 18 Jun 2018
6:42 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Schedule the end date when teacher creates a lesson.

Options
    • -4
    • +17
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 8 more files in changeset.
Saturday 16 Jun 2018
5:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -2
    • +4
    ./lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
  3. … 8 more files in changeset.
Wednesday 30 May 2018
2:19 pm

Marcin Cieslak

LDEV-4587 Remove obsolete action

Options
    • -41
    • +0
    ./lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
  2. … 1 more file in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -45
    • +68
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -4
    • +20
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  3. … 21 more files in changeset.
Tuesday 15 May 2018
2:41 pm

Andrey Balan

LDEV-4569 add support for LKC TBL monitoring case

There is a special case, used for LKC TBL monitoring only, when

learning design doesn't contain Scratchie activities. In this case

all Assessments should be shown as AEs.

Options
    • -3
    • +16
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
Tuesday 01 May 2018
5:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4560 Improved Audit message for force complete

Options
    • -4
    • +20
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 2 more files in changeset.
Friday 27 Apr 2018
11:04 pm

Andrey Balan

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

Options
    • -0
    • +9
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Tuesday 24 Apr 2018
12:01 am

Andrey Balan

LDEV-4563 Prevent adding non lesson learners to groupings

Options
    • -41
    • +57
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
Thursday 29 Mar 2018
1:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

Options
    • -7
    • +23
    ./lamsfoundation/lams/monitoring/dto/PermissionGateDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -38
    • +50
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -5
    • +8
    ./lamsfoundation/lams/monitoring/web/GateAction.java
    • -27
    • +28
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  7. … 7 more files in changeset.
Tuesday 27 Mar 2018
11:51 pm

Andrey Balan

LDEV-4537 Add Peer Review tab to TBL monitoring

Options
    • -0
    • +22
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  2. … 8 more files in changeset.
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.