Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql =================================================================== diff -u -r771dd93b9ea84cec2b55db5c66a5d187da0874c0 -rb8f3c00f53850ba790f01edbc1bb56627d1520ed --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision 771dd93b9ea84cec2b55db5c66a5d187da0874c0) +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision b8f3c00f53850ba790f01edbc1bb56627d1520ed) @@ -109,7 +109,7 @@ REFERENCES tl_lamc11_content (uid) )TYPE=InnoDB; -INSERT INTO tl_lamc11_content(uid, content_id , title, instructions, creation_date , reflect, questions_sequenced , created_by , run_offline , define_later, offline_instructions, online_instructions, content_in_use, retries, show_report, pass_mark) VALUES (1, ${default_content_id} , 'MCQ Title', 'MCQ Instructions', NOW(), 0, 0, 1, 0, 0, 'offline instructions','online instructions', 0, 0, 0, 0); +INSERT INTO tl_lamc11_content(uid, content_id , title, instructions, creation_date , reflect, questions_sequenced , created_by , run_offline , define_later, offline_instructions, online_instructions, content_in_use, retries, show_report, pass_mark) VALUES (1, ${default_content_id} , 'MCQ', 'Instructions', NOW(), 0, 0, 1, 0, 0, '','', 0, 0, 0, 0); INSERT INTO tl_lamc11_que_content (uid,question, mark, display_order, mc_content_id) VALUES (1, 'A Sample question?', 1,1,1); Fisheye: Tag b8f3c00f53850ba790f01edbc1bb56627d1520ed refers to a dead (removed) revision in file `lams_tool_lamc/db/sql/insert_lams_tool_mc.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -rdcd670ba9836859145d20348082bccd726635739 -rb8f3c00f53850ba790f01edbc1bb56627d1520ed --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision dcd670ba9836859145d20348082bccd726635739) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision b8f3c00f53850ba790f01edbc1bb56627d1520ed) @@ -64,13 +64,13 @@ public static final String ACTIVITY_INSTRUCTIONS_KEY = "activityInstructionsKey"; public static final String LIST_QUESTION_CONTENT_DTO = "listQuestionContentDTO"; public static final String LIST_QUESTION_CONTENT_DTO_KEY = "listQuestionContentDTOKey"; - public static final String DEFAULT_ONLINE_INST ="online instructions"; - public static final String DEFAULT_OFFLINE_INST ="offline instructions"; + public static final String DEFAULT_ONLINE_INST =""; + public static final String DEFAULT_OFFLINE_INST =""; public static final String ONLINE_INSTRUCTIONS_KEY = "onlineInstructionsKey"; public static final String OFFLINE_INSTRUCTIONS_KEY = "offlineInstructionsKey"; public static final String MAP_QUESTION_CONTENT_KEY = "mapQuestionContentKey"; - public static final String DEFAULT_MC_TITLE ="MCQ Title"; - public static final String DEFAULT_MC_INSTRUCTIONS ="MCQ Instructions"; + public static final String DEFAULT_MC_TITLE ="MCQ"; + public static final String DEFAULT_MC_INSTRUCTIONS ="Instructions"; public static final String LOAD_VIEW_ONLY ="loadViewOnly"; public static final String MC_GENERAL_AUTHORING_DTO ="mcGeneralAuthoringDTO"; public static final String DEFAULT_CONTENT_ID_STR ="defaultContentIdStr"; @@ -129,8 +129,8 @@ public static final String COPY_TOOL_CONTENT = "copyToolContent"; public static final String REMOVE_TOOL_CONTENT = "removeToolContent"; - public static final String DEFAULT_MCQ_TITLE = "MCQ Title"; - public static final String DEFAULT_MCQ_INSTRUCTIONS = "MCQ Instructions"; + public static final String DEFAULT_MCQ_TITLE = "MCQ"; + public static final String DEFAULT_MCQ_INSTRUCTIONS = "Instructions"; /* * refers to number of questions presented initially, we have a single record for default content Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java =================================================================== diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -rb8f3c00f53850ba790f01edbc1bb56627d1520ed --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision 8522cd628329e0031e21b48f2750b1fd9b1842a6) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision b8f3c00f53850ba790f01edbc1bb56627d1520ed) @@ -118,8 +118,8 @@ mc.setCreatedBy(0); mc.setRunOffline(false); mc.setDefineLater(false); - mc.setOnlineInstructions("online instructions..."); - mc.setOfflineInstructions("offline instructions..."); + mc.setOnlineInstructions(""); + mc.setOfflineInstructions(""); mc.setContentInUse(false); mc.setRetries(false); mc.setMcQueContents(new HashSet());