Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re743566518bd5c53d6574987565cfb8581a92c66 -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e743566518bd5c53d6574987565cfb8581a92c66) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -208,6 +208,7 @@ 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.show.confidence.level =Show confidence levels from the following activity +label.anonymous.confidence.level = Do not display students' names with confidence level (anonymous) label.no.confidence.levels.activities =There are no activities with confidence levels to choose from. label.save.learning.design =In order to select activity with confidence levels or producing VSA answers please save your sequence first. label.change.marking.allocation =Change marking allocation Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -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-5032 Allow hiding learner names in confidence levels in Scratchie + +ALTER TABLE tl_lascrt11_scratchie ADD COLUMN confidence_levels_anonymous TINYINT DEFAULT 0 AFTER confidence_levels_activity_uiid; + +-- 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 -r2e61eefa786c0411376091c504812a8931395186 -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 2e61eefa786c0411376091c504812a8931395186) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java (.../Scratchie.java) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -103,6 +103,9 @@ @Column(name = "confidence_levels_activity_uiid") private Integer confidenceLevelsActivityUiid; + @Column(name = "confidence_levels_anonymous") + private boolean confidenceLevelsAnonymous; + @Column(name = "activity_uuid_providing_vsa_answers") private Integer activityUiidProvidingVsaAnswers; @@ -393,6 +396,14 @@ this.confidenceLevelsActivityUiid = confidenceLevelsActivityUiid; } + public boolean isConfidenceLevelsAnonymous() { + return confidenceLevelsAnonymous; + } + + public void setConfidenceLevelsAnonymous(boolean confidenceLevelsAnonymous) { + this.confidenceLevelsAnonymous = confidenceLevelsAnonymous; + } + public boolean isAnswersFetchingEnabled() { return activityUiidProvidingVsaAnswers != null; } Index: lams_tool_scratchie/web/pages/authoring/advance.jsp =================================================================== diff -u -r2e61eefa786c0411376091c504812a8931395186 -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 2e61eefa786c0411376091c504812a8931395186) +++ lams_tool_scratchie/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -109,6 +109,13 @@ + +
+ +
Index: lams_tool_scratchie/web/pages/learning/learning.jsp =================================================================== diff -u -r2e61eefa786c0411376091c504812a8931395186 -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 2e61eefa786c0411376091c504812a8931395186) +++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -9,7 +9,7 @@ - + Index: lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp =================================================================== diff -u -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp (.../confidenceLevelPortrait.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) +++ lams_tool_scratchie/web/pages/learning/parts/confidenceLevelPortrait.jsp (.../confidenceLevelPortrait.jsp) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -46,10 +46,10 @@ -
+
- +
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp =================================================================== diff -u -rae0aa5d86b30cdd76b500e73fbf8b92c4f0f17eb -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 --- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision ae0aa5d86b30cdd76b500e73fbf8b92c4f0f17eb) +++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4) @@ -76,6 +76,7 @@
+ <%@ include file="parts/confidenceLevelPortrait.jsp"%>