Fisheye on lams-github/lams_learning/web/discussion

lams-github (): Merge branch 'v4.8' into LDEV-5424...

Andrey Balan — Tue, 09 Apr 2024 01:16:49 +0200

Andrey Balan committed c52f84e on branch in lams-github

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

· /lams_learning/web/discussion/monitor5.jsp

(-17, +17)

| History

| Source

| Diff

· /lams_monitoring/web/grouping/viewGroups.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/includes/javascript/monitorLesson.js

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-58, +66)

| History

| Source

| Diff

· /lams_monitoring/web/tblmonitor/teams.jsp

(-3, +3)

| History

| Source

| Diff

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

(-0, +4)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +47)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/summary.jsp

(-1, +5)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/monitoring/listRecords.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-8, +111)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-12, +135)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java

(-12, +11)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

(-3, +2)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.8): LDEV-5083 Adjust size of discussion sentiment widget

Marcin Cieslak — Wed, 13 Mar 2024 15:18:03 +0100

Marcin Cieslak committed 0e18ab4 on branch v4.8 in lams-github

LDEV-5083 Adjust size of discussion sentiment widget

· /lams_learning/web/discussion/monitor5.jsp	(-17, +17)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(-0, +5)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 improvements to TBL monitor pages

Andrey Balan — Thu, 15 Feb 2024 21:49:14 +0100

Andrey Balan committed fc63987 on branch in lams-github

LDEV-5424 improvements to TBL monitor pages

· /lams_learning/web/discussion/monitor5.jsp	(-4, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-3, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/aes.jsp	(-11, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-67, +63)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teamsQuestionResults.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teamsQuestionResultsCell.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit.jsp	(-55, +63)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 divs not having any special roles can't have aria-labels

Andrey Balan — Wed, 20 Dec 2023 23:11:52 +0100

Andrey Balan committed 7a1a9b4 on branch v4.8 in lams-github

LDEV-5397 divs not having any special roles can't have aria-labels

· /lams_learning/web/discussion/learner.jsp	(-5, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-4, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/learning/galleryWalk.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/AnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_leader/web/pages/learning/leaderselection.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/rubrics.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/learner/sbmtlearner.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(-4, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

Andrey Balan — Wed, 20 Dec 2023 01:39:38 +0100

Andrey Balan committed cde40c4 on branch v4.8 in lams-github

LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

· /lams_learning/web/discussion/learner.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-48, +46)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-28, +26)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/learning/message/topiclist.jsp	(-3, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_lamc/web/learning/ViewAnswers.jsp	(-34, +31)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/hedging.jsp	(-6, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 bootstrap5 discussion sentiment

Andrey Balan — Tue, 12 Sep 2023 02:55:07 +0200

Andrey Balan committed 4262c80 on branch v4.8 in lams-github

LDEV-5397 bootstrap5 discussion sentiment

· /lams_central/web/css/components.scss	(-0, +14)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/learner.jsp	(-43, +38)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/css/assessment.scss	(-14, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/essay.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/historyresponses.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5404 Escaping funny characters that break js...

Ernie Ghiglione — Sun, 06 Aug 2023 00:29:41 +0200

Ernie Ghiglione committed 21f82ef on branch v4.7, v4.8 in lams-github

LDEV-5404 Escaping funny characters that break js

- Learner

· /lams_learning/web/branching/preview.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/common/taglibs.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumalive.jsp	(-20, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumaliveReport.jsp	(-11, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-8, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/presenceChat.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5257 Escape parameters to prevent XSS attack...

Marcin Cieslak — Mon, 30 Jan 2023 16:37:53 +0100

Marcin Cieslak committed 47dddf6 on branch v4.7, v4.8 in lams-github

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

· /lams_admin/web/WEB-INF/tags/Page.tag

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/deleteAllLessons.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/userChangePass.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/svgGenerator.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/createresult.jsp

(-4, +0)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/assessmentQTI.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/authoring/template/tool/mcquestionQTI.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/dialogCloser.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/extGroups.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/orgGroup.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/orgGrouping.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-1, +1)

| History

| Source

| Diff

… 38 more files in changeset.

lams-github (v4.7): LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

Marcin Cieslak — Tue, 12 Jul 2022 15:55:45 +0200

Marcin Cieslak committed ac1bc5d on branch v4.7, v4.8 in lams-github

LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

· /lams_learning/src/java/org/.../learning/discussion/controller/DiscussionSentimentController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-0, +297)	\| History	\| Source
· /lams_monitoring/web/css/components-monitoring.css	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-3, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(-10, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(-41, +39)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(-45, +43)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5208 Add discussion sentiment to burning questions in Scratchie

Marcin Cieslak — Wed, 12 May 2021 00:30:53 +0200

Marcin Cieslak committed ca273b5 on branch v4.7, v4.8 in lams-github

LDEV-5208 Add discussion sentiment to burning questions in Scratchie

· /lams_learning/src/java/org/lamsfoundation/.../discussion/dao/hibernate/DiscussionSentimentDAO.java	(-4, +5)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/discussion/service/DiscussionSentimentService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor.jsp	(-33, +40)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(-14, +18)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/TblMonitorController.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(-1, +20)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(-1, +76)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5208 Auto collapse discussion widget on learner choice

Marcin Cieslak — Tue, 11 May 2021 16:52:05 +0200

Marcin Cieslak committed 31c9e48 on branch v4.7, v4.8 in lams-github

LDEV-5208 Auto collapse discussion widget on learner choice

· /lams_learning/web/discussion/learner.jsp	(-12, +39)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/startLearner.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5208 Make collapse feature of discuss learner widget more visible

Marcin Cieslak — Mon, 10 May 2021 07:52:28 +0200

Marcin Cieslak committed d026fe2 on branch v4.7, v4.8 in lams-github

LDEV-5208 Make collapse feature of discuss learner widget more visible

· /lams_learning/web/discussion/learner.jsp

(-0, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5208 Change discussion chart colours for consistency

Marcin Cieslak — Mon, 10 May 2021 07:34:47 +0200

Marcin Cieslak committed f54e28a on branch v4.7, v4.8 in lams-github

LDEV-5208 Change discussion chart colours for consistency

· /lams_learning/web/discussion/monitor.jsp

(-4, +5)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5208 Add Discussion Sentiment monitor widget

Marcin Cieslak — Sat, 08 May 2021 16:02:57 +0200

Marcin Cieslak committed 0d458a1 on branch v4.7, v4.8 in lams-github

LDEV-5208 Add Discussion Sentiment monitor widget

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-1, +5)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/discussion/controller/DiscussionSentimentController.java	(-4, +73)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../discussion/dao/hibernate/DiscussionSentimentDAO.java	(-0, +19)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/discussion/service/DiscussionSentimentService.java	(-3, +25)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/discussion/service/IDiscussionSentimentService.java	(-2, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/learner.jsp	(-8, +21)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor.jsp	(-0, +295)	\| History	\| Source
· /lams_learning/web/discussion/startLearner.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/tblmonitor.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/TblMonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(-16, +55)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-1, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5208 Add Discussion Sentiment learner widget

Marcin Cieslak — Fri, 07 May 2021 19:32:09 +0200

Marcin Cieslak committed 4f526e3 on branch v4.7, v4.8 in lams-github

LDEV-5208 Add Discussion Sentiment learner widget

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

(-3, +3)

| History

| Source

| Diff

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

(-0, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java

(-5, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/discussion/controller/DiscussionSentimentController.java

(-0, +105)

| History

| Source

· /lams_learning/src/java/org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../discussion/dao/hibernate/DiscussionSentimentDAO.java

(-7, +4)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/discussion/model/DiscussionSentimentVote.java

(-8, +9)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/discussion/service/DiscussionSentimentService.java

(-30, +93)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/discussion/service/IDiscussionSentimentService.java

(-5, +6)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-2, +24)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java

(-8, +4)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-0, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/spring-servlet.xml

(-0, +1)

| History

| Source

| Diff

· /lams_learning/web/discussion/learner.jsp

(-0, +149)

| History

| Source

· /lams_learning/web/discussion/startLearner.jsp

(-0, +12)

| History

| Source

… 3 more files in changeset.