Fisheye on lams/lams_tool_assessment/src/java

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

fionam — Fri, 09 Jun 2017 05:27:58 +0200

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

file LeaderResultsDTO.java was initially added on branch lams2_head_wildfly.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput set...

fionam — Fri, 09 Jun 2017 05:27:57 +0200

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

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

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-2, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(-1, +47)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java	(-0, +82)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-3, +22)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-1, +19)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/MonitoringAction.java	(-16, +33)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/css/assessment.css	(-23, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-5, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-29, +77)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LKC-79 Display questions at the “Show students’ choices” page according to their authoring order (just like for the rest...

Andrey Balan — Thu, 08 Jun 2017 22:00:30 +0200

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

LKC-79 Display questions at the “Show students’ choices” page according to their authoring order (just like for the rest of Assessment monitoring pages)

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

(-1, +1)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4329 Forbid leaders entering text in essay questions

Andrey Balan — Wed, 26 Apr 2017 12:48:53 +0200

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

LDEV-4329 Forbid leaders entering text in essay questions

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-1, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/essay.jsp	(-3, +3)	\| 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-4320 By default users should be listed in alphabetical order

Andrey Balan — Thu, 20 Apr 2017 15:10:51 +0200

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

LDEV-4320 By default users should be listed in alphabetical order

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/MonitoringAction.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(-2, +3)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4273: .xls export Question Summary tab now has a percentage summary for each question for Short Answer, Multiple Ch...

fionam — Wed, 12 Apr 2017 04:24:00 +0200

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

LDEV-4273: .xls export Question Summary tab now has a percentage summary for each question for Short Answer, Multiple Choice, Numerical, True & False.

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-9, +175)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4273: Initial check of Assessment's use of histogram. Added a simple summary table of results to the first workshe...

fionam — Mon, 10 Apr 2017 14:41:55 +0200

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

LDEV-4273: Initial check of Assessment's use of histogram. Added a simple summary table of results to the first worksheet in the spreadsheet export - grouping the overall marks received. Modified the SQL code used to do the Monitor screen paging as the CASE appears to be causing the marks to sort as if they were strings, rather than numbers.

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-3, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(-21, +64)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java	(-0, +27)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-27, +168)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-1, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/MonitoringAction.java	(-4, +64)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/struts-config.xml	(-0, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/css/assessment.css	(-0, +25)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-3, +26)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statistic.jsp	(-70, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-0, +121)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/test.html	(-0, +116)	\| 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-4270 Started using redirects after submitting answers. this is done to prevent from sending form second time on pag...

Andrey Balan — Mon, 20 Mar 2017 20:39:07 +0100

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

LDEV-4270 Started using redirects after submitting answers. this is done to prevent from sending form second time on page refresh

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-35, +58)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4281 Fixed NullPointerException thrown on openning monitor interface when learner hasn't submitted any answers yet

Andrey Balan — Fri, 17 Mar 2017 20:41:50 +0100

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

LDEV-4281 Fixed NullPointerException thrown on openning monitor interface when learner hasn't submitted any answers yet

· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentResultDAOHibernate.java

(-1, +3)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4271 Refactor Assessment code...

Andrey Balan — Fri, 17 Mar 2017 20:31:57 +0100

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

LDEV-4271 Refactor Assessment code

* use DTO instead of model classes for carrying interim information

* split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

· /lams_tool_assessment/src/java/org/.../tool/assessment/service/AssessmentImportContentVersionFilter.java

(-0, +13)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4271 Refactor Assessment code...

Andrey Balan — Fri, 17 Mar 2017 20:02:53 +0100

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

LDEV-4271 Refactor Assessment code

* Remove unnecessary fields

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../tool/assessment/service/AssessmentImportContentVersionFilter.java	(-0, +8)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

Andrey Balan — Fri, 17 Mar 2017 19:30:37 +0100

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

LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

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

(-8, +8)

| History

| Source

| Diff

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

Andrey Balan — Fri, 17 Mar 2017 19:03:02 +0100

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

file patch20170315.sql was initially added on branch lams2_head_wildfly.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4271 Refactor Assessment code...

Andrey Balan — Fri, 17 Mar 2017 19:03:01 +0100

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

LDEV-4271 Refactor Assessment code

* use DTO instead of model classes for carrying interim information

* split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

· /lams_tool_assessment/conf/hibernate/mappings/org/.../tool/assessment/model/AssessmentQuestion.hbm.xml

(-18, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

(-2, +6)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionDAO.java

(-10, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentQuestionDAOHibernate.java

(-8, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql

(-0, +17)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java

(-0, +129)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java

(-0, +365)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

(-10, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java

(-262, +11)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/model/AssessmentQuestionOption.java

(-20, +1)

| History

| Source

| Diff

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

(-88, +79)

| History

| Source

| Diff

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

(-14, +7)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AnswerIntComparator.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/util/AssessmentEscapeUtils.java

(-31, +25)

| History

| Source

| Diff

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

(-32, +8)

| History

| Source

| Diff

… 30 more files in changeset.

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

Andrey Balan — Fri, 17 Mar 2017 19:03:01 +0100

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

file OptionDTO.java was initially added on branch lams2_head_wildfly.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java

(-0, +0)

| History

| Source

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

Andrey Balan — Fri, 17 Mar 2017 19:03:01 +0100

Andrey Balan committed MAIN:andreyb:20170317180301:1 on branch MAIN in lams

file QuestionDTO.java was initially added on branch lams2_head_wildfly.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4262 Removed unnecessary try-catch block

Andrey Balan — Tue, 14 Mar 2017 19:06:07 +0100

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

LDEV-4262 Removed unnecessary try-catch block

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-16, +6)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-1, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-5, +20)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

Andrey Balan — Tue, 14 Mar 2017 18:57:06 +0100

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

LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-36, +59)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-37, +44)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/struts-config.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/attemptsummary.jsp	(-1, +13)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

Andrey Balan — Fri, 10 Mar 2017 21:06:33 +0100

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

LDEV-4262 Fixing null pointer exception when teacher makes changes to assessment question

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-60, +69)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-6, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-27, +38)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/advance.jsp	(-2, +3)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. U...

fionam — Wed, 08 Mar 2017 04:58:51 +0100

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

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/MonitoringAction.java	(-0, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-7, +13)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches....

Marcin Cieslak — Mon, 27 Feb 2017 15:00:00 +0100

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

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches.

Get rid of unnecessary tables and keys.

Modify boolean columns to tinyint(1)

Simplify patches where possible.

· /lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql

(-10, +8)

| History

| Source

| Diff

· /lams_build/librarypackages/chatscribe/toolActivity1_insert.sql

(-10, +10)

| History

| Source

| Diff

· /lams_build/librarypackages/chatscribe/toolActivity2_insert.sql

(-10, +10)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql

(-10, +8)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/toolActivity1_insert.sql

(-11, +11)

| History

| Source

| Diff

· /lams_build/librarypackages/forumscribe/toolActivity2_insert.sql

(-10, +10)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql

(-10, +8)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/toolActivity1_insert.sql

(-10, +10)

| History

| Source

| Diff

· /lams_build/librarypackages/shareresourcesforum/toolActivity2_insert.sql

(-10, +10)

| History

| Source

| Diff

· /lams_common/build.xml

(-6, +0)

| History

| Source

| Diff

· /lams_common/db/sql/create_integration_tables.sql

(-84, +0)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_db.sql

(-30, +1)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-377, +678)

| History

| Source

| Diff

· /lams_common/db/sql/create_notebook_tables.sql

(-2, +0)

| History

| Source

| Diff

· /lams_common/db/sql/create_presence_chat_tables.sql

(-11, +0)

| History

| Source

| Diff

… 209 more files in changeset.

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

Marcin Cieslak — Mon, 27 Feb 2017 15:00:00 +0100

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

file patch20170101.sql was initially added on branch lams2_head_wildfly.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

· /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20170101.sql

(-0, +0)

| History

| Source

… 10 more files in changeset.

lams (lams2_head_wildfly): LDEV-4174 Show correct feedback (tick sign) in cases when selected option has grade more that zero

Andrey Balan — Wed, 01 Feb 2017 15:05:19 +0100

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

LDEV-4174 Show correct feedback (tick sign) in cases when selected option has grade more that zero

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-8, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(-3, +2)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4197: Use exact methods (insert, update) instead of a general one (save) in order to detect double save.

Marcin Cieslak — Tue, 24 Jan 2017 13:06:02 +0100

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

LDEV-4197: Use exact methods (insert, update) instead of a general one (save) in order to detect double save.

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-10, +11)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner ...

fionam — Wed, 11 Jan 2017 09:55:21 +0100

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

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +24)	\| History	\| Source	\| Diff
· /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(-0, +27)	\| History	\| Source	\| Diff
· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(-0, +28)	\| History	\| Source	\| Diff
· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IMessageDAO.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/MessageDao.java	(-0, +14)	\| History	\| Source	\| Diff
· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(-1, +17)	\| History	\| Source	\| Diff
· /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(-0, +27)	\| History	\| Source	\| Diff
· /lams_tool_images/src/java/org/lamsfoundation/.../tool/imageGallery/service/ImageGalleryServiceImpl.java	(-0, +30)	\| History	\| Source	\| Diff
· /lams_tool_imscc/src/java/org/.../tool/commonCartridge/dao/CommonCartridgeItemVisitDAO.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_imscc/src/java/org/.../commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_imscc/src/java/org/.../tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(-0, +16)	\| History	\| Source	\| Diff
· /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(-0, +31)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4194: When editing an Assessment activity, fetch the original creator as the current editor (possibly monitor) may ...

Marcin Cieslak — Wed, 11 Jan 2017 08:39:34 +0100

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

LDEV-4194: When editing an Assessment activity, fetch the original creator as the current editor (possibly monitor) may not exist as an activity user.

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

(-7, +11)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4175: Evict objects which are put into a form, then attaced to a session and possible saved with other objects with...

Marcin Cieslak — Mon, 09 Jan 2017 12:49:09 +0100

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

LDEV-4175: Evict objects which are put into a form, then attaced to a session and possible saved with other objects with same IDs.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-46, +38)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-8, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/web/action/AuthoringAction.java	(-4, +7)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/DAO.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(-4, +2)	\| History	\| Source	\| Diff