Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
diff -u -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a -r46c5a097bc772365634d0846864cb2f121c354ef
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml (.../Scratchie.hbm.xml) (revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml (.../Scratchie.hbm.xml) (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -167,13 +167,15 @@
insert="true"
column="preset_marks"
/>
+
+
-
-
\ No newline at end of file
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r556d465d0c2dba467f2acef7d29c0f8261ecf84b -r46c5a097bc772365634d0846864cb2f121c354ef
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -209,6 +209,6 @@
label.number.groups.in.mark.range =Number of groups in mark range
label.average.mark =Average mark
message.monitoring.edit.activity.warning =Warning: if you edit and modify a question or change an answer that a leader has already answered, then the mark for the whole group for the modified question will be deleted permanently as it is assumed that the question has changed.
+label.authoring.advanced.show.scratchies.in.results =Show scratchies to students on results page
-
#======= End labels: Exported 203 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql (revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -0,0 +1,14 @@
+-- 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-4530 Turn on/off showing scratchies to learners on results page
+ALTER TABLE tl_lascrt11_scratchie ADD COLUMN show_scratchies_in_results TINYINT(1) DEFAULT 1;
+
+----------------------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 -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a -r46c5a097bc772365634d0846864cb2f121c354ef
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -68,20 +68,22 @@
private boolean extraPoint;
private boolean burningQuestionsEnabled;
-
+
private boolean shuffleItems;
-
+
private int timeLimit;
-
+
private Integer confidenceLevelsActivityUiid;
-
+
//overwrites default preset marks stored as admin config setting
private String presetMarks;
private boolean reflectOnActivity;
private String reflectInstructions;
+ private boolean showScrachiesInResults;
+
/**
* Default contruction method.
*
@@ -350,19 +352,19 @@
public void setBurningQuestionsEnabled(boolean burningQuestionsEnabled) {
this.burningQuestionsEnabled = burningQuestionsEnabled;
}
-
+
/**
- *
- * @return
- */
- public boolean isShuffleItems() {
+ *
+ * @return
+ */
+ public boolean isShuffleItems() {
return shuffleItems;
- }
+ }
- public void setShuffleItems(boolean shuffleItems) {
+ public void setShuffleItems(boolean shuffleItems) {
this.shuffleItems = shuffleItems;
- }
-
+ }
+
/**
* @return Returns the time limitation, that students have to complete an attempt.
*/
@@ -377,14 +379,14 @@
public void setTimeLimit(int timeLimit) {
this.timeLimit = timeLimit;
}
-
+
/**
* @return which preceding activity should be queried for confidence levels
*/
public boolean isConfidenceLevelsEnabled() {
return confidenceLevelsActivityUiid != null;
}
-
+
/**
* @return which preceding activity should be queried for confidence levels
*/
@@ -399,18 +401,26 @@
public void setConfidenceLevelsActivityUiid(Integer confidenceLevelsActivityUiid) {
this.confidenceLevelsActivityUiid = confidenceLevelsActivityUiid;
}
-
+
/**
* This property holds value that can overwrite default preset marks stored in admin config setting. It can be null
* and therefore ScratchieService.getPresetMarks() method should be used instead when calculating actual marks.
*
* @return
*/
- public String getPresetMarks() {
+ public String getPresetMarks() {
return presetMarks;
- }
+ }
- public void setPresetMarks(String presetMarks) {
+ public void setPresetMarks(String presetMarks) {
this.presetMarks = presetMarks;
- }
+ }
+
+ public boolean isShowScrachiesInResults() {
+ return showScrachiesInResults;
+ }
+
+ public void setShowScrachiesInResults(boolean showScrachiesInResults) {
+ this.showScrachiesInResults = showScrachiesInResults;
+ }
}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -r3badb4923296aa60ac88664390cf74ccc68a7e53 -r46c5a097bc772365634d0846864cb2f121c354ef
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 3badb4923296aa60ac88664390cf74ccc68a7e53)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -528,8 +528,10 @@
request.setAttribute(ScratchieConstants.ATTR_REFLECTIONS, reflections);
}
- storeItemsToSessionMap(toolSessionId, scratchie, sessionMap, true);
- request.setAttribute(ScratchieConstants.ATTR_SHOW_RESULTS, true);
+ if (scratchie.isShowScrachiesInResults()) {
+ storeItemsToSessionMap(toolSessionId, scratchie, sessionMap, true);
+ request.setAttribute(ScratchieConstants.ATTR_SHOW_RESULTS, true);
+ }
return mapping.findForward(ScratchieConstants.SUCCESS);
}
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -rafa662ec623a92750bb01af5a8694429b8f04a96 -r46c5a097bc772365634d0846864cb2f121c354ef
--- lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision afa662ec623a92750bb01af5a8694429b8f04a96)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 46c5a097bc772365634d0846864cb2f121c354ef)
@@ -46,6 +46,13 @@
+
+
+
+
- <%@ include file="scratchies.jsp"%>
-
+
+ <%@ include file="scratchies.jsp"%>
+
+