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 05 Sep 2018
4:26 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 and LDEV-4599 adding and updating labels

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +13
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +8
    ./conf/language/lams/ApplicationResources_es_ES.properties
Thursday 30 Aug 2018
6:28 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 trying to solve problems with grouping upload

Options
    • -13
    • +11
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -1
    • +1
    ./web/grouping/chosenGrouping.jsp
  3. … 1 more file in changeset.
4:42 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 updated lesson notification

Options
    • -1
    • +1
    ./web/emailnotifications/lessonNotifications.jsp
1:12 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 updated paths to monitoring and central

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -2
    • +2
    ./web/emailnotifications/courseNotifications.jsp
    • -2
    • +2
    ./web/emailnotifications/lessonNotifications.jsp
    • -1
    • +1
    ./web/gate/gateInfo.jsp
    • -4
    • +4
    ./web/includes/javascript/monitorLesson.js
    • -1
    • +1
    ./web/monitor.jsp
    • -5
    • +5
    ./web/tblmonitor/tblmonitor.jsp
Wednesday 29 Aug 2018
4:38 pm

Marcin Cieslak

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

Options
    • -0
    • +449
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
  2. … 5 more files in changeset.
2:14 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changed jsp files - without html tag

Options
    • -1
    • +0
    ./web/emailnotifications/courseNotifications.jsp
    • -2
    • +1
    ./web/emailnotifications/lessonNotifications.jsp
5:42 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Changed paths to central (needed old, struts paths)

Options
    • -4
    • +4
    ./web/includes/javascript/monitorLesson.js
Tuesday 28 Aug 2018
8:46 pm

Andrey Balan

Merge branch 'LDEV-4407'

Options
    • -33
    • +41
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -13
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 3 more files in changeset.
5:53 am

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
    ./src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java
    • -310
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -41
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
    • -1
    • +1
    ./web/emailnotifications/scheduledEmailList.jsp
    • -4
    • +2
    ./web/includes/javascript/monitorLesson.js
    • -0
    • +11
    ./web/taglibs.jsp
    • -2
    • +2
    ./web/tblmonitor/sequence.jsp
    • -11
    • +0
    ./web/template/taglibs.jsp
  10. … 7 more files in changeset.
Saturday 25 Aug 2018
7:55 pm

Andrey Balan

LDEV-4407 Remove obsolete methods

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

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -1
    • +0
    ./.classpath
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -11
    • +10
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
    • -2
    • +2
    ./web/tblmonitor/forum.jsp
    • -2
    • +2
    ./web/tblmonitor/peerreview.jsp
  8. … 103 more files in changeset.
4:16 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Monitoring - noStruts and no tiles

Options
    • -1
    • +1
    ./.classpath
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/BranchingController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -282
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java
    • -0
    • +310
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -571
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -0
    • +577
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -57
    • +52
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -287
    • +0
    ./web/WEB-INF/struts-config.xml
    • -5
    • +5
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +7
    ./web/WEB-INF/tags/CommentsAuthor.tag
  16. … 42 more files in changeset.
Friday 24 Aug 2018
11:18 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of monitoring - changes at jsp files

Options
    • -83
    • +90
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -34
    • +37
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -55
    • +90
    ./web/complexProgress.jsp
    • -6
    • +1
    ./web/emailnotifications/additionalSettings.jsp
    • -11
    • +5
    ./web/emailnotifications/archivedEmailList.jsp
    • -15
    • +9
    ./web/emailnotifications/courseNotifications.jsp
    • -13
    • +7
    ./web/emailnotifications/lessonNotifications.jsp
    • -12
    • +6
    ./web/emailnotifications/scheduledEmailList.jsp
    • -14
    • +10
    ./web/errorbox.jsp
    • -34
    • +64
    ./web/gate/conditionGateContent.jsp
    • -6
    • +6
    ./web/gate/gateInfo.jsp
    • -12
    • +12
    ./web/gate/gateStatus.jsp
    • -6
    • +6
    ./web/gate/openGateSingleUser.jsp
    • -35
    • +66
    ./web/gate/permissionGateContent.jsp
    • -86
    • +96
    ./web/gate/scheduleGateContent.jsp
  16. … 11 more files in changeset.
3:08 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of monitoring - controllers

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Schedule gate monitoring works for a scheduled lesson

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +17
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -1
    • +1
    ./web/gate/scheduleGateContent.jsp
Sunday 19 Aug 2018
11:14 pm

Marcin Cieslak

LDEV-4644 Display and edit outcome results in monitor gradebook

Options
    • -20
    • +0
    ./web/css/_monitorLesson_base.scss
    • -0
    • +1
    ./web/monitor.jsp
  3. … 17 more files in changeset.
1:44 am

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
    ./src/java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -3
    • +16
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -76
    • +80
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -29
    • +47
    ./src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -41
    • +66
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -22
    • +163
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +471
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  9. … 96 more files in changeset.
Friday 17 Aug 2018
1:19 pm

Marcin Cieslak

Merge from master to include x-editable

Options
    • -14
    • +11
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 116 more files in changeset.
Wednesday 15 Aug 2018
6:19 pm

Andrey Balan

LDEV-4534 Ability to rename lesson title

Options
    • -0
    • +31
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +30
    ./web/css/_monitorLesson_base.scss
    • -1
    • +28
    ./web/includes/javascript/monitorLesson.js
    • -3
    • +7
    ./web/monitor.jsp
Tuesday 14 Aug 2018
9:01 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning and Gradebook

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
  2. … 64 more files in changeset.
Monday 13 Aug 2018
2:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

English, Spanish and Greek.

Options
    • -24
    • +22
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -9
    • +22
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -7
    • +20
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 16 more files in changeset.
Monday 30 Jul 2018
10: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
    ./src/java/org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java
  2. … 19 more files in changeset.
Saturday 21 Jul 2018
9:27 pm

Andrey Balan

LDEV-4635 Increase contrast in TBL monitor charts

Options
    • -4
    • +4
    ./web/tblmonitor/teams.jsp
9:07 pm

Andrey Balan

LDEV-4613 tRA students' choices page to display all scratches

Options
    • -0
    • +14
    ./web/css/_tblmonitor_base.scss
  2. … 9 more files in changeset.
Thursday 05 Jul 2018
9:35 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4612 Mindmap has full screen mode.

Options
    • -65
    • +0
    ./web/css/timer.scss
    • -54
    • +3
    ./web/timer.jsp
  3. … 7 more files in changeset.
Sunday 24 Jun 2018
8: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
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  2. … 23 more files in changeset.
Wednesday 20 Jun 2018
6:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Tweaking date validation and display of scheduled dates

Options
    • -3
    • +3
    ./web/includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Monday 18 Jun 2018
8:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Tweaking css and button display for disabling lessons

Options
    • -1
    • +13
    ./web/css/_monitorLesson_base.scss
    • -7
    • +9
    ./web/includes/javascript/monitorLesson.js
    • -3
    • +2
    ./web/monitor.jsp
12:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +17
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -21
    • +61
    ./web/includes/javascript/monitorLesson.js
    • -22
    • +32
    ./web/monitor.jsp
  5. … 5 more files in changeset.