Fisheye on lams/lams_common/src/java

lams (lams2_head_wildfly): LDEV-4274: Use service proxy bean instead of concrete implementation, so methods called from child threads are transacti...

Marcin Cieslak — Sun, 11 Jun 2017 15:28:00 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170611132800 on branch lams2_head_wildfly in lams

LDEV-4274: Use service proxy bean instead of concrete implementation, so methods called from child threads are transactional.

· /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java	(-55, +69)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/IEventNotificationService.java	(-2, +7)	\| History	\| Source	\| Diff

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

fionam — Wed, 07 Jun 2017 03:00:01 +0200

fionam committed lams2_head_wildfly:fionam:20170607010001 on branch lams2_head_wildfly in lams

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

· /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

(-13, +25)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4354 Prevent exception on starting a lesson by Moodle using LAMS as LTI tool provider

Andrey Balan — Mon, 05 Jun 2017 12:48:06 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170605104806 on branch lams2_head_wildfly in lams

LDEV-4354 Prevent exception on starting a lesson by Moodle using LAMS as LTI tool provider

· /lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java

(-1, +2)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4274: Initial implementation of a Learner Progress Report email, to be sent to Monitors on a set of dates. Dates ar...

fionam — Thu, 01 Jun 2017 09:30:57 +0200

fionam committed lams2_head_wildfly:fionam:20170601073057 on branch lams2_head_wildfly in lams

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.

· /lams_common/src/java/org/lamsfoundation/lams/events/Event.java

(-2, +35)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java

(-11, +26)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/events/IEventNotificationService.java

(-0, +13)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java

(-0, +8)

| History

| Source

| Diff

· /lams_monitoring/conf/language/lams/ApplicationResources.properties

(-1, +29)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml

(-0, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/EmailProgressActivityDTO.java

(-0, +60)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailProgressMessageJob.java

(-0, +52)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java

(-15, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java

(-8, +17)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/.../lams/monitoring/service/EmailProgressActivitiesProcessor.java

(-0, +107)

| History

| Source

| Diff

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

(-0, +4)

| History

| Source

| Diff

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

(-0, +118)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

(-0, +325)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-2, +78)

| History

| Source

| Diff

… 3 more files in changeset.

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

fionam — Wed, 24 May 2017 13:34:01 +0200

fionam committed lams2_head_wildfly:fionam:20170524113401 on branch lams2_head_wildfly in lams

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

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(-28, +1)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170512.sql	(-0, +40)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4347:Improve date/time for spreadsheet exports

sanjana — Tue, 23 May 2017 05:56:28 +0200

sanjana committed lams2_head_wildfly:sanjana:20170523035628 on branch lams2_head_wildfly in lams

LDEV-4347:Improve date/time for spreadsheet exports

· /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java	(-4, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-12, +8)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4274: Adding support for a file attachment to the email sender.

fionam — Fri, 19 May 2017 05:04:54 +0200

fionam committed lams2_head_wildfly:fionam:20170519030454 on branch lams2_head_wildfly in lams

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

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/AbstractDeliveryMethod.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java	(-3, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodNotification.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java	(-4, +62)	\| History	\| Source	\| Diff

lams (MAIN): file patch20170512.sql was initially added on branch lams2_head_wildfly.

fionam — Wed, 17 May 2017 03:16:24 +0200

fionam committed MAIN:fionam:20170517011624 on branch MAIN in lams

file patch20170512.sql was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql

(-0, +0)

| History

| Source

lams (MAIN): file RatingException.java was initially added on branch lams2_head_wildfly.

fionam — Wed, 17 May 2017 03:16:24 +0200

fionam committed MAIN:fionam:20170517011624:1 on branch MAIN in lams

file RatingException.java was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resourc...

fionam — Wed, 17 May 2017 03:08:37 +0200

fionam committed lams2_head_wildfly:fionam:20170517010837 on branch lams2_head_wildfly in lams

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.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java	(-5, +6)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/rating.js	(-37, +49)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/Rating.hbm.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql	(-0, +103)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/RatingException.java	(-0, +67)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/ToolRatingManager.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCommentDAO.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java	(-9, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java	(-9, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java	(-27, +37)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/model/Rating.java	(-0, +18)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java	(-0, +20)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java	(-9, +27)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(-22, +95)	\| History	\| Source	\| Diff

lams (MAIN): file patch20170508.sql was initially added on branch lams2_head_wildfly.

fionam — Mon, 08 May 2017 03:35:27 +0200

fionam committed MAIN:fionam:20170508013527 on branch MAIN in lams

file patch20170508.sql was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available. EnableGradebookForMonitors fie...

fionam — Mon, 08 May 2017 03:29:19 +0200

fionam committed lams2_head_wildfly:fionam:20170508012919 on branch lams2_head_wildfly in lams

LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available. EnableGradebookForMonitors field / db column has been completely removed.

· /lams_admin/web/organisation/createOrEdit.jsp	(-17, +1)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(-10, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql	(-0, +15)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(-19, +0)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart. This ...

fionam — Thu, 04 May 2017 06:10:39 +0200

fionam committed lams2_head_wildfly:fionam:20170504041039 on branch lams2_head_wildfly in lams

LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart. This requires a new lookup to get the raw marks for the chart and the enableGradebookForMonitors field has been deprecated as it is now always on.

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(-0, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(-2, +9)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4326 Matching pairs answer options should be sorted alphanumerically

Andrey Balan — Thu, 20 Apr 2017 17:26:48 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170420152648 on branch lams2_head_wildfly in lams

LDEV-4326 Matching pairs answer options should be sorted alphanumerically

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AlphanumComparator.java	(-32, +36)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-3, +15)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(-2, +8)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4313: Fix parallel activities title internationalisation.

Marcin Cieslak — Thu, 13 Apr 2017 10:34:20 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170413083420 on branch lams2_head_wildfly in lams

LDEV-4313: Fix parallel activities title internationalisation.

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java

(-3, +3)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4312 Handle unsuccessful mark submission to integrated servers

Andrey Balan — Tue, 11 Apr 2017 20:01:55 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170411180155 on branch lams2_head_wildfly in lams

LDEV-4312 Handle unsuccessful mark submission to integrated servers

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170411.sql	(-0, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java	(-0, +81)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-15, +29)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/web.xml	(-0, +13)	\| History	\| Source	\| Diff

lams (MAIN): file patch20170411.sql was initially added on branch lams2_head_wildfly.

Andrey Balan — Tue, 11 Apr 2017 20:01:55 +0200

Andrey Balan committed MAIN:andreyb:20170411180155 on branch MAIN in lams

file patch20170411.sql was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170411.sql

(-0, +0)

| History

| Source

lams (MAIN): file patch20170410.sql was initially added on branch lams2_head_wildfly.

Marcin Cieslak — Mon, 10 Apr 2017 10:04:35 +0200

Marcin Cieslak committed MAIN:marcin:20170410080435 on branch MAIN in lams

file patch20170410.sql was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4184: Silence "[DEPRECATION] Encountered positional parameter" warning in hibernatelams.log. Fixing them requires g...

Marcin Cieslak — Mon, 10 Apr 2017 10:04:33 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170410080433 on branch lams2_head_wildfly in lams

LDEV-4184: Silence "[DEPRECATION] Encountered positional parameter" warning in hibernatelams.log. Fixing them requires going through multiple SQL queries and it is not worth it. Positional parameters work fine.

· /lams_build/conf/domain.xml	(-1, +4)	\| History	\| Source	\| Diff
· /lams_build/conf/standalone.xml	(-9, +5)	\| History	\| Source	\| Diff
· /lams_build/conf/slim/standalone.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql	(-0, +15)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(-12, +6)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4175: Remove unncessary synchronisations and commented out code.

Marcin Cieslak — Mon, 10 Apr 2017 08:40:02 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170410064002 on branch lams2_head_wildfly in lams

LDEV-4175: Remove unncessary synchronisations and commented out code.

· /lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java	(-57, +3)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4300 Audit logs when activity is modified in monitor

Andrey Balan — Tue, 04 Apr 2017 14:25:41 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170404122541 on branch lams2_head_wildfly in lams

LDEV-4300 Audit logs when activity is modified in monitor

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

(-4, +26)

| History

| Source

| Diff

· /lams_common/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java

(-0, +11)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java

(-0, +11)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java

(-0, +7)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

(-23, +17)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java

(-0, +42)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java

(-0, +21)

| History

| Source

| Diff

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

(-0, +5)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java

(-0, +7)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/AuthoringAction.java

(-0, +3)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java

(-0, +4)

| History

| Source

| Diff

… 74 more files in changeset.

lams (lams2_head_wildfly): LDEV-4291 Move getAccessMode method to WebUtil

Andrey Balan — Thu, 30 Mar 2017 20:29:47 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170330182947 on branch lams2_head_wildfly in lams

LDEV-4291 Move getAccessMode method to WebUtil

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

(-1, +19)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/AuthoringAction.java

(-26, +4)

| History

| Source

| Diff

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java

(-20, +3)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

(-20, +3)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

(-26, +4)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java

(-20, +0)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

(-19, +2)

| History

| Source

| Diff

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java

(-29, +3)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

(-26, +4)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/lamsfoundation/.../tool/commonCartridge/web/action/AuthoringAction.java

(-26, +4)

| History

| Source

| Diff

· /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

(-16, +2)

| History

| Source

| Diff

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java

(-19, +2)

| History

| Source

| Diff

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java

(-18, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java

(-18, +1)

| History

| Source

| Diff

… 16 more files in changeset.

lams (lams2_head_wildfly): LDEV-4287 lessonMaxPossibleMark should not include marks that are set not to be passed to gradebook

Andrey Balan — Tue, 28 Mar 2017 21:06:22 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170328190622 on branch lams2_head_wildfly in lams

LDEV-4287 lessonMaxPossibleMark should not include marks that are set not to be passed to gradebook

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	(-28, +22)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4187: Prevent "Illegal attempt to associate a collection with two open sessions" errors.

Marcin Cieslak — Tue, 28 Mar 2017 14:05:25 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170328120525 on branch lams2_head_wildfly in lams

LDEV-4187: Prevent "Illegal attempt to associate a collection with two open sessions" errors.

· /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java

(-3, +5)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4293: Add Ant build which prepares LAMS cluster test environment....

Marcin Cieslak — Sat, 25 Mar 2017 07:48:44 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20170325064844 on branch lams2_head_wildfly in lams

LDEV-4293: Add Ant build which prepares LAMS cluster test environment.

ThemeDTO needs to be serializable in order to put it into a shared session.

· /lams_build/build.xml	(-3, +55)	\| History	\| Source	\| Diff
· /lams_build/conf/domain.xml	(-0, +567)	\| History	\| Source	\| Diff
· /lams_build/conf/host.xml	(-0, +101)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/themes/dto/ThemeDTO.java	(-1, +3)	\| History	\| Source	\| Diff

lams (MAIN): file GradebookUserLessonArchive.java was initially added on branch lams2_head_wildfly.

Marcin Cieslak — Thu, 23 Mar 2017 19:58:20 +0100

Marcin Cieslak committed MAIN:marcin:20170323185820:4 on branch MAIN in lams

file GradebookUserLessonArchive.java was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java

(-0, +0)

| History

| Source

lams (MAIN): file GradebookUserActivityArchive.java was initially added on branch lams2_head_wildfly.

Marcin Cieslak — Thu, 23 Mar 2017 19:58:20 +0100

Marcin Cieslak committed MAIN:marcin:20170323185820:3 on branch MAIN in lams

file GradebookUserActivityArchive.java was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java

(-0, +0)

| History

| Source

lams (MAIN): file patch20170323.sql was initially added on branch lams2_head_wildfly.

Marcin Cieslak — Thu, 23 Mar 2017 19:58:20 +0100

Marcin Cieslak committed MAIN:marcin:20170323185820:2 on branch MAIN in lams

file patch20170323.sql was initially added on branch lams2_head_wildfly.

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170323.sql

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4288: Archive gradebook on lesson retry. Remove activity content on lesson retry.

Marcin Cieslak — Thu, 23 Mar 2017 19:58:15 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20170323185815 on branch lams2_head_wildfly in lams

LDEV-4288: Archive gradebook on lesson retry. Remove activity content on lesson retry.

· /lams_build/lib/lams/lams-gradebook.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/.../lams/gradebook/GradebookUserActivityArchive.hbm.xml	(-0, +81)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml	(-0, +64)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170323.sql	(-0, +38)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java	(-0, +108)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java	(-0, +85)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-117, +154)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(-4, +8)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-4, +13)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-1, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-8, +20)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-6, +6)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4275: Creating a simplified version of gradebook export. Added support for central alignment in an excel spreadshee...

fionam — Wed, 22 Mar 2017 02:31:46 +0100

fionam committed lams2_head_wildfly:fionam:20170322013146 on branch lams2_head_wildfly in lams

LDEV-4275: Creating a simplified version of gradebook export. Added support for central alignment in an excel spreadsheet as well as another border style.

· /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java	(-0, +17)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java	(-5, +40)	\| History	\| Source	\| Diff
· /lams_gradebook/conf/language/lams/ApplicationResources.properties	(-4, +3)	\| History	\| Source	\| Diff
· /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-108, +153)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_gradebook/web/gradebookCourseMonitor.jsp	(-7, +9)	\| History	\| Source	\| Diff
· /lams_gradebook/web/includes/css/gradebook.css	(-2, +2)	\| History	\| Source	\| Diff