fionam in lams

About

1,348 commits
  • Committer is not mapped to a user
  • First commit: 18 February 2015
  • Last commit: 09 June 2017
Last Week All Time
Commits: 0 1,348
Files changed: 0 2,682
Change in LOC: 0 16,253

Line History

Line Count Graph
Line Count Graph

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
 
Friday 09 Jun 2017
11:44 am

fionam

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ.

Options
    • -1
    • +7
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +41
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +82
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -0
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +21
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +58
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +10
    /lams_tool_scratchie/web/WEB-INF/struts-config.xml
    • -2
    • +23
    /lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
    • -59
    • +4
    /lams_tool_scratchie/web/pages/monitoring/statistic.jsp
    • -0
    • +69
    /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
11:44 am

fionam

file statisticpart.jsp was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
11:38 am

fionam

LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

Options
    • -0
    • +9
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -3
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -23
    • +82
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +82
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/LeaderResultsDTO.java
    • -0
    • +38
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/SessionDTO.java
    • -2
    • +37
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +65
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -6
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
    • -0
    • +66
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -8
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
    • -0
    • +6
    /lams_tool_lamc/web/WEB-INF/struts-config.xml
    • -1
    • +4
    /lams_tool_lamc/web/common/monitoringheader.jsp
    • -1
    • +17
    /lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
    • -53
    • +4
    /lams_tool_lamc/web/monitoring/Stats.jsp
    • -0
    • +163
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
11:38 am

fionam

file LeaderResultsDTO.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/LeaderResultsDTO.java
    • -0
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
11:38 am

fionam

file statsPart.jsp was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
11:27 am

fionam

file LeaderResultsDTO.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java
11:27 am

fionam

LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

Options
    • -2
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -1
    • +47
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +82
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java
    • -3
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -16
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -23
    • +0
    /lams_tool_assessment/web/includes/css/assessment.css
    • -5
    • +1
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -29
    • +77
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
11:21 am

fionam

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ. Moved more to the css file to be shared across tools.

Options
    • -0
    • +9
    /lams_central/web/css/chart.css
Wednesday 07 Jun 2017
9:41 am

fionam

LDEV-4353: Fixing up the layout so it appears in the usual panel box rather than taking up the whole space.

Options
    • -2
    • +5
    /lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
9:00 am

fionam

LDEV-4355: Have improved the checks for invalid data and the warning messages that are given when invalid data is found.

Options
    • -13
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
Thursday 01 Jun 2017
3:31 pm

fionam

file EmailProgressActivityDTO.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/EmailProgressActivityDTO.java
3:31 pm

fionam

file EmailProgressActivitiesProcessor.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/EmailProgressActivitiesProcessor.java
3:31 pm

fionam

file EmailProgressMessageJob.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java
3:31 pm

fionam

file EmailProgressAction.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java
3:30 pm

fionam

LDEV-4274: Initial implementation of a Learner Progress Report email, to be sent to Monitors on a set of dates. Dates are entered via a new dialog box in monitoring. The code works as long as the mailserver is running when the reports are emailed but if it fails then the emails do not resend properly.

Options
    • -2
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/events/Event.java
    • -11
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/events/IEventNotificationService.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
    • -1
    • +29
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -0
    • +60
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/EmailProgressActivityDTO.java
    • -0
    • +52
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java
    • -15
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -8
    • +17
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
    • -0
    • +107
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/EmailProgressActivitiesProcessor.java
    • -0
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +118
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +325
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -2
    • +78
    /lams_monitoring/web/monitor.jsp
  16. … 3 more files in changeset.
3:13 pm

fionam

LDEV-4274: Initial implementation of a Learner Progress Report email, to be sent to Monitors on a set of dates. Dates are entered via a new dialog box in monitoring. The code works as long as the mailserver is running when the reports are emailed but if it fails then the emails do not resend properly.

Options
    • binary
    /lams_build/lib/lams/lams.jar
Monday 29 May 2017
9:59 am

fionam

LDEV-2999L Putting new Rating option on a line by itself for clarity.

Options
    • -0
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
Wednesday 24 May 2017
7:34 pm

fionam

LDEV-2999: Moving the database update into the tool as the Peer Review tool is not included in the standard build.

Options
    • -28
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
    • -0
    • +40
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql
7:34 pm

fionam

file patch20170512.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql
Friday 19 May 2017
11:04 am

fionam

LDEV-4274: Adding support for a file attachment to the email sender.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/events/AbstractDeliveryMethod.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodNotification.java
    • -4
    • +62
    /lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java
Thursday 18 May 2017
8:18 am

fionam

LDEV-4336: Running the test harness showed up a case where reportText can be null so that is now catered for in the newline processing

Options
    • -1
    • +1
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
Wednesday 17 May 2017
9:27 am

fionam

file patch20170419.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170419.sql
9:26 am

fionam

LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

Options
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
    • -5
    • +5
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -1
    • +3
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -2
    • +3
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java
    • -1
    • +4
    /lams_tool_images/web/pages/learning/parts/commentsarea.jsp
    • -1
    • +1
    /lams_tool_images/web/pages/monitoring/summary.jsp
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -7
    • +10
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
    • -1
    • +3
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -2
    • +4
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
    • -0
    • +19
    /lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
    • -0
    • +9
    /lams_tool_larsrc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
    • -2
    • +4
    /lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
  16. … 25 more files in changeset.
9:16 am

fionam

file patch20170512.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
9:16 am

fionam

file RatingException.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java
9:08 am

fionam

LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -5
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -37
    • +49
    /lams_central/web/includes/javascript/rating.js
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
    • -0
    • +103
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
    • -0
    • +67
    /lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/rating/ToolRatingManager.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java
    • -9
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -9
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -27
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
    • -9
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -22
    • +95
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
Friday 12 May 2017
8:08 am

fionam

LDEV-4336: Text coming via websocket is now escaped and the newlines converted to <br> so the pages can use it as html and get the correct visual line breaks.

Options
    • -1
    • +3
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -1
    • +1
    /lams_tool_scribe/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_scribe/web/pages/learning/scribe.jsp
Thursday 11 May 2017
1:54 pm

fionam

LDEV-4239: Making the gradebook buttons responsive.

Options
    • -4
    • +14
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -49
    • +106
    /lams_gradebook/web/gradebookMonitor.jsp
    • -17
    • +3
    /lams_gradebook/web/includes/css/gradebook.css
    • -6
    • +7
    /lams_gradebook/web/includes/javascript/blockexportbutton.js
Wednesday 10 May 2017
3:14 pm

fionam

LDEV-4239 Adding Gradebook tab to the Monitoring Tour

Options
    • -18
    • +35
    /lams_gradebook/web/gradebookMonitor.jsp
    • -1
    • +14
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +64
    /lams_monitoring/web/monitorTour.jsp
Monday 08 May 2017
9:35 am

fionam

file patch20170508.sql was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql