Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rb1753ebae1f2105f0640b4f5e207f29d99903584 -rff2a65f961b0f2da0af4e9ed9a90abb284f165d8 --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b1753ebae1f2105f0640b4f5e207f29d99903584) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ff2a65f961b0f2da0af4e9ed9a90abb284f165d8) @@ -189,6 +189,8 @@ label.waiting.for.leader.launch.time.limit = Leader has not started the activity. Please wait until he commences it. label.waiting.for.leader.submit.notebook = Time limit set by teacher is expired. Please wait until a group leader submits notebook. label.authoring.advanced.shuffle.items = Shuffle questions +label.authoring.advanced.reveal.double.click = Require double click to reveal an answer +label.learning.reveal.double.click = Double click on an answer to reveal it label.summary.downloaded = Excel file downloaded. label.number.groups.finished = Number of groups finished label.graph.help = In the graph(s) below, click on a bar in the graph and then use your mouse wheel to zoom in and out of the graph. Once you zoom in, the grey selection in the bottom graph can be dragged left or right to show a different set of marks. Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql (revision ff2a65f961b0f2da0af4e9ed9a90abb284f165d8) @@ -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-5136 Require double click, instead of a single click, to reveal an item + +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN double_click TINYINT DEFAULT 0 AFTER time_limit; + +-- 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; \ No newline at end of file Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java =================================================================== diff -u -r7526ca9885157455bb66079b6cc8a3571f819de9 -rff2a65f961b0f2da0af4e9ed9a90abb284f165d8 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 7526ca9885157455bb66079b6cc8a3571f819de9) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision ff2a65f961b0f2da0af4e9ed9a90abb284f165d8) @@ -103,6 +103,9 @@ @Column(name = "time_limit") private int timeLimit; + @Column(name = "double_click") + private boolean revealOnDoubleClick; + @Column(name = "confidence_levels_activity_uiid") private Integer confidenceLevelsActivityUiid; @@ -377,6 +380,14 @@ this.timeLimit = timeLimit; } + public boolean isRevealOnDoubleClick() { + return revealOnDoubleClick; + } + + public void setRevealOnDoubleClick(boolean revealOnDoubleClick) { + this.revealOnDoubleClick = revealOnDoubleClick; + } + /** * @return which preceding activity should be queried for confidence levels */ Index: lams_tool_scratchie/web/pages/authoring/advance.jsp =================================================================== diff -u -r0f6e04d06144f4d55986abbf6fbcf2222cf0d43c -rff2a65f961b0f2da0af4e9ed9a90abb284f165d8 --- lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 0f6e04d06144f4d55986abbf6fbcf2222cf0d43c) +++ lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision ff2a65f961b0f2da0af4e9ed9a90abb284f165d8) @@ -81,6 +81,13 @@
+ +
+ +
+ + +
+
+
+ +
+
+
+
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp =================================================================== diff -u -r47af8921ff7d63addfeff2b9624c23fa0602bf63 -rff2a65f961b0f2da0af4e9ed9a90abb284f165d8 --- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 47af8921ff7d63addfeff2b9624c23fa0602bf63) +++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision ff2a65f961b0f2da0af4e9ed9a90abb284f165d8) @@ -48,7 +48,19 @@ id="image-${item.uid}-${optionDto.qbOptionUid}"> - + + onDblClick= + + + onClick= + + + <%-- call this function either on click or double click --%> + "scratchMcq(${item.uid}, ${optionDto.qbOptionUid}); return false;" + + id="imageLink-${item.uid}-${optionDto.qbOptionUid}">