Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql =================================================================== diff -u --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql (revision 0) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql (revision 10081d4164be7d135821ede53e7ef46bc2601acc) @@ -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-4558 Bump tool version so we can import tool content from older versions +UPDATE lams_tool SET tool_version='20180828' WHERE tool_signature='lascrt11'; + +----------------------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/service/ScratchieImportContentVersionFilter.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r10081d4164be7d135821ede53e7ef46bc2601acc --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java (.../ScratchieImportContentVersionFilter.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java (.../ScratchieImportContentVersionFilter.java) (revision 10081d4164be7d135821ede53e7ef46bc2601acc) @@ -26,6 +26,7 @@ import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer; +import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; @@ -74,4 +75,14 @@ public void up20140613To20150206() { this.addField(Scratchie.class, "burningQuestionsEnabled", "1"); } + + /** + * Import 20140613 version content to 20150206 version tool server. + */ + public void up20180425To20180828() { + this.removeField(ScratchieItem.class, "correctAnswer"); + this.removeField(ScratchieItem.class, "firstChoiceAnswerLetter"); + this.removeField(ScratchieItem.class, "userMark"); + this.removeField(ScratchieItem.class, "userAttempts"); + } }