Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCategory.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -154,44 +154,6 @@ textsearch.any.words =have one or more of these words: textsearch.excluded.words =have none of these unwanted words: textsearch.questions =Search in these questions: -pageTitle.admin =Q&A configuration -admin.enableWizard =Enable the Q&A question wizard -admin.success =Configuration successfully saved. -admin.return =Return to maintain LAMS -wizard.ok =OK -wizard.wizardTitle =Cognitive skills wizard -wizard.selectCategory =Select category -wizard.selectSkill =Select cognitive skill -wizard.selectQuestion =Select question -wizard.add =Add -wizard.addCategory =Add category -wizard.addSkill =Add cognitive skill -wizard.addQuestion =Add question -wizard.add.mustSelectCategory =You must select a category before adding a cognitive skill. -wizard.add.mustSelectSkill =You must select a cognitive skill and a category before adding a question. -wizard.edit =Edit -wizard.editCategory =Edit category -wizard.edit.notSelected =Please select the corresponding category, cognitive skill or question before clicking edit. -wizard.delete =Delete -wizard.delete.warnDeleteCategory =Deleting this category will delete also all its cognitive skills and questions, this cannot be undone. Do you wish to continue? -wizard.delete.warnDeleteSkill =Deleting this cognitive skill will also delete all its questions, this cannot be undone. Do you wish to continue? -wizard.delete.warnDeleteQuestion =Are you sure you want to delete this question? This cannot be undone. -wizard.delete.category =Category successfully deleted. -wizard.delete.skill =Cognitive skill successfully deleted. -wizard.delete.question =Question successfully deleted. -wizard.delete.notselected =Please select an item to delete first. -wizard.author.wizardTitle =Cognitive skills wizard -wizard.author.info1 =This wizard helps you choose the right type of question you might want to ask your learners. -wizard.author.info2 =Choose a category and then the second menu will display the cognitive skill. -wizard.author.info3 =After you select a cognitive skill, you'll be presented with a question template you can use. -wizard.export.export =Export wizard -wizard.export.savefirst =Your wizard design has been altered, please save before exporting. -wizard.import.import =Import wizard -wizard.import.nofile =Please select an xml file to import first. -wizard.import.warn =Are you sure you want to import a new wizard? This will overwrite the existing wizard design. -wizard.import.error =Failed to import the wizard, make sure the imported file is in the expected xml format. -wizard.editQuestion =Edit question -wizard.editSkill =Edit skill label.allowRichEditor =Allow HTML editor label.required.desc =Answer required? label.required =(Required) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r14949f3bb9736ad6386b56eca018dc1257cb36a1 -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 14949f3bb9736ad6386b56eca018dc1257cb36a1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -238,6 +238,4 @@ public static final String USER_ANSWERS_DEFINITION_NAME = "user.answers.output.definition.qa"; public static final String GROUP_ANSWERS_DEFINITION_NAME = "group.answers.output.definition.qa"; public static final String QUESTIONS_DEFINITION_NAME = "questions.output.definition.qa"; - public static final String ATTR_WIZARD_CATEGORIES = "wizardCategories"; - public static final String ATTR_WIZARD_ENABLED = "wizardEnabled"; } Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConfigItem.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCategory.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardCognitiveSkill.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaWizardQuestion.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaWizardDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaConfigItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180926.sql =================================================================== diff -u --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180926.sql (revision 0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180926.sql (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -0,0 +1,18 @@ +-- 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-4665 Remove Cognitive Skills Wizard +DROP TABLE tl_laqa11_wizard_category; +DROP TABLE tl_laqa11_wizard_cognitive_skill; +DROP TABLE tl_laqa11_wizard_question; +DROP TABLE tl_laqa11_configuration; +UPDATE lams_tool SET admin_url= NULL WHERE tool_signature = 'laqa11'; + +----------------------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 Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaWizardDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -45,14 +45,6 @@ - - - - - - - - @@ -78,9 +70,7 @@ - - - + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.SortedSet; import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; @@ -35,13 +34,11 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.qa.QaCondition; -import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; -import org.lamsfoundation.lams.tool.qa.QaWizardCategory; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.util.QaApplicationException; @@ -243,61 +240,6 @@ void deleteCondition(QaCondition condition); - /** - * Gets the qa config item with the given key - * - * @param configKey - * @return - */ - QaConfigItem getConfigItem(String configKey); - - /** - * Saves or updates a qa config item - * - * @param configItem - */ - void saveOrUpdateConfigItem(QaConfigItem configItem); - - /** - * Gets the set of wizard categories from the database - * - * @return - */ - SortedSet getWizardCategories(); - - /** - * Saves the entire set of QaWizardCategories (including the child cognitive skills and questions) - * - * @param categories - */ - void saveOrUpdateQaWizardCategories(SortedSet categories); - - /** - * Deletes a wizard category from the db - * - * @param uid - */ - void deleteWizardCategoryByUID(Long uid); - - /** - * Deletes a wizard cognitive skill from the db - * - * @param uid - */ - void deleteWizardSkillByUID(Long uid); - - /** - * Deletes a wizard question from the db - * - * @param uid - */ - void deleteWizardQuestionByUID(Long uid); - - /** - * Deletes all categories, sub skills and sub questions - */ - void deleteAllWizardCategories(); - void removeQuestionsFromCache(QaContent qaContent); void removeQaContentFromCache(QaContent qaContent); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -31,7 +31,6 @@ import java.util.Random; import java.util.Set; import java.util.SortedMap; -import java.util.SortedSet; import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; @@ -65,20 +64,16 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; -import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; -import org.lamsfoundation.lams.tool.qa.QaWizardCategory; -import org.lamsfoundation.lams.tool.qa.dao.IQaConfigItemDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaQuestionDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO; import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO; -import org.lamsfoundation.lams.tool.qa.dao.IQaWizardDAO; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; import org.lamsfoundation.lams.tool.qa.util.QaApplicationException; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -106,7 +101,6 @@ private IQaContentDAO qaDAO; private IQaQuestionDAO qaQuestionDAO; - private IQaSessionDAO qaSessionDAO; private IQaQueUsrDAO qaQueUsrDAO; private IQaUsrRespDAO qaUsrRespDAO; @@ -117,9 +111,6 @@ private ILogEventService logEventService; private IExportToolContentService exportContentService; private QaOutputFactory qaOutputFactory; - private IQaConfigItemDAO qaConfigItemDAO; - private IQaWizardDAO qaWizardDAO; - private ICoreNotebookService coreNotebookService; private IRatingService ratingService; private IEventNotificationService eventNotificationService; @@ -200,7 +191,6 @@ @Override public void setDefineLater(String strToolContentID, boolean value) { - QaContent qaContent = getQaContent(new Long(strToolContentID).longValue()); if (qaContent != null) { @@ -1105,22 +1095,6 @@ this.qaOutputFactory = qaOutputFactory; } - public IQaConfigItemDAO getQaConfigItemDAO() { - return qaConfigItemDAO; - } - - public void setQaConfigItemDAO(IQaConfigItemDAO qaConfigItemDAO) { - this.qaConfigItemDAO = qaConfigItemDAO; - } - - public IQaWizardDAO getQaWizardDAO() { - return qaWizardDAO; - } - - public void setQaWizardDAO(IQaWizardDAO qaWizardDAO) { - this.qaWizardDAO = qaWizardDAO; - } - @Override public QaContent getQaContentBySessionId(Long sessionId) { QaSession session = qaSessionDAO.getQaSessionById(sessionId); @@ -1153,46 +1127,6 @@ } @Override - public QaConfigItem getConfigItem(String configKey) { - return qaConfigItemDAO.getConfigItemByKey(configKey); - } - - @Override - public void saveOrUpdateConfigItem(QaConfigItem configItem) { - qaConfigItemDAO.saveOrUpdate(configItem); - } - - @Override - public SortedSet getWizardCategories() { - return qaWizardDAO.getWizardCategories(); - } - - @Override - public void saveOrUpdateQaWizardCategories(SortedSet categories) { - qaWizardDAO.saveOrUpdateCategories(categories); - } - - @Override - public void deleteWizardCategoryByUID(Long uid) { - qaWizardDAO.deleteWizardCategoryByUID(uid); - } - - @Override - public void deleteWizardSkillByUID(Long uid) { - qaWizardDAO.deleteWizardSkillByUID(uid); - } - - @Override - public void deleteWizardQuestionByUID(Long uid) { - qaWizardDAO.deleteWizardQuestionByUID(uid); - } - - @Override - public void deleteAllWizardCategories() { - qaWizardDAO.deleteAllWizardCategories(); - } - - @Override public void removeQuestionsFromCache(QaContent qaContent) { qaDAO.removeQuestionsFromCache(qaContent); } Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8384e056e833d8aadcd6cb12a219094f89c67042 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java (.../QaAuthoringController.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java (.../QaAuthoringController.java) (revision 8384e056e833d8aadcd6cb12a219094f89c67042) @@ -44,7 +44,6 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaCondition; -import org.lamsfoundation.lams.tool.qa.QaConfigItem; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO; @@ -805,15 +804,7 @@ Collection questionDTOs = (Collection) sessionMap .get(QaAppConstants.LIST_QUESTION_DTOS); - request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size())); - - // Adding in the qa wizard data if it is turned on - if (qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD) != null - && qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD).getConfigValue().equals("true")) { - request.setAttribute(QaAppConstants.ATTR_WIZARD_ENABLED, true); - request.setAttribute(QaAppConstants.ATTR_WIZARD_CATEGORIES, qaService.getWizardCategories()); - } request.setAttribute("authoringForm", newQuestionForm); return "authoring/newQuestionBox"; Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8384e056e833d8aadcd6cb12a219094f89c67042 refers to a dead (removed) revision in file `lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp'. Fisheye: No comparison available. Pass `N' to diff?