Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r12ef220cb1b4f8f5b4a6dc0127b32a701e2d75c8 -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 12ef220cb1b4f8f5b4a6dc0127b32a701e2d75c8) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d) @@ -174,6 +174,7 @@ label.authoring.export.qti = Export IMS QTI label.scratchie.options = Question options label.activity.completion = End of activity +label.authoring.advanced.discussion = Enable discussion sentiment voting in TBL monitoring label.authoring.advanced.burning.questions = Enable burning questions label.burning.questions = Burning questions label.burning.question = Burning question? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210511.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210511.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210511.sql (revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +-- LDEV-5208 Add advanced option whether to show discussion widget in TBL monitoring + +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN discussion_sentiment_enabled TINYINT DEFAULT 0 AFTER burning_questions_enabled; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java =================================================================== diff -u -r804dca72fa2ac638a9d3e2e66054d82688951c31 -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 804dca72fa2ac638a9d3e2e66054d82688951c31) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d) @@ -96,6 +96,9 @@ @Column(name = "burning_questions_enabled") private boolean burningQuestionsEnabled; + @Column(name = "discussion_sentiment_enabled") + private boolean discussionSentimentEnabled; + @Column(name = "question_etherpad_enabled") private boolean questionEtherpadEnabled; @@ -354,6 +357,14 @@ this.burningQuestionsEnabled = burningQuestionsEnabled; } + public boolean isDiscussionSentimentEnabled() { + return discussionSentimentEnabled; + } + + public void setDiscussionSentimentEnabled(boolean discussionSentimentEnabled) { + this.discussionSentimentEnabled = discussionSentimentEnabled; + } + public boolean isQuestionEtherpadEnabled() { return questionEtherpadEnabled; } Index: lams_tool_scratchie/web/pages/authoring/advance.jsp =================================================================== diff -u -r0bf300963373e88adfe45bd5484f6683516ef966 -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d --- lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 0bf300963373e88adfe45bd5484f6683516ef966) +++ lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d) @@ -43,7 +43,20 @@ $("#preset-marks").prop('disabled','disabled'); - + + var discussionSentimentCheckbox = $('#discussion-sentiment-enabled'), + burningQuestionsCheckbox = $('#burning-questions-enabled').click(function(){ + var disabled = !$(this).is(':checked'); + if (disabled) { + discussionSentimentCheckbox.slideUp(); + } else { + discussionSentimentCheckbox.slideDown(); + } + }); + + if (!burningQuestionsCheckbox.is(':checked')) { + discussionSentimentCheckbox.prop('checked', false).hide(); + } }); @@ -68,6 +81,13 @@ +