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
Sunday 19 Aug 2018
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.
Saturday 16 Jun 2018
11:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -0
    • +1
    ./web/includes/javascript/monitorLesson.js
    • -0
    • +2
    ./web/monitor.jsp
  6. … 5 more files in changeset.
Friday 15 Jun 2018
8:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4602 Full screen mode

Options
    • -6
    • +77
    ./web/css/timer.scss
    • -4
    • +63
    ./web/timer.jsp
Thursday 14 Jun 2018
1:53 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 13 more files in changeset.
Wednesday 13 Jun 2018
9:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4602 TBL Monitor launches a new window with a countdown timer

Options
    • -1
    • +11
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +53
    ./web/css/timer.scss
    • -4
    • +8
    ./web/tblmonitor/tblmonitor.jsp
    • -0
    • +231
    ./web/timer.jsp
  5. … 3 more files in changeset.
Wednesday 30 May 2018
8:19 pm

Marcin Cieslak

LDEV-4587 Remove obsolete action

Options
    • -41
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
    • -13
    • +0
    ./web/WEB-INF/struts-config.xml
Tuesday 22 May 2018
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -32
    • +32
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 48 more files in changeset.
11:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4459: small formatting change

Options
    • -2
    • +2
    ./web/emailnotifications/lessonNotifications.jsp
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -5
    • +156
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
Friday 18 May 2018
6: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
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -4
    • +20
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  3. … 21 more files in changeset.
Tuesday 15 May 2018
8: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
    ./src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
1:10 am

Andrey Balan

LDEV-4569 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -0
    • +4
    ./web/css/_tblmonitor_base.scss
    • -1
    • +10
    ./web/tblmonitor/tblmonitor.jsp
  3. … 1 more file in changeset.
Friday 11 May 2018
10:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: fixing label

Options
    • -2
    • +2
    ./web/monitor.jsp
Thursday 10 May 2018
4:42 pm

Andrey Balan

LDEV-4569 Change burning questions' heading collapse icon

Options
    • -2
    • +2
    ./web/css/_tblmonitor_base.scss
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 13 more files in changeset.
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Tuesday 08 May 2018
7:58 am

Marcin Cieslak

LDEV-4574 Re-launch monitoring after Live Edit closes

Options
    • -1
    • +1
    ./web/includes/javascript/monitorLesson.js
  2. … 2 more files in changeset.