Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -1055,7 +1055,6 @@ activity.setCreateDateTime(modificationDate); } - activity.setActivityCategoryID(JsonUtil.optInt(activityDetails, AuthoringJsonTags.ACTIVITY_CATEGORY_ID)); activity.setLibraryActivityUiImage(JsonUtil.optString(activityDetails, AuthoringJsonTags.LIBRARY_IMAGE)); activity.setGroupingSupportType(JsonUtil.optInt(activityDetails, AuthoringJsonTags.GROUPING_SUPPORT_TYPE)); activity.setStopAfterActivity( Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 67db3e1b2ada0d59ff98c807a54282783797c5e6) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -578,7 +578,6 @@ /* create new System Gate Activity */ gate = (GateActivity) Activity.getActivityInstance(Activity.SYSTEM_GATE_ACTIVITY_TYPE); gate.setActivityTypeId(Activity.SYSTEM_GATE_ACTIVITY_TYPE); - gate.setActivityCategoryID(Activity.CATEGORY_SYSTEM); gate.setSystemTool(systemTool); gate.setActivityUIID(++maxId); gate.setTitle(title); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -r7f83bebf292c46f62a32d1beea45333bd4950358 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 7f83bebf292c46f62a32d1beea45333bd4950358) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -422,7 +422,6 @@ if (activityDescription != null) { activityJSON.put(AuthoringJsonTags.DESCRIPTION, activityDescription); } - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.PERMISSION_GATE_ACTIVITY_TYPE); activityJSON.put(AuthoringJsonTags.GATE_ACTIVITY_LEVEL_ID, GateActivity.LEARNER_GATE_LEVEL); @@ -493,7 +492,6 @@ activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]); activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, title != null ? title : "Grouping"); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.GROUPING_ACTIVITY_TYPE); activityJSON.put(AuthoringJsonTags.CREATE_GROUPING_UIID, groupingUIID); @@ -527,7 +525,6 @@ activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]); activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Parallel Activity"); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SPLIT); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.PARALLEL_ACTIVITY_TYPE); activityJSON.put(AuthoringJsonTags.DESCRIPTION, description); if (groupingUIID != null) { @@ -558,7 +555,6 @@ activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]); activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, "Support Activity"); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.FLOATING_ACTIVITY_TYPE); activityJSON.put(AuthoringJsonTags.MAX_ACTIVITIES, MAX_FLOATING_ACTIVITY_OPTIONS); return activityJSON; @@ -581,7 +577,6 @@ activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, Activity.GROUPING_SUPPORT_OPTIONAL); activityJSON.put(AuthoringJsonTags.APPLY_GROUPING, false); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, branchName != null ? branchName : "Branch " + orderId); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.SEQUENCE_ACTIVITY_TYPE); activityJSON.put(AuthoringJsonTags.ORDER_ID, orderId); activityJSON.put(AuthoringJsonTags.PARENT_UIID, parentUIID); @@ -649,7 +644,6 @@ activityJSON.put(AuthoringJsonTags.ACTIVITY_UIID, reservedUiid); activityJSON.put(AuthoringJsonTags.GROUPING_SUPPORT_TYPE, Activity.GROUPING_SUPPORT_OPTIONAL); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Branching"); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, Activity.CATEGORY_SYSTEM); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, activityType); activityJSON.put(AuthoringJsonTags.MAX_ACTIVITIES, MAX_FLOATING_ACTIVITY_OPTIONS); activityJSON.put(AuthoringJsonTags.XCOORD, layoutCoords[0]); @@ -700,14 +694,14 @@ */ protected ObjectNode createToolActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, String toolSignature, String toolIcon, Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID, - Integer parentActivityType, String activityTitle, int activityCategory) { + Integer parentActivityType, String activityTitle) { return createToolActivity(uiid, order, layoutCoords, toolSignature, toolIcon, toolContentID, contentFolderID, - groupingUIID, parentUIID, parentActivityType, activityTitle, activityCategory, null); + groupingUIID, parentUIID, parentActivityType, activityTitle, null); } protected ObjectNode createToolActivity(AtomicInteger uiid, int order, Integer[] layoutCoords, String toolSignature, String toolIcon, Long toolContentID, String contentFolderID, Integer groupingUIID, Integer parentUIID, - Integer parentActivityType, String activityTitle, int activityCategory, String toolOutputDefinition) { + Integer parentActivityType, String activityTitle, String toolOutputDefinition) { ObjectNode activityJSON = JsonNodeFactory.instance.objectNode(); Tool tool = getTool(toolSignature); @@ -724,7 +718,6 @@ activityJSON.put(AuthoringJsonTags.XCOORD, pos[0]); activityJSON.put(AuthoringJsonTags.YCOORD, pos[1]); activityJSON.put(AuthoringJsonTags.ACTIVITY_TITLE, activityTitle != null ? activityTitle : "Activity"); - activityJSON.put(AuthoringJsonTags.ACTIVITY_CATEGORY_ID, activityCategory); activityJSON.put(AuthoringJsonTags.ACTIVITY_TYPE_ID, Activity.TOOL_ACTIVITY_TYPE); if (parentUIID != null) { activityJSON.put(AuthoringJsonTags.PARENT_UIID, parentUIID); @@ -831,7 +824,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.ASSESSMENT_TOOL_SIGNATURE, LdTemplateController.ASSESSMENT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Assessment", Activity.CATEGORY_ASSESSMENT, + parentActivityType, activityTitle != null ? activityTitle : "Assessment", LdTemplateController.ASSESSMENT_TOOL_OUTPUT_DEFINITION); } @@ -858,7 +851,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.CHAT_TOOL_SIGNATURE, LdTemplateController.CHAT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Chat", Activity.CATEGORY_COLLABORATION); + parentActivityType, activityTitle != null ? activityTitle : "Chat"); } /** @@ -904,7 +897,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.FORUM_TOOL_SIGNATURE, LdTemplateController.FORUM_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Forum", Activity.CATEGORY_COLLABORATION); + parentActivityType, activityTitle != null ? activityTitle : "Forum"); } /** @@ -926,8 +919,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.LEADER_TOOL_SIGNATURE, LdTemplateController.LEADER_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Leader Selection", - Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "Leader Selection"); } /** @@ -951,7 +943,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.NOTEBOOK_TOOL_SIGNATURE, LdTemplateController.NOTEBOOK_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Notebook", Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "Notebook"); } /** @@ -975,7 +967,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.NOTICEBOARD_TOOL_SIGNATURE, LdTemplateController.NOTICEBOARD_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Noticeboard", Activity.CATEGORY_CONTENT); + parentActivityType, activityTitle != null ? activityTitle : "Noticeboard"); } /** @@ -1004,7 +996,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.QA_TOOL_SIGNATURE, LdTemplateController.QA_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Q&A", Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "Q&A"); } /** @@ -1033,7 +1025,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MCQ_TOOL_SIGNATURE, LdTemplateController.MCQ_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, parentActivityType, activityTitle != null ? activityTitle : "Multiple Choice", - Activity.CATEGORY_ASSESSMENT, LdTemplateController.MCQ_TOOL_OUTPUT_DEFINITION); + LdTemplateController.MCQ_TOOL_OUTPUT_DEFINITION); } /** @@ -1056,7 +1048,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.MINDMAP_TOOL_SIGNATURE, LdTemplateController.MINDMAP_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "MindMap", Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "MindMap"); } /** @@ -1154,8 +1146,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SHARE_RESOURCES_TOOL_SIGNATURE, LdTemplateController.SHARE_RESOURCES_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Share Resources", - Activity.CATEGORY_CONTENT); + parentActivityType, activityTitle != null ? activityTitle : "Share Resources"); } /** @@ -1189,7 +1180,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE, LdTemplateController.SCRATCHIE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Scratchie", Activity.CATEGORY_CONTENT, + parentActivityType, activityTitle != null ? activityTitle : "Scratchie", LdTemplateController.SCRATCHIE_TOOL_OUTPUT_DEFINITION); } @@ -1218,7 +1209,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SCRIBE_TOOL_SIGNATURE, LdTemplateController.SCRIBE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Scribe", Activity.CATEGORY_COLLABORATION); + parentActivityType, activityTitle != null ? activityTitle : "Scribe"); } /** @@ -1247,8 +1238,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SUBMIT_TOOL_SIGNATURE, LdTemplateController.SUBMIT_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Submit File", - Activity.CATEGORY_ASSESSMENT); + parentActivityType, activityTitle != null ? activityTitle : "Submit File"); } /** @@ -1272,7 +1262,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.SURVEY_TOOL_SIGNATURE, LdTemplateController.SURVEY_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Survey", Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "Survey"); } /** @@ -1297,7 +1287,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.VOTE_TOOL_SIGNATURE, LdTemplateController.VOTE_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Voting", Activity.CATEGORY_RESPONSE); + parentActivityType, activityTitle != null ? activityTitle : "Voting"); } /** @@ -1320,7 +1310,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.WIKI_TOOL_SIGNATURE, LdTemplateController.WIKI_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Wiki", Activity.CATEGORY_COLLABORATION); + parentActivityType, activityTitle != null ? activityTitle : "Wiki"); } /** @@ -1348,7 +1338,7 @@ return createToolActivity(uiid, order, layoutCoords, LdTemplateController.PEER_REVIEW_TOOL_SIGNATURE, LdTemplateController.PEER_REVIEW_ICON, toolContentID, contentFolderID, groupingUIID, parentUIID, - parentActivityType, activityTitle != null ? activityTitle : "Peer Review", Activity.CATEGORY_CONTENT); + parentActivityType, activityTitle != null ? activityTitle : "Peer Review"); } /** Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -438,7 +438,6 @@ learningLibraryTitle="${tool.learningLibraryTitle}" defaultToolContentId="${tool.defaultToolContentId}" supportsOutputs="${tool.supportsOutputs}" - activityCategoryId="${tool.activityCategoryID}" iconPath="${tool.iconPath}" childToolIds=" Index: lams_central/web/authoring/svgGenerator.jsp =================================================================== diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e) +++ lams_central/web/authoring/svgGenerator.jsp (.../svgGenerator.jsp) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -58,7 +58,6 @@ learningLibraryId="${tool.learningLibraryId}" learningLibraryTitle="${tool.learningLibraryTitle}" supportsOutputs="${tool.supportsOutputs}" - activityCategoryId="${tool.activityCategoryID}" iconPath="${tool.iconPath}" childToolIds=" Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_central/web/includes/javascript/authoring/authoringActivity.js (.../authoringActivity.js) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -42,6 +42,53 @@ 'Forum and Scribe' : 'data:image/png;base64,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' }, +/** + * For colouring. See LDEV-5058 + * CATEGORY_SYSTEM = 1; + CATEGORY_COLLABORATION = 2; + CATEGORY_ASSESSMENT = 3; + CATEGORY_CONTENT = 4; + CATEGORY_SPLIT = 5; + CATEGORY_RESPONSE = 6; + */ +ActivityCategories = { + 'Assessment' : 3, + 'Bbb' : 2, + 'Chat' : 2, + 'Data Collection' : 6, + 'doKumaran' : 2, + 'Forum' : 2, + 'Gmap' : 2, + 'Share imageGallery' : 4, + 'Share commonCartridge' : 4, + 'MCQ' : 3, + 'Question and Answer' : 6, + 'Share resources' : 4, + 'Leaderselection' : 6, + 'Mindmap' : 6, + 'Noticeboard' : 4, + 'Notebook' : 6, + 'Peerreview' : 3, + 'Pixlr' : 4, + 'Submit file' : 3, + 'Scratchie' : 3, + 'Scribe' : 2, + 'Spreadsheet' : 4, + 'Survey' : 6, + 'Share taskList' : 4, + 'Voting' : 6, + 'Wiki' : 2, + 'Kaltura' : 2, + 'Zoom' : 2, + 'Resources and Forum' : 5, + 'Chat and Scribe' : 5, + 'Forum and Scribe' : 5 +}, + +/* + + */ + ActivityDefs = { /** Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -79,8 +79,17 @@ 'colors' : { 'activityBorder' : 'black', + + /* + * Colours depend on activity category. + * CATEGORY_SYSTEM = 1; + CATEGORY_COLLABORATION = 2; + CATEGORY_ASSESSMENT = 3; + CATEGORY_CONTENT = 4; + CATEGORY_SPLIT = 5; + CATEGORY_RESPONSE = 6; + */ 'toolActivityBorder' : ['','#00007f','#ff8300','#625F67','#ffa500','#00007f','#7aa712'], - // each activity type has its own colour 'activity' : ['','#caddfb','#ffffbb','#ece9f7','#fdf1d3','#caddfb','#e9f9c0'], 'activityText' : 'black', // default region colour @@ -167,7 +176,7 @@ $('.template').each(function(){ var learningLibraryID = +$(this).attr('learningLibraryId'), learningLibraryTitle = $(this).attr('learningLibraryTitle'), - activityCategoryID = +$(this).attr('activityCategoryId'), + activityCategoryID = ActivityCategories[learningLibraryTitle], parallelChildActivityDefs = null; if (activityCategoryID == 5) { @@ -191,10 +200,10 @@ $('').attr('src', ActivityIcons[learningLibraryID]).appendTo(".img-"+learningLibraryID); // register tool properties so they are later easily accessible layout.toolMetadata[learningLibraryID] = { - 'iconPath' : $(this).attr('iconPath'), - 'defaultToolContentID' : $(this).attr('defaultToolContentId'), - 'supportsOutputs' : $(this).attr('supportsOutputs'), - 'activityCategoryID' : activityCategoryID, + 'iconPath' : $(this).attr('iconPath'), + 'defaultToolContentID' : $(this).attr('defaultToolContentId'), + 'supportsOutputs' : $(this).attr('supportsOutputs'), + 'activityCategoryID' : activityCategoryID, 'parallelChildActivityDefs' : parallelChildActivityDefs }; @@ -277,7 +286,7 @@ // calculate the position and create an instance of the tool activity var learningLibraryID = +draggable.draggable.attr('learningLibraryId'), toolID = +draggable.draggable.attr('toolId'), - activityCategoryID = +draggable.draggable.attr('activityCategoryId'), + activityCategoryID = layout.toolMetadata[learningLibraryID].activityCategoryID, x = draggable.offset.left + canvas.scrollLeft() - canvas.offset().left, y = draggable.offset.top + canvas.scrollTop() - canvas.offset().top, label = $('#toolDisplayName', draggable.draggable).text().trim(), @@ -2693,7 +2702,6 @@ parseInt(activity.end.items.shape.getBBox().y) : null, 'activityTitle' : activity.title, 'description' : activity.description, - 'activityCategoryID' : activityCategoryID, 'activityTypeID' : activityTypeID, 'orderID' : activity.orderID, 'defaultActivityUIID' : activity.defaultActivityUIID, Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200730.sql (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -0,0 +1,17 @@ +-- 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-5058 Move activity categories to only place where they are needed: authoring front end + +ALTER TABLE lams_learning_activity DROP FOREIGN KEY FK_lams_learning_activity_12; +ALTER TABLE lams_learning_activity DROP COLUMN activity_category_id; +DROP TABLE lams_activity_category; + +-- 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_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r7116e79c883ad42375d9fa3278dec8a84733ea86 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 7116e79c883ad42375d9fa3278dec8a84733ea86) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -105,15 +105,6 @@ public static final int PASSWORD_GATE_ACTIVITY_TYPE = 16; /** *************************************************************** */ - /*************************************************************************** - * static final variables indicating the the category of activities - **************************************************************************/ - public static final int CATEGORY_SYSTEM = 1; - public static final int CATEGORY_COLLABORATION = 2; - public static final int CATEGORY_ASSESSMENT = 3; - public static final int CATEGORY_CONTENT = 4; - public static final int CATEGORY_SPLIT = 5; - public static final int CATEGORY_RESPONSE = 6; /** *************************************************************** */ /*************************************************************************** @@ -215,9 +206,6 @@ @Column(name = "learning_activity_type_id", insertable = false, updatable = false) private Integer activityTypeId; - @Column(name = "activity_category_id") - private Integer activityCategoryID; - @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "transition_to_id") private Transition transitionTo; @@ -348,72 +336,55 @@ public static Activity getActivityInstance(int activityType) { // the default constructors don't set up the activity type // so we need to do that manually - // also default to a sensible category type Activity activity = null; switch (activityType) { case TOOL_ACTIVITY_TYPE: activity = new ToolActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_CONTENT); break; case OPTIONS_ACTIVITY_TYPE: activity = new OptionsActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case PARALLEL_ACTIVITY_TYPE: activity = new ParallelActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SPLIT); break; case SEQUENCE_ACTIVITY_TYPE: activity = new SequenceActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case SYNCH_GATE_ACTIVITY_TYPE: activity = new SynchGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case SCHEDULE_GATE_ACTIVITY_TYPE: activity = new ScheduleGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case PERMISSION_GATE_ACTIVITY_TYPE: activity = new PermissionGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case SYSTEM_GATE_ACTIVITY_TYPE: activity = new SystemGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case CONDITION_GATE_ACTIVITY_TYPE: activity = new ConditionGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case CHOSEN_BRANCHING_ACTIVITY_TYPE: activity = new ChosenBranchingActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case GROUP_BRANCHING_ACTIVITY_TYPE: activity = new GroupBranchingActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case TOOL_BRANCHING_ACTIVITY_TYPE: activity = new ToolBranchingActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case OPTIONS_WITH_SEQUENCES_TYPE: activity = new OptionsWithSequencesActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case FLOATING_ACTIVITY_TYPE: activity = new FloatingActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; case PASSWORD_GATE_ACTIVITY_TYPE: activity = new PasswordGateActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; default: activity = new GroupingActivity(); - activity.setActivityCategoryID(Activity.CATEGORY_SYSTEM); break; } activity.setActivityTypeId(activityType); @@ -738,14 +709,6 @@ this.groupingUIID = groupingUIID; } - public Integer getActivityCategoryID() { - return activityCategoryID; - } - - public void setActivityCategoryID(Integer activityCategoryID) { - this.activityCategoryID = activityCategoryID; - } - public String getLanguageFile() { return languageFile; } @@ -1024,7 +987,6 @@ newActivity.setGroupingSupportType(this.getGroupingSupportType()); newActivity.setApplyGrouping(this.getApplyGrouping()); - newActivity.setActivityCategoryID(this.getActivityCategoryID()); newActivity.setGrouping(this.getGrouping()); newActivity.setGroupingUIID(LearningDesign.addOffset(this.getGroupingUIID(), uiidOffset)); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -162,9 +162,6 @@ /** The url of the tool's admin screen. */ private String adminURL; - /** The category of activity */ - private Integer activityCategoryID; - private Integer gateActivityLevelID; private Boolean gateOpen; @@ -296,7 +293,6 @@ : null; createDateTime = activity.getCreateDateTime(); languageFile = activity.getLanguageFile(); - activityCategoryID = activity.getActivityCategoryID(); libraryActivityUIImage = activity.getLibraryActivityUiImage(); libraryActivityID = activity.getLibraryActivity() != null ? activity.getLibraryActivity().getActivityId() : null; @@ -484,13 +480,6 @@ ******************************************************************************************************************/ /** - * @return Returns the activityCategoryID. - */ - public Integer getActivityCategoryID() { - return activityCategoryID; - } - - /** * @return Returns the activityID. */ public Long getActivityID() { @@ -839,13 +828,6 @@ /******************************************************************************************************************* * Setters ******************************************************************************************************************/ - /** - * @param activityCategoryID - * The activityCategoryID to set. - */ - public void setActivityCategoryID(Integer activityCategoryID) { - this.activityCategoryID = activityCategoryID; - } /** * @param activityID Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -45,7 +45,6 @@ public class LibraryActivityDTO extends BaseDTO { private Integer activityTypeID; private Long activityID; - private Integer activityCategoryID; private Integer activityUIID; private Long learningLibraryID; //not sure if this is needed private Long learningDesignID; @@ -109,7 +108,6 @@ public LibraryActivityDTO(Activity activity, String languageCode) { activityTypeID = activity.getActivityTypeId(); activityID = activity.getActivityId(); - activityCategoryID = activity.getActivityCategoryID(); activityUIID = activity.getActivityUIID(); learningLibraryID = activity.getLearningLibrary() != null ? activity.getLearningLibrary().getLearningLibraryId() : null; @@ -249,13 +247,6 @@ } /** - * @return Returns the activityCategoryID. - */ - public Integer getActivityCategoryID() { - return activityCategoryID; - } - - /** * @return Returns the activityID. */ public Long getActivityID() { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -1993,7 +1993,6 @@ act.setGroupingSupportType(actDto.getGroupingSupportType()); act.setActivityUIID(actDto.getActivityUIID()); - act.setActivityCategoryID(actDto.getActivityCategoryID()); act.setActivityId(actDto.getActivityID()); act.setActivityTypeId(actDto.getActivityTypeID()); act.setApplyGrouping(actDto.getApplyGrouping()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 47043f84205046a23497bf8c57060e2dcadf0c9a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -34,7 +34,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; -import java.util.Set; import java.util.Vector; import org.apache.log4j.Logger; @@ -182,7 +181,7 @@ @Override public LearningLibrary getLearningLibrary(Long learningLibraryId) { - return (LearningLibrary) learningDesignDAO.find(LearningLibrary.class, learningLibraryId); + return learningDesignDAO.find(LearningLibrary.class, learningLibraryId); } @Override @@ -194,7 +193,7 @@ public void saveLearningLibraryGroups(Collection groups) { // find out which groups do not exist anymore and get rid of them Collection existingGroups = learningLibraryDAO.getLearningLibraryGroups(); - Collection removeGroups = new HashSet(existingGroups); + Collection removeGroups = new HashSet<>(existingGroups); removeGroups.removeAll(groups); existingGroups.removeAll(removeGroups); learningLibraryDAO.deleteAll(removeGroups); @@ -224,7 +223,7 @@ public ArrayList getAllLearningLibraryDetails(boolean valid, String languageCode) throws IOException { Iterator iterator = learningLibraryDAO.getAllLearningLibraries(valid).iterator(); - ArrayList libraries = new ArrayList(); + ArrayList libraries = new ArrayList<>(); while (iterator.hasNext()) { LearningLibrary learningLibrary = iterator.next(); List templateActivities = activityDAO @@ -276,10 +275,10 @@ @SuppressWarnings("unchecked") public List getToolDTOs(boolean includeParallel, boolean includeInvalid, String userName) throws IOException { - User user = (User) learningLibraryDAO.findByProperty(User.class, "login", userName).get(0); + User user = learningLibraryDAO.findByProperty(User.class, "login", userName).get(0); String languageCode = user.getLocale().getLanguageIsoCode(); ArrayList learningLibraries = getAllLearningLibraryDetails(false, languageCode); - List tools = new ArrayList(); + List tools = new ArrayList<>(); for (LearningLibraryDTO learningLibrary : learningLibraries) { // skip invalid tools List libraryActivityDTOs = learningLibrary.getTemplateActivities(); @@ -293,7 +292,7 @@ LibraryActivityDTO libraryActivityDTO = libraryActivityDTOs.get(0); ToolDTO toolDTO = new ToolDTO(); if (isParallel) { - List childLibraryIDs = new ArrayList(); + List childLibraryIDs = new ArrayList<>(); for (LibraryActivityDTO childActivityDTO : libraryActivityDTOs) { Long childToolID = childActivityDTO.getToolID(); if (childToolID != null) { @@ -307,14 +306,12 @@ toolDTO.setLearningLibraryId(learningLibrary.getLearningLibraryID()); toolDTO.setLearningLibraryTitle(learningLibrary.getTitle()); toolDTO.setToolDisplayName(libraryActivityDTO.getActivityTitle()); - toolDTO.setActivityCategoryID( - isParallel ? Activity.CATEGORY_SPLIT : libraryActivityDTO.getActivityCategoryID()); toolDTO.setValid(learningLibrary.getValidFlag()); if (libraryActivityDTO.getToolID() == null) { toolDTO.setIconPath(libraryActivityDTO.getLibraryActivityUIImage()); } else { - Tool tool = (Tool) learningLibraryDAO.find(Tool.class, libraryActivityDTO.getToolID()); + Tool tool = learningLibraryDAO.find(Tool.class, libraryActivityDTO.getToolID()); String iconPath = "tool/" + tool.getToolSignature() + "/images/icon_" + tool.getToolIdentifier() + ".svg"; toolDTO.setIconPath(iconPath); @@ -358,8 +355,7 @@ continue; } short componentsFound = 0; - for (Activity libraryComponent : (Set) ((ParallelActivity) libraryActivity) - .getActivities()) { + for (Activity libraryComponent : ((ParallelActivity) libraryActivity).getActivities()) { ToolActivity toolLibraryCompoment = (ToolActivity) libraryComponent; for (AuthoringActivityDTO component : components) { // match with tool signature of children Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (.../ToolDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (.../ToolDTO.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.dto; public class ToolDTO { @@ -31,7 +30,6 @@ private String toolDisplayName; private String iconPath; private Boolean supportsOutputs; - private Integer activityCategoryID; private Long[] childToolIds; private Boolean valid; @@ -70,14 +68,6 @@ this.supportsOutputs = supportsOutputs; } - public Integer getActivityCategoryID() { - return activityCategoryID; - } - - public void setActivityCategoryID(Integer activityCategoryID) { - this.activityCategoryID = activityCategoryID; - } - public Long getLearningLibraryId() { return learningLibraryId; } @@ -111,10 +101,10 @@ } public Boolean getValid() { - return valid; + return valid; } public void setValid(Boolean valid) { - this.valid = valid; + this.valid = valid; } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 --- lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (.../AuthoringJsonTags.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (.../AuthoringJsonTags.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) @@ -55,8 +55,6 @@ public static final String ACTIVITY_TYPE_ID = "activityTypeID"; public static final String ORDER_ID = "orderID"; - public static final String ACTIVITY_CATEGORY_ID = "activityCategoryID"; - public static final String LIBRARY_IMAGE = "libraryActivityUIImage"; public static final String LIBRARY_ACTIVITY = "libraryActivityID";