'; @@ -2929,7 +3049,7 @@ if (layout.liveEdit) { var missingGroupingOnActivities = GeneralLib.checkTBLGrouping(); - if (missingGroupingOnActivities) { + if (missingGroupingOnActivities && missingGroupingOnActivities.length > 0) { var info = LABELS.SAVE_SUCCESSFUL_CHECK_GROUPING; $.each(missingGroupingOnActivities, function(){ info += '
* ' + this.title; @@ -2985,23 +3105,28 @@ // close the Live Edit dialog layout.infoDialog.data('show')(LABELS.LIVEEDIT_SAVE_SUCCESSFUL, true); setTimeout(function(){ - window.parent.closeDialog('dialogAuthoring'); - }, 5000); + window.location.href = LAMS_URL + 'home/monitorLesson.do?lessonID=' + initRelaunchMonitorLessonID; + }, 3000); } }); // if it is Live Edit, exit return; } - var svgSaveSuccessful = GeneralLib.saveLearningDesignImage(); - if (!svgSaveSuccessful) { - layout.infoDialog.data('show')(LABELS.SVG_SAVE_ERROR); + if (wasReadOnly === layout.ld.readOnly) { + // If read-only-ness has changed, then current activities colouring does not reflect its real state. + // In this case do not generate the image at all. + // It will be either created after next save in authoring or regenerated on-the-fly in Add Lesson or Monitoring. + var svgSaveSuccessful = GeneralLib.saveLearningDesignImage(); + if (!svgSaveSuccessful) { + layout.infoDialog.data('show')(LABELS.SVG_SAVE_ERROR); + } } if (!layout.ld.invalid) { var missingGroupingOnActivities = GeneralLib.checkTBLGrouping(); - if (missingGroupingOnActivities) { + if (missingGroupingOnActivities && missingGroupingOnActivities.length > 0) { var info = LABELS.SAVE_SUCCESSFUL_CHECK_GROUPING; $.each(missingGroupingOnActivities, function(){ info += '
* ' + this.title; @@ -3312,6 +3437,6 @@ snapToGrid : function(input, skipPadding) { var snapped = Snap.snapTo(layout.snapToGrid.step, input, layout.snapToGrid.step / 2); - return skipPadding ? snapped : (Math.max(snapped, layout.snapToGrid.padding) + layout.snapToGrid.offset); + return skipPadding ? snapped : Math.max(snapped, layout.snapToGrid.padding); } }; Index: lams_central/web/includes/javascript/authoring/authoringHandler.js =================================================================== diff -u -r7a6cf37e3bfd077514f47ff4f4f37522b72a33da -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision 7a6cf37e3bfd077514f47ff4f4f37522b72a33da) +++ lams_central/web/includes/javascript/authoring/authoringHandler.js (.../authoringHandler.js) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -1,4 +1,4 @@ -/** +/** * This file contains event handlers for interaction with canvas and other Authoring elements. */ @@ -8,8 +8,7 @@ var HandlerLib = { // taken from http://jsfiddle.net/LQuyr/8/ touchHandler : function(event) { - var self = this, - touches = event.changedTouches, + var touches = event.changedTouches, first = touches[0], type = ""; @@ -33,13 +32,11 @@ first.target.dispatchEvent(simulatedEvent); - var scrollables = [], - clickedInScrollArea = false, + var scrollables = []; // check if any of the parents has is-scollable class - parentEls = $(event.target).parents().map(function() { + $(event.target).parents().map(function() { try { if ($(this).hasClass('scrollable')) { - clickedInScrollArea = true; // get vertical direction of touch event var direction = (window.startY < first.clientY) ? 'down' : 'up'; // calculate stuff... :o) @@ -160,9 +157,45 @@ * Moves dragged elements on the canvas. */ dragItemsMoveHandler : function(object, event, startX, startY) { - var dx = GeneralLib.snapToGrid(event.pageX - startX, true), - dy = GeneralLib.snapToGrid(event.pageY - startY, true); + // detect if activity is close to an edge of viewport and scroll automatically + if (event.pageX - canvas.offset().left > canvas.width() - 150) { + canvas.scrollLeft(canvas.scrollLeft() + 10); + } else if (event.pageX - canvas.offset().left < 150) { + canvas.scrollLeft(Math.max(0, canvas.scrollLeft() - 10)); + } + + if (event.pageY - canvas.offset().top > canvas.height() - 150) { + canvas.scrollTop(canvas.scrollTop() + 10); + } else if (event.pageY - canvas.offset().top < 100) { + canvas.scrollTop(Math.max(0, canvas.scrollTop() - 10)); + } + + /* + Another approach, based on how the event is close to the edge + + var canvasWidth = canvas.width(), + canvasHeight = canvas.height(), + eventX = event.pageX - canvas.offset().left, + eventY = event.pageY - canvas.offset().top, + scrollYTrigger = layout.activity.height + 20; + + if (event.pageX - canvas.offset().left > canvas.width() - 50) { + canvas.scrollLeft(canvas.scrollLeft() + 10); + } else if (event.pageX - canvas.offset().left < 200) { + canvas.scrollLeft(Math.max(0, canvas.scrollLeft() - 10)); + } + + if (eventY > canvasHeight - 100) { + canvas.scrollTop(canvas.scrollTop() + eventY - canvasHeight + 100); + } else if (eventY < 80) { + canvas.scrollTop(Math.max(0, canvas.scrollTop() - 80 + eventY)); + } + + */ + var dx = event.pageX + canvas.scrollLeft() - startX, + dy = event.pageY + canvas.scrollTop() - startY; + object.items.transform('t' + dx + ' ' + dy); if (object.transitions) { @@ -177,18 +210,20 @@ // highlight rubbish bin if dragged elements are over it if (HandlerLib.isElemenentBinned(event)) { if (!layout.bin.glowEffect) { + let binSvg = layout.bin.select('svg'); layout.bin.glowEffect = paper.path(Snap.format('M {x} {y} h {side} v {side} h -{side} z', { - 'x' : layout.bin.attr('x'), - 'y' : layout.bin.attr('y'), - 'side' : layout.bin.attr('width') + 'x' : binSvg.attr('x'), + 'y' : binSvg.attr('y'), + 'side' : binSvg.attr('width') })) .attr({ 'stroke' : layout.colors.binSelect, 'stroke-width' : 2, 'stroke-dasharray' : '5,3', 'fill' : 'none' }); + layout.bin.append(layout.bin.glowEffect); } } else if (layout.bin.glowEffect){ layout.bin.glowEffect.remove(); @@ -281,17 +316,6 @@ .off('mouseup') .off('mousemove'); - // if the user started adding a branching and did not finish it - if (layout.addBranchingStart){ - layout.infoDialog.modal('hide'); - - if (layout.addBranchingStart instanceof ActivityDefs.BranchingEdgeActivity) { - layout.activities.splice(layout.activities.indexOf(layout.addBranchingStart), 1); - layout.addBranchingStart.items.remove(); - } - layout.addBranchingStart = null; - } - if (init) { // if clicked anywhere, activity selection is gone canvas.click(HandlerLib.canvasClickHandler) @@ -396,7 +420,7 @@ var transitions = activity.transitions.from.concat(activity.transitions.to); // start dragging the activity - HandlerLib.dragItemsStartHandler(activity, this, mouseupHandler, event, x, y, transitions); + HandlerLib.dragItemsStartHandler(activity, this, mouseupHandler, event, x + canvas.scrollLeft(), y + canvas.scrollTop(), transitions); } }, @@ -486,7 +510,7 @@ } } - HandlerLib.dragItemsStartHandler(container, this, mouseupHandler, event, x, y); + HandlerLib.dragItemsStartHandler(container, this, mouseupHandler, event, x + canvas.scrollLeft(), y + canvas.scrollTop()); }, /** @@ -588,7 +612,7 @@ } } - HandlerLib.dragItemsStartHandler(label, this, mouseupHandler, event, x, y); + HandlerLib.dragItemsStartHandler(label, this, mouseupHandler, event, x + canvas.scrollLeft(), y + canvas.scrollTop()); }, @@ -744,9 +768,6 @@ if (targetElement) { endActivity = ActivityLib.getParentObject(targetElement); } - if (endActivity == null) { - endActivity = ActivityLib.getParentObject(targetElement.parent()); - } if (endActivity && activity != endActivity) { ActivityLib.addTransition(activity, endActivity); @@ -778,6 +799,6 @@ } } - HandlerLib.dragItemsStartHandler(transition, this, mouseupHandler, event, x, y); + HandlerLib.dragItemsStartHandler(transition, this, mouseupHandler, event, x + canvas.scrollLeft(), y + canvas.scrollTop()); } }; Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision cf258bae4dd72eab7a6f5bc895b96966caafaf06) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -1,271 +1,216 @@ SET FOREIGN_KEY_CHECKS=0; -SET NAMES utf8mb4 ; --- --- Table structure for table `lams_activity_category` --- +DROP TABLE IF EXISTS lams_activity_category; -DROP TABLE IF EXISTS `lams_activity_category`; -CREATE TABLE `lams_activity_category` ( - `activity_category_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`activity_category_id`) +CREATE TABLE lams_activity_category ( + activity_category_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (activity_category_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --- --- Table structure for table `lams_activity_evaluation` --- +DROP TABLE IF EXISTS lams_activity_evaluation; -DROP TABLE IF EXISTS `lams_activity_evaluation`; -CREATE TABLE `lams_activity_evaluation` ( - `activity_id` bigint(20) NOT NULL, - `tool_output_definition` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `weight` tinyint(4) DEFAULT NULL, - PRIMARY KEY (`activity_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_lams_activity_evaluation_1` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_activity_evaluation ( + activity_id bigint NOT NULL, + tool_output_definition varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + weight tinyint DEFAULT NULL, + PRIMARY KEY (activity_id), + KEY activity_id (activity_id), + CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --- --- Table structure for table `lams_auth_method_type` --- +DROP TABLE IF EXISTS lams_auth_method_type; -DROP TABLE IF EXISTS `lams_auth_method_type`; -CREATE TABLE `lams_auth_method_type` ( - `authentication_method_type_id` int(3) NOT NULL, - `description` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`authentication_method_type_id`) +CREATE TABLE lams_auth_method_type ( + authentication_method_type_id int NOT NULL, + `description` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (authentication_method_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_authentication_method; --- --- Table structure for table `lams_authentication_method` --- -DROP TABLE IF EXISTS `lams_authentication_method`; - -CREATE TABLE `lams_authentication_method` ( - `authentication_method_id` bigint(20) NOT NULL, - `authentication_method_type_id` int(3) NOT NULL DEFAULT '0', - `authentication_method_name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`authentication_method_id`), - UNIQUE KEY `UQ_lams_authentication_method_1` (`authentication_method_name`), - KEY `authentication_method_type_id` (`authentication_method_type_id`), - CONSTRAINT `FK_lams_authorization_method_1` FOREIGN KEY (`authentication_method_type_id`) REFERENCES `lams_auth_method_type` (`authentication_method_type_id`) +CREATE TABLE lams_authentication_method ( + authentication_method_id bigint NOT NULL, + authentication_method_type_id int NOT NULL DEFAULT '0', + authentication_method_name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (authentication_method_id), + UNIQUE KEY UQ_lams_authentication_method_1 (authentication_method_name), + KEY authentication_method_type_id (authentication_method_type_id), + CONSTRAINT FK_lams_authorization_method_1 FOREIGN KEY (authentication_method_type_id) REFERENCES lams_auth_method_type (authentication_method_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --- --- Table structure for table `lams_branch_activity_entry` --- +DROP TABLE IF EXISTS lams_branch_activity_entry; -DROP TABLE IF EXISTS `lams_branch_activity_entry`; -CREATE TABLE `lams_branch_activity_entry` ( - `entry_id` bigint(20) NOT NULL AUTO_INCREMENT, - `entry_ui_id` int(11) DEFAULT NULL, - `group_id` bigint(20) DEFAULT NULL, - `sequence_activity_id` bigint(20) DEFAULT NULL, - `branch_activity_id` bigint(20) NOT NULL, - `condition_id` bigint(20) DEFAULT NULL, - `open_gate` tinyint(1) DEFAULT NULL, - PRIMARY KEY (`entry_id`), - KEY `group_id` (`group_id`), - KEY `sequence_activity_id` (`sequence_activity_id`), - KEY `branch_activity_id` (`branch_activity_id`), - KEY `condition_id` (`condition_id`), - CONSTRAINT `FK_lams_branch_activity_entry_4` FOREIGN KEY (`condition_id`) REFERENCES `lams_branch_condition` (`condition_id`), - CONSTRAINT `FK_lams_branch_map_branch` FOREIGN KEY (`branch_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_lams_branch_map_sequence` FOREIGN KEY (`sequence_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_lams_group_activity_1` FOREIGN KEY (`group_id`) REFERENCES `lams_group` (`group_id`) +CREATE TABLE lams_branch_activity_entry ( + entry_id bigint NOT NULL AUTO_INCREMENT, + entry_ui_id int DEFAULT NULL, + group_id bigint DEFAULT NULL, + sequence_activity_id bigint DEFAULT NULL, + branch_activity_id bigint NOT NULL, + condition_id bigint DEFAULT NULL, + open_gate tinyint(1) DEFAULT NULL, + PRIMARY KEY (entry_id), + KEY group_id (group_id), + KEY sequence_activity_id (sequence_activity_id), + KEY branch_activity_id (branch_activity_id), + KEY condition_id (condition_id), + CONSTRAINT FK_lams_branch_activity_entry_4 FOREIGN KEY (condition_id) REFERENCES lams_branch_condition (condition_id), + CONSTRAINT FK_lams_branch_map_branch FOREIGN KEY (branch_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_lams_branch_map_sequence FOREIGN KEY (sequence_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_lams_group_activity_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_branch_condition; --- --- Table structure for table `lams_branch_condition` --- -DROP TABLE IF EXISTS `lams_branch_condition`; - -CREATE TABLE `lams_branch_condition` ( - `condition_id` bigint(20) NOT NULL AUTO_INCREMENT, - `condition_ui_id` int(11) DEFAULT NULL, - `order_id` int(11) DEFAULT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `display_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `type` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, - `start_value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `end_value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `exact_match_value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`condition_id`) +CREATE TABLE lams_branch_condition ( + condition_id bigint NOT NULL AUTO_INCREMENT, + condition_ui_id int DEFAULT NULL, + order_id int DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + display_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + start_value varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + end_value varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + exact_match_value varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (condition_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_comment; --- --- Table structure for table `lams_comment` --- -DROP TABLE IF EXISTS `lams_comment`; - -CREATE TABLE `lams_comment` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `session_id` bigint(20) NOT NULL, - `body` mediumtext COLLATE utf8mb4_unicode_ci, - `create_by` bigint(20) DEFAULT NULL, - `create_date` datetime DEFAULT NULL, - `update_date` datetime DEFAULT NULL, - `update_by` bigint(20) DEFAULT NULL, - `last_modified` datetime DEFAULT NULL, - `last_reply_date` datetime DEFAULT NULL, - `reply_number` int(11) DEFAULT NULL, - `hide_flag` smallint(6) DEFAULT NULL, - `parent_uid` bigint(20) DEFAULT NULL, - `root_comment_uid` bigint(20) DEFAULT NULL, - `comment_level` smallint(6) DEFAULT NULL, - `thread_comment_uid` bigint(20) DEFAULT NULL, - `sticky` smallint(6) DEFAULT '0', - `monitor` smallint(6) DEFAULT '0', - `anonymous` smallint(6) DEFAULT '0', - PRIMARY KEY (`uid`), - KEY `FK_comment_session` (`session_id`), - KEY `FK_comment_create` (`create_by`), - KEY `FK_comment_modify` (`update_by`), - KEY `FK_comment_parent` (`parent_uid`), - KEY `FK_comment_root` (`root_comment_uid`), - KEY `FK_comment_thread` (`thread_comment_uid`), - KEY `IX_comment_level_sticky` (`comment_level`,`sticky`), - CONSTRAINT `FK_comment_create` FOREIGN KEY (`create_by`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_comment_modify` FOREIGN KEY (`update_by`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_comment_parent` FOREIGN KEY (`parent_uid`) REFERENCES `lams_comment` (`uid`), - CONSTRAINT `FK_comment_root` FOREIGN KEY (`root_comment_uid`) REFERENCES `lams_comment` (`uid`), - CONSTRAINT `FK_comment_session` FOREIGN KEY (`session_id`) REFERENCES `lams_comment_session` (`uid`), - CONSTRAINT `FK_comment_thread` FOREIGN KEY (`thread_comment_uid`) REFERENCES `lams_comment` (`uid`) +CREATE TABLE lams_comment ( + uid bigint NOT NULL AUTO_INCREMENT, + session_id bigint NOT NULL, + body mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_by bigint DEFAULT NULL, + create_date datetime DEFAULT NULL, + update_date datetime DEFAULT NULL, + update_by bigint DEFAULT NULL, + last_modified datetime DEFAULT NULL, + last_reply_date datetime DEFAULT NULL, + reply_number int DEFAULT NULL, + hide_flag smallint DEFAULT NULL, + parent_uid bigint DEFAULT NULL, + root_comment_uid bigint DEFAULT NULL, + comment_level smallint DEFAULT NULL, + thread_comment_uid bigint DEFAULT NULL, + sticky smallint DEFAULT '0', + monitor smallint DEFAULT '0', + anonymous smallint DEFAULT '0', + PRIMARY KEY (uid), + KEY FK_comment_session (session_id), + KEY FK_comment_create (create_by), + KEY FK_comment_modify (update_by), + KEY FK_comment_parent (parent_uid), + KEY FK_comment_root (root_comment_uid), + KEY FK_comment_thread (thread_comment_uid), + KEY IX_comment_level_sticky (comment_level,sticky), + CONSTRAINT FK_comment_create FOREIGN KEY (create_by) REFERENCES lams_user (user_id), + CONSTRAINT FK_comment_modify FOREIGN KEY (update_by) REFERENCES lams_user (user_id), + CONSTRAINT FK_comment_parent FOREIGN KEY (parent_uid) REFERENCES lams_comment (uid), + CONSTRAINT FK_comment_root FOREIGN KEY (root_comment_uid) REFERENCES lams_comment (uid), + CONSTRAINT FK_comment_session FOREIGN KEY (session_id) REFERENCES lams_comment_session (uid), + CONSTRAINT FK_comment_thread FOREIGN KEY (thread_comment_uid) REFERENCES lams_comment (uid) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_comment_likes; --- --- Table structure for table `lams_comment_likes` --- -DROP TABLE IF EXISTS `lams_comment_likes`; - -CREATE TABLE `lams_comment_likes` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `comment_uid` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `vote` tinyint(1) DEFAULT NULL, - PRIMARY KEY (`uid`), - UNIQUE KEY `comment_like_unique` (`comment_uid`,`user_id`), - KEY `FK_commentlike_comment` (`comment_uid`), - KEY `FK_commentlike_user` (`user_id`), - CONSTRAINT `FK_commentlike_comment` FOREIGN KEY (`comment_uid`) REFERENCES `lams_comment` (`uid`), - CONSTRAINT `FK_commentlike_user` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) +CREATE TABLE lams_comment_likes ( + uid bigint NOT NULL AUTO_INCREMENT, + comment_uid bigint NOT NULL, + user_id bigint NOT NULL, + vote tinyint(1) DEFAULT NULL, + PRIMARY KEY (uid), + UNIQUE KEY comment_like_unique (comment_uid,user_id), + KEY FK_commentlike_comment (comment_uid), + KEY FK_commentlike_user (user_id), + CONSTRAINT FK_commentlike_comment FOREIGN KEY (comment_uid) REFERENCES lams_comment (uid), + CONSTRAINT FK_commentlike_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_comment_session; --- --- Table structure for table `lams_comment_session` --- -DROP TABLE IF EXISTS `lams_comment_session`; - -CREATE TABLE `lams_comment_session` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `external_id` bigint(20) DEFAULT NULL, - `external_id_type` int(1) DEFAULT NULL, - `external_signature` varchar(40) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `external_secondary_id` bigint(20) DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `comment_ext_sig` (`external_id`,`external_signature`) +CREATE TABLE lams_comment_session ( + uid bigint NOT NULL AUTO_INCREMENT, + external_id bigint DEFAULT NULL, + external_id_type int DEFAULT NULL, + external_signature varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + external_secondary_id bigint DEFAULT NULL, + PRIMARY KEY (uid), + KEY comment_ext_sig (external_id,external_signature) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_competence; --- --- Table structure for table `lams_competence` --- -DROP TABLE IF EXISTS `lams_competence`; - -CREATE TABLE `lams_competence` ( - `competence_id` bigint(20) NOT NULL AUTO_INCREMENT, - `learning_design_id` bigint(20) DEFAULT NULL, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `title` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`competence_id`), - UNIQUE KEY `competence_id` (`competence_id`), - UNIQUE KEY `learning_design_id` (`learning_design_id`,`title`), - CONSTRAINT `LearningDesignCompetenceMap` FOREIGN KEY (`learning_design_id`) REFERENCES `lams_learning_design` (`learning_design_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_competence ( + competence_id bigint NOT NULL AUTO_INCREMENT, + learning_design_id bigint DEFAULT NULL, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + title varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (competence_id), + UNIQUE KEY competence_id (competence_id), + UNIQUE KEY learning_design_id (learning_design_id,title), + CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_competence_mapping; --- --- Table structure for table `lams_competence_mapping` --- -DROP TABLE IF EXISTS `lams_competence_mapping`; - -CREATE TABLE `lams_competence_mapping` ( - `competence_mapping_id` bigint(20) NOT NULL AUTO_INCREMENT, - `competence_id` bigint(20) DEFAULT NULL, - `activity_id` bigint(20) DEFAULT NULL, - PRIMARY KEY (`competence_mapping_id`), - UNIQUE KEY `competence_mapping_id` (`competence_mapping_id`), - UNIQUE KEY `competence_id` (`competence_id`,`activity_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_lams_competence_mapping_1` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_competence_mapping_2` FOREIGN KEY (`competence_id`) REFERENCES `lams_competence` (`competence_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_competence_mapping ( + competence_mapping_id bigint NOT NULL AUTO_INCREMENT, + competence_id bigint DEFAULT NULL, + activity_id bigint DEFAULT NULL, + PRIMARY KEY (competence_mapping_id), + UNIQUE KEY competence_mapping_id (competence_mapping_id), + UNIQUE KEY competence_id (competence_id,activity_id), + KEY activity_id (activity_id), + CONSTRAINT FK_lams_competence_mapping_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id) REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_configuration; --- --- Table structure for table `lams_configuration` --- -DROP TABLE IF EXISTS `lams_configuration`; - -CREATE TABLE `lams_configuration` ( - `config_key` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, - `config_value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `description_key` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `header_name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `format` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `required` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`config_key`) +CREATE TABLE lams_configuration ( + config_key varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + config_value varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + description_key varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + header_name varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `format` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + required tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (config_key) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_copy_type; --- --- Table structure for table `lams_copy_type` --- -DROP TABLE IF EXISTS `lams_copy_type`; - -CREATE TABLE `lams_copy_type` ( - `copy_type_id` tinyint(4) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`copy_type_id`) +CREATE TABLE lams_copy_type ( + copy_type_id tinyint NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (copy_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_credential; --- --- Table structure for table `lams_cr_credential` --- -DROP TABLE IF EXISTS `lams_cr_credential`; - -CREATE TABLE `lams_cr_credential` ( - `credential_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `password` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`credential_id`) +CREATE TABLE lams_cr_credential ( + credential_id bigint unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (credential_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_node; --- --- Table structure for table `lams_cr_node` --- DROP TABLE IF EXISTS `lams_cr_node`; @@ -284,171 +229,133 @@ CONSTRAINT `FK_lams_cr_node_1` FOREIGN KEY (`workspace_id`) REFERENCES `lams_cr_workspace` (`workspace_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_node_version; --- --- Table structure for table `lams_cr_node_version` --- -DROP TABLE IF EXISTS `lams_cr_node_version`; - -CREATE TABLE `lams_cr_node_version` ( - `nv_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `node_id` bigint(20) unsigned NOT NULL, - `version_id` bigint(20) unsigned NOT NULL, - `created_date_time` datetime NOT NULL, - `user_id` bigint(20) NOT NULL, - PRIMARY KEY (`nv_id`), - KEY `node_id` (`node_id`), - CONSTRAINT `FK_lams_cr_node_version_2` FOREIGN KEY (`node_id`) REFERENCES `lams_cr_node` (`node_id`) +CREATE TABLE lams_cr_node_version ( + nv_id bigint unsigned NOT NULL AUTO_INCREMENT, + node_id bigint unsigned NOT NULL, + version_id bigint unsigned NOT NULL, + created_date_time datetime NOT NULL, + user_id bigint NOT NULL, + PRIMARY KEY (nv_id), + KEY node_id (node_id), + CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id) REFERENCES lams_cr_node (node_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_node_version_property; --- --- Table structure for table `lams_cr_node_version_property` --- -DROP TABLE IF EXISTS `lams_cr_node_version_property`; - -CREATE TABLE `lams_cr_node_version_property` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `nv_id` bigint(20) unsigned NOT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `value` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `type` tinyint(4) NOT NULL, - PRIMARY KEY (`id`), - KEY `nv_id` (`nv_id`), - CONSTRAINT `FK_lams_cr_node_version_property_1` FOREIGN KEY (`nv_id`) REFERENCES `lams_cr_node_version` (`nv_id`) +CREATE TABLE lams_cr_node_version_property ( + id bigint unsigned NOT NULL AUTO_INCREMENT, + nv_id bigint unsigned NOT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `type` tinyint NOT NULL, + PRIMARY KEY (id), + KEY nv_id (nv_id), + CONSTRAINT FK_lams_cr_node_version_property_1 FOREIGN KEY (nv_id) REFERENCES lams_cr_node_version (nv_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_workspace; --- --- Table structure for table `lams_cr_workspace` --- -DROP TABLE IF EXISTS `lams_cr_workspace`; - -CREATE TABLE `lams_cr_workspace` ( - `workspace_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`workspace_id`) +CREATE TABLE lams_cr_workspace ( + workspace_id bigint unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (workspace_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_cr_workspace_credential; --- --- Table structure for table `lams_cr_workspace_credential` --- -DROP TABLE IF EXISTS `lams_cr_workspace_credential`; - -CREATE TABLE `lams_cr_workspace_credential` ( - `wc_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `workspace_id` bigint(20) unsigned NOT NULL, - `credential_id` bigint(20) unsigned NOT NULL, - PRIMARY KEY (`wc_id`), - KEY `workspace_id` (`workspace_id`), - KEY `credential_id` (`credential_id`), - CONSTRAINT `FK_lams_cr_workspace_credential_1` FOREIGN KEY (`workspace_id`) REFERENCES `lams_cr_workspace` (`workspace_id`), - CONSTRAINT `FK_lams_cr_workspace_credential_2` FOREIGN KEY (`credential_id`) REFERENCES `lams_cr_credential` (`credential_id`) +CREATE TABLE lams_cr_workspace_credential ( + wc_id bigint unsigned NOT NULL AUTO_INCREMENT, + workspace_id bigint unsigned NOT NULL, + credential_id bigint unsigned NOT NULL, + PRIMARY KEY (wc_id), + KEY workspace_id (workspace_id), + KEY credential_id (credential_id), + CONSTRAINT FK_lams_cr_workspace_credential_1 FOREIGN KEY (workspace_id) REFERENCES lams_cr_workspace (workspace_id), + CONSTRAINT FK_lams_cr_workspace_credential_2 FOREIGN KEY (credential_id) REFERENCES lams_cr_credential (credential_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_data_flow; --- --- Table structure for table `lams_data_flow` --- -DROP TABLE IF EXISTS `lams_data_flow`; - -CREATE TABLE `lams_data_flow` ( - `data_flow_object_id` bigint(20) NOT NULL AUTO_INCREMENT, - `transition_id` bigint(20) NOT NULL, - `order_id` int(11) DEFAULT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `display_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `tool_assigment_id` int(11) DEFAULT NULL, - PRIMARY KEY (`data_flow_object_id`), - KEY `FK_lams_learning_transition_1` (`transition_id`), - CONSTRAINT `FK_lams_learning_transition_1` FOREIGN KEY (`transition_id`) REFERENCES `lams_learning_transition` (`transition_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_data_flow ( + data_flow_object_id bigint NOT NULL AUTO_INCREMENT, + transition_id bigint NOT NULL, + order_id int DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + display_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + tool_assigment_id int DEFAULT NULL, + PRIMARY KEY (data_flow_object_id), + KEY FK_lams_learning_transition_1 (transition_id), + CONSTRAINT FK_lams_learning_transition_1 FOREIGN KEY (transition_id) REFERENCES lams_learning_transition (transition_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_email_notification_archive; --- --- Table structure for table `lams_email_notification_archive` --- -DROP TABLE IF EXISTS `lams_email_notification_archive`; - -CREATE TABLE `lams_email_notification_archive` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) DEFAULT NULL, - `lesson_id` bigint(20) DEFAULT NULL, - `search_type` tinyint(4) NOT NULL, - `sent_on` datetime NOT NULL, - `body` mediumtext COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`uid`), - KEY `FK_lams_email_notification_archive_1` (`organisation_id`), - KEY `FK_lams_email_notification_archive_2` (`lesson_id`), - CONSTRAINT `FK_lams_email_notification_archive_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_email_notification_archive_2` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_email_notification_archive ( + uid bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint DEFAULT NULL, + lesson_id bigint DEFAULT NULL, + search_type tinyint NOT NULL, + sent_on datetime NOT NULL, + body mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (uid), + KEY FK_lams_email_notification_archive_1 (organisation_id), + KEY FK_lams_email_notification_archive_2 (lesson_id), + CONSTRAINT FK_lams_email_notification_archive_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_email_notification_archive_2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_email_notification_recipient_archive; --- --- Table structure for table `lams_email_notification_recipient_archive` --- -DROP TABLE IF EXISTS `lams_email_notification_recipient_archive`; - -CREATE TABLE `lams_email_notification_recipient_archive` ( - `email_notification_uid` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - KEY `FK_lams_email_notification_recipient_archive_1` (`email_notification_uid`), - KEY `FK_lams_email_notification_recipient_archive_2` (`user_id`), - CONSTRAINT `FK_lams_email_notification_recipient_archive_1` FOREIGN KEY (`email_notification_uid`) REFERENCES `lams_email_notification_archive` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_email_notification_recipient_archive_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_email_notification_recipient_archive ( + email_notification_uid bigint NOT NULL, + user_id bigint NOT NULL, + KEY FK_lams_email_notification_recipient_archive_1 (email_notification_uid), + KEY FK_lams_email_notification_recipient_archive_2 (user_id), + CONSTRAINT FK_lams_email_notification_recipient_archive_1 FOREIGN KEY (email_notification_uid) REFERENCES lams_email_notification_archive (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_email_notification_recipient_archive_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_course_class_map; --- --- Table structure for table `lams_ext_course_class_map` --- -DROP TABLE IF EXISTS `lams_ext_course_class_map`; - -CREATE TABLE `lams_ext_course_class_map` ( - `sid` int(11) NOT NULL AUTO_INCREMENT, - `courseid` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `classid` bigint(20) NOT NULL, - `ext_server_org_map_id` int(11) NOT NULL, - PRIMARY KEY (`sid`), - KEY `classid` (`classid`), - KEY `ext_server_org_map_id` (`ext_server_org_map_id`), - CONSTRAINT `lams_ext_course_class_map_fk` FOREIGN KEY (`classid`) REFERENCES `lams_organisation` (`organisation_id`), - CONSTRAINT `lams_ext_course_class_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_ext_course_class_map ( + sid int NOT NULL AUTO_INCREMENT, + courseid varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + classid bigint NOT NULL, + ext_server_org_map_id int NOT NULL, + PRIMARY KEY (sid), + KEY classid (classid), + KEY ext_server_org_map_id (ext_server_org_map_id), + CONSTRAINT lams_ext_course_class_map_fk FOREIGN KEY (classid) REFERENCES lams_organisation (organisation_id), + CONSTRAINT lams_ext_course_class_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_server_lesson_map; --- --- Table structure for table `lams_ext_server_lesson_map` --- -DROP TABLE IF EXISTS `lams_ext_server_lesson_map`; - -CREATE TABLE `lams_ext_server_lesson_map` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `lesson_id` bigint(20) NOT NULL, - `ext_server_org_map_id` int(11) NOT NULL, - `resource_link_id` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`uid`), - UNIQUE KEY `lesson_id` (`lesson_id`), - KEY `lams_ext_server_lesson_map_fk1` (`ext_server_org_map_id`), - CONSTRAINT `lams_ext_server_lesson_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `lams_ext_server_lesson_map_fk2` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_ext_server_lesson_map ( + uid bigint NOT NULL AUTO_INCREMENT, + lesson_id bigint NOT NULL, + ext_server_org_map_id int NOT NULL, + resource_link_id varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (uid), + UNIQUE KEY lesson_id (lesson_id), + KEY lams_ext_server_lesson_map_fk1 (ext_server_org_map_id), + CONSTRAINT lams_ext_server_lesson_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT lams_ext_server_lesson_map_fk2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_server_org_map; --- --- Table structure for table `lams_ext_server_org_map` --- DROP TABLE IF EXISTS `lams_ext_server_org_map`; @@ -475,162 +382,128 @@ `force_restart` tinyint(1) DEFAULT '0', `allow_restart` tinyint(1) DEFAULT '0', `gradebook_on_complete` tinyint(1) DEFAULT '1', - `use_alternative_user_id_parameter_name` tinyint(1) DEFAULT '0', - `membership_url` text COLLATE utf8mb4_unicode_ci, + membership_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + user_id_parameter_name varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`sid`), UNIQUE KEY `serverid` (`serverid`), UNIQUE KEY `prefix` (`prefix`), KEY `FK_lams_ext_server_type` (`server_type_id`), CONSTRAINT `FK_lams_ext_server_type` FOREIGN KEY (`server_type_id`) REFERENCES `lams_ext_server_type` (`server_type_id`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_server_tool_map; --- --- Table structure for table `lams_ext_server_tool_map` --- -DROP TABLE IF EXISTS `lams_ext_server_tool_map`; - -CREATE TABLE `lams_ext_server_tool_map` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `tool_id` bigint(20) NOT NULL, - `ext_server_org_map_id` int(11) NOT NULL, - PRIMARY KEY (`uid`), - UNIQUE KEY `unique_adapter_map` (`ext_server_org_map_id`,`tool_id`), - KEY `lams_ext_server_tool_map_fk2` (`tool_id`), - CONSTRAINT `lams_ext_server_tool_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `lams_ext_server_tool_map_fk2` FOREIGN KEY (`tool_id`) REFERENCES `lams_tool` (`tool_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_ext_server_tool_map ( + uid bigint NOT NULL AUTO_INCREMENT, + tool_id bigint NOT NULL, + ext_server_org_map_id int NOT NULL, + PRIMARY KEY (uid), + UNIQUE KEY unique_adapter_map (ext_server_org_map_id,tool_id), + KEY lams_ext_server_tool_map_fk2 (tool_id), + CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_server_type; --- --- Table structure for table `lams_ext_server_type` --- -DROP TABLE IF EXISTS `lams_ext_server_type`; - -CREATE TABLE `lams_ext_server_type` ( - `server_type_id` int(11) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`server_type_id`) +CREATE TABLE lams_ext_server_type ( + server_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (server_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_ext_user_userid_map; --- --- Table structure for table `lams_ext_user_userid_map` --- -DROP TABLE IF EXISTS `lams_ext_user_userid_map`; - -CREATE TABLE `lams_ext_user_userid_map` ( - `sid` int(11) NOT NULL AUTO_INCREMENT, - `external_username` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL, - `user_id` bigint(20) NOT NULL, - `ext_server_org_map_id` int(11) NOT NULL, - `tc_gradebook_id` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`sid`), - KEY `user_id` (`user_id`), - KEY `ext_server_org_map_id` (`ext_server_org_map_id`), - CONSTRAINT `lams_ext_user_userid_map_fk` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `lams_ext_user_userid_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_ext_user_userid_map ( + sid int NOT NULL AUTO_INCREMENT, + external_username varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + user_id bigint NOT NULL, + ext_server_org_map_id int NOT NULL, + tc_gradebook_id text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (sid), + KEY user_id (user_id), + KEY ext_server_org_map_id (ext_server_org_map_id), + CONSTRAINT lams_ext_user_userid_map_fk FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT lams_ext_user_userid_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_favorite_organisation; --- --- Table structure for table `lams_favorite_organisation` --- -DROP TABLE IF EXISTS `lams_favorite_organisation`; - -CREATE TABLE `lams_favorite_organisation` ( - `favorite_organisation_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - PRIMARY KEY (`favorite_organisation_id`), - KEY `organisation_id` (`organisation_id`), - KEY `user_id` (`user_id`), - CONSTRAINT `FK_lams_favorite_organisation_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`), - CONSTRAINT `FK_lams_favorite_organisation_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) +CREATE TABLE lams_favorite_organisation ( + favorite_organisation_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + user_id bigint NOT NULL, + PRIMARY KEY (favorite_organisation_id), + KEY organisation_id (organisation_id), + KEY user_id (user_id), + CONSTRAINT FK_lams_favorite_organisation_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id), + CONSTRAINT FK_lams_favorite_organisation_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gate_activity_level; --- --- Table structure for table `lams_gate_activity_level` --- -DROP TABLE IF EXISTS `lams_gate_activity_level`; - -CREATE TABLE `lams_gate_activity_level` ( - `gate_activity_level_id` int(11) NOT NULL, - `description` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`gate_activity_level_id`) +CREATE TABLE lams_gate_activity_level ( + gate_activity_level_id int NOT NULL, + `description` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (gate_activity_level_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gate_allowed_learners; --- --- Table structure for table `lams_gate_allowed_learners` --- -DROP TABLE IF EXISTS `lams_gate_allowed_learners`; - -CREATE TABLE `lams_gate_allowed_learners` ( - `user_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - KEY `user_id` (`user_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_TABLE_32_1` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_TABLE_32_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) +CREATE TABLE lams_gate_allowed_learners ( + user_id bigint NOT NULL, + activity_id bigint NOT NULL, + KEY user_id (user_id), + KEY activity_id (activity_id), + CONSTRAINT FK_TABLE_32_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id), + CONSTRAINT FK_TABLE_32_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gradebook_user_activity; --- --- Table structure for table `lams_gradebook_user_activity` --- -DROP TABLE IF EXISTS `lams_gradebook_user_activity`; - -CREATE TABLE `lams_gradebook_user_activity` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `activity_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `mark` double DEFAULT NULL, - `feedback` mediumtext COLLATE utf8mb4_unicode_ci, - `marked_in_gradebook` tinyint(1) NOT NULL DEFAULT '0', - `update_date` datetime DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `activity_id` (`activity_id`,`user_id`), - KEY `FK_lams_gradebook_user_activity_2` (`user_id`), - CONSTRAINT `FK_lams_gradebook_user_activity_1` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_gradebook_user_activity_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_gradebook_user_activity ( + uid bigint NOT NULL AUTO_INCREMENT, + activity_id bigint NOT NULL, + user_id bigint NOT NULL, + mark double DEFAULT NULL, + feedback mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + marked_in_gradebook tinyint(1) NOT NULL DEFAULT '0', + update_date datetime DEFAULT NULL, + PRIMARY KEY (uid), + KEY activity_id (activity_id,user_id), + KEY FK_lams_gradebook_user_activity_2 (user_id), + CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gradebook_user_activity_archive; --- --- Table structure for table `lams_gradebook_user_activity_archive` --- -DROP TABLE IF EXISTS `lams_gradebook_user_activity_archive`; - -CREATE TABLE `lams_gradebook_user_activity_archive` ( - `uid` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `mark` double DEFAULT NULL, - `feedback` mediumtext COLLATE utf8mb4_unicode_ci, - `marked_in_gradebook` tinyint(1) NOT NULL DEFAULT '0', - `update_date` datetime DEFAULT NULL, - `archive_date` datetime DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `activity_id` (`activity_id`,`user_id`), - KEY `FK_lams_gradebook_user_activity_archive_2` (`user_id`), - CONSTRAINT `FK_lams_gradebook_user_activity_archive_1` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_gradebook_user_activity_archive_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_gradebook_user_activity_archive ( + uid bigint NOT NULL, + activity_id bigint NOT NULL, + user_id bigint NOT NULL, + mark double DEFAULT NULL, + feedback mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + marked_in_gradebook tinyint(1) NOT NULL DEFAULT '0', + update_date datetime DEFAULT NULL, + archive_date datetime DEFAULT NULL, + PRIMARY KEY (uid), + KEY activity_id (activity_id,user_id), + KEY FK_lams_gradebook_user_activity_archive_2 (user_id), + CONSTRAINT FK_lams_gradebook_user_activity_archive_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_gradebook_user_activity_archive_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gradebook_user_lesson; --- --- Table structure for table `lams_gradebook_user_lesson` --- DROP TABLE IF EXISTS `lams_gradebook_user_lesson`; @@ -647,347 +520,284 @@ CONSTRAINT `FK_lams_gradebook_user_lesson_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_gradebook_user_lesson_archive; --- --- Table structure for table `lams_gradebook_user_lesson_archive` --- -DROP TABLE IF EXISTS `lams_gradebook_user_lesson_archive`; - -CREATE TABLE `lams_gradebook_user_lesson_archive` ( - `uid` bigint(20) NOT NULL, - `lesson_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `mark` double DEFAULT NULL, - `feedback` mediumtext COLLATE utf8mb4_unicode_ci, - `archive_date` datetime DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `lesson_id` (`lesson_id`,`user_id`), - KEY `FK_lams_gradebook_user_lesson_archive_2` (`user_id`), - CONSTRAINT `FK_lams_gradebook_user_lesson_archive_1` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_gradebook_user_lesson_archive_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_gradebook_user_lesson_archive ( + uid bigint NOT NULL, + lesson_id bigint NOT NULL, + user_id bigint NOT NULL, + mark double DEFAULT NULL, + feedback mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + archive_date datetime DEFAULT NULL, + PRIMARY KEY (uid), + KEY lesson_id (lesson_id,user_id), + KEY FK_lams_gradebook_user_lesson_archive_2 (user_id), + CONSTRAINT FK_lams_gradebook_user_lesson_archive_1 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_gradebook_user_lesson_archive_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_group; --- --- Table structure for table `lams_group` --- -DROP TABLE IF EXISTS `lams_group`; - -CREATE TABLE `lams_group` ( - `group_id` bigint(20) NOT NULL AUTO_INCREMENT, - `group_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `grouping_id` bigint(20) NOT NULL, - `order_id` int(6) NOT NULL DEFAULT '1', - `group_ui_id` int(11) DEFAULT NULL, - PRIMARY KEY (`group_id`), - UNIQUE KEY `UQ_lams_group_1` (`grouping_id`,`order_id`), - KEY `grouping_id` (`grouping_id`), - CONSTRAINT `FK_lams_learning_group_1` FOREIGN KEY (`grouping_id`) REFERENCES `lams_grouping` (`grouping_id`) +CREATE TABLE lams_group ( + group_id bigint NOT NULL AUTO_INCREMENT, + group_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + grouping_id bigint NOT NULL, + order_id int NOT NULL DEFAULT '1', + group_ui_id int DEFAULT NULL, + PRIMARY KEY (group_id), + UNIQUE KEY UQ_lams_group_1 (grouping_id,order_id), + KEY grouping_id (grouping_id), + CONSTRAINT FK_lams_learning_group_1 FOREIGN KEY (grouping_id) REFERENCES lams_grouping (grouping_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_grouping; --- --- Table structure for table `lams_grouping` --- -DROP TABLE IF EXISTS `lams_grouping`; - -CREATE TABLE `lams_grouping` ( - `grouping_id` bigint(20) NOT NULL AUTO_INCREMENT, - `grouping_ui_id` int(11) DEFAULT NULL, - `grouping_type_id` int(11) NOT NULL, - `number_of_groups` int(11) DEFAULT NULL, - `learners_per_group` int(11) DEFAULT NULL, - `staff_group_id` bigint(20) DEFAULT '0', - `max_number_of_groups` int(3) DEFAULT NULL, - `equal_number_of_learners_per_group` tinyint(1) DEFAULT '0', - `view_students_before_selection` tinyint(1) DEFAULT '0', - PRIMARY KEY (`grouping_id`), - KEY `grouping_type_id` (`grouping_type_id`), - CONSTRAINT `FK_lams_learning_grouping_1` FOREIGN KEY (`grouping_type_id`) REFERENCES `lams_grouping_type` (`grouping_type_id`) +CREATE TABLE lams_grouping ( + grouping_id bigint NOT NULL AUTO_INCREMENT, + grouping_ui_id int DEFAULT NULL, + grouping_type_id int NOT NULL, + number_of_groups int DEFAULT NULL, + learners_per_group int DEFAULT NULL, + staff_group_id bigint DEFAULT '0', + max_number_of_groups int DEFAULT NULL, + equal_number_of_learners_per_group tinyint(1) DEFAULT '0', + view_students_before_selection tinyint(1) DEFAULT '0', + PRIMARY KEY (grouping_id), + KEY grouping_type_id (grouping_type_id), + CONSTRAINT FK_lams_learning_grouping_1 FOREIGN KEY (grouping_type_id) REFERENCES lams_grouping_type (grouping_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_grouping_support_type; --- --- Table structure for table `lams_grouping_support_type` --- -DROP TABLE IF EXISTS `lams_grouping_support_type`; - -CREATE TABLE `lams_grouping_support_type` ( - `grouping_support_type_id` int(3) NOT NULL, - `description` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`grouping_support_type_id`) +CREATE TABLE lams_grouping_support_type ( + grouping_support_type_id int NOT NULL, + `description` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (grouping_support_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_grouping_type; --- --- Table structure for table `lams_grouping_type` --- -DROP TABLE IF EXISTS `lams_grouping_type`; - -CREATE TABLE `lams_grouping_type` ( - `grouping_type_id` int(11) NOT NULL, - `description` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`grouping_type_id`) +CREATE TABLE lams_grouping_type ( + grouping_type_id int NOT NULL, + `description` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (grouping_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_input_activity; --- --- Table structure for table `lams_input_activity` --- -DROP TABLE IF EXISTS `lams_input_activity`; - -CREATE TABLE `lams_input_activity` ( - `activity_id` bigint(20) NOT NULL, - `input_activity_id` bigint(20) NOT NULL, - UNIQUE KEY `UQ_lams_input_activity_1` (`activity_id`,`input_activity_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_lams_input_activity_1` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_lams_input_activity_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) +CREATE TABLE lams_input_activity ( + activity_id bigint NOT NULL, + input_activity_id bigint NOT NULL, + UNIQUE KEY UQ_lams_input_activity_1 (activity_id,input_activity_id), + KEY activity_id (activity_id), + CONSTRAINT FK_lams_input_activity_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_lams_input_activity_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive; --- --- Table structure for table `lams_kumalive` --- -DROP TABLE IF EXISTS `lams_kumalive`; - -CREATE TABLE `lams_kumalive` ( - `kumalive_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `created_by` bigint(20) DEFAULT NULL, - `finished` tinyint(1) NOT NULL DEFAULT '0', - `name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`kumalive_id`), - KEY `FK_lams_kumalive_1` (`organisation_id`), - KEY `FK_lams_kumalive_2` (`created_by`), - CONSTRAINT `FK_lams_kumalive_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_kumalive_2` FOREIGN KEY (`created_by`) REFERENCES `lams_user` (`user_id`) ON DELETE SET NULL ON UPDATE CASCADE +CREATE TABLE lams_kumalive ( + kumalive_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + created_by bigint DEFAULT NULL, + finished tinyint(1) NOT NULL DEFAULT '0', + `name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (kumalive_id), + KEY FK_lams_kumalive_1 (organisation_id), + KEY FK_lams_kumalive_2 (created_by), + CONSTRAINT FK_lams_kumalive_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_kumalive_2 FOREIGN KEY (created_by) REFERENCES lams_user (user_id) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_log; --- --- Table structure for table `lams_kumalive_log` --- -DROP TABLE IF EXISTS `lams_kumalive_log`; - -CREATE TABLE `lams_kumalive_log` ( - `log_id` bigint(20) NOT NULL AUTO_INCREMENT, - `kumalive_id` bigint(20) NOT NULL, - `user_id` bigint(20) DEFAULT NULL, - `log_date` datetime NOT NULL, - `log_type` tinyint(4) DEFAULT NULL, - PRIMARY KEY (`log_id`), - KEY `FK_lams_kumalive_log_1` (`kumalive_id`), - KEY `FK_lams_kumalive_log_2` (`user_id`), - CONSTRAINT `FK_lams_kumalive_log_1` FOREIGN KEY (`kumalive_id`) REFERENCES `lams_kumalive` (`kumalive_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_kumalive_log_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE SET NULL ON UPDATE CASCADE +CREATE TABLE lams_kumalive_log ( + log_id bigint NOT NULL AUTO_INCREMENT, + kumalive_id bigint NOT NULL, + user_id bigint DEFAULT NULL, + log_date datetime NOT NULL, + log_type tinyint DEFAULT NULL, + PRIMARY KEY (log_id), + KEY FK_lams_kumalive_log_1 (kumalive_id), + KEY FK_lams_kumalive_log_2 (user_id), + CONSTRAINT FK_lams_kumalive_log_1 FOREIGN KEY (kumalive_id) REFERENCES lams_kumalive (kumalive_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_kumalive_log_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_poll; --- --- Table structure for table `lams_kumalive_poll` --- -DROP TABLE IF EXISTS `lams_kumalive_poll`; - -CREATE TABLE `lams_kumalive_poll` ( - `poll_id` bigint(20) NOT NULL AUTO_INCREMENT, - `kumalive_id` bigint(20) NOT NULL, - `name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `votes_released` tinyint(1) DEFAULT '0', - `voters_released` tinyint(1) DEFAULT '0', - `start_date` datetime NOT NULL, - `finish_date` datetime DEFAULT NULL, - PRIMARY KEY (`poll_id`), - KEY `FK_lams_kumalive_poll_1` (`kumalive_id`), - CONSTRAINT `FK_lams_kumalive_poll_1` FOREIGN KEY (`kumalive_id`) REFERENCES `lams_kumalive` (`kumalive_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_kumalive_poll ( + poll_id bigint NOT NULL AUTO_INCREMENT, + kumalive_id bigint NOT NULL, + `name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + votes_released tinyint(1) DEFAULT '0', + voters_released tinyint(1) DEFAULT '0', + start_date datetime NOT NULL, + finish_date datetime DEFAULT NULL, + PRIMARY KEY (poll_id), + KEY FK_lams_kumalive_poll_1 (kumalive_id), + CONSTRAINT FK_lams_kumalive_poll_1 FOREIGN KEY (kumalive_id) REFERENCES lams_kumalive (kumalive_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_poll_answer; --- --- Table structure for table `lams_kumalive_poll_answer` --- -DROP TABLE IF EXISTS `lams_kumalive_poll_answer`; - -CREATE TABLE `lams_kumalive_poll_answer` ( - `answer_id` bigint(20) NOT NULL AUTO_INCREMENT, - `poll_id` bigint(20) NOT NULL, - `order_id` tinyint(4) NOT NULL, - `name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`answer_id`), - KEY `FK_lams_kumalive_poll_answer_1` (`poll_id`), - CONSTRAINT `FK_lams_kumalive_poll_answer_1` FOREIGN KEY (`poll_id`) REFERENCES `lams_kumalive_poll` (`poll_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_kumalive_poll_answer ( + answer_id bigint NOT NULL AUTO_INCREMENT, + poll_id bigint NOT NULL, + order_id tinyint NOT NULL, + `name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (answer_id), + KEY FK_lams_kumalive_poll_answer_1 (poll_id), + CONSTRAINT FK_lams_kumalive_poll_answer_1 FOREIGN KEY (poll_id) REFERENCES lams_kumalive_poll (poll_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_poll_vote; --- --- Table structure for table `lams_kumalive_poll_vote` --- -DROP TABLE IF EXISTS `lams_kumalive_poll_vote`; - -CREATE TABLE `lams_kumalive_poll_vote` ( - `answer_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `vote_date` datetime DEFAULT NULL, - PRIMARY KEY (`answer_id`,`user_id`), - KEY `FK_lams_kumalive_poll_vote_2` (`user_id`), - CONSTRAINT `FK_lams_kumalive_poll_vote_1` FOREIGN KEY (`answer_id`) REFERENCES `lams_kumalive_poll_answer` (`answer_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_kumalive_poll_vote_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_kumalive_poll_vote ( + answer_id bigint NOT NULL, + user_id bigint NOT NULL, + vote_date datetime DEFAULT NULL, + PRIMARY KEY (answer_id,user_id), + KEY FK_lams_kumalive_poll_vote_2 (user_id), + CONSTRAINT FK_lams_kumalive_poll_vote_1 FOREIGN KEY (answer_id) REFERENCES lams_kumalive_poll_answer (answer_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_kumalive_poll_vote_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_rubric; --- --- Table structure for table `lams_kumalive_rubric` --- -DROP TABLE IF EXISTS `lams_kumalive_rubric`; - -CREATE TABLE `lams_kumalive_rubric` ( - `rubric_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `kumalive_id` bigint(20) DEFAULT NULL, - `order_id` tinyint(4) NOT NULL, - `name` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`rubric_id`), - KEY `FK_lams_kumalive_rubric_1` (`organisation_id`), - KEY `FK_lams_kumalive_rubric_2` (`kumalive_id`), - CONSTRAINT `FK_lams_kumalive_rubric_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_kumalive_rubric_2` FOREIGN KEY (`kumalive_id`) REFERENCES `lams_kumalive` (`kumalive_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_kumalive_rubric ( + rubric_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + kumalive_id bigint DEFAULT NULL, + order_id tinyint NOT NULL, + `name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (rubric_id), + KEY FK_lams_kumalive_rubric_1 (organisation_id), + KEY FK_lams_kumalive_rubric_2 (kumalive_id), + CONSTRAINT FK_lams_kumalive_rubric_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_kumalive_rubric_2 FOREIGN KEY (kumalive_id) REFERENCES lams_kumalive (kumalive_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_kumalive_score; --- --- Table structure for table `lams_kumalive_score` --- -DROP TABLE IF EXISTS `lams_kumalive_score`; - -CREATE TABLE `lams_kumalive_score` ( - `score_id` bigint(20) NOT NULL AUTO_INCREMENT, - `rubric_id` bigint(20) NOT NULL, - `user_id` bigint(20) DEFAULT NULL, - `batch` bigint(10) DEFAULT NULL, - `score` tinyint(4) DEFAULT NULL, - PRIMARY KEY (`score_id`), - KEY `FK_lams_kumalive_score_1` (`rubric_id`), - KEY `FK_lams_kumalive_score_2` (`user_id`), - CONSTRAINT `FK_lams_kumalive_score_1` FOREIGN KEY (`rubric_id`) REFERENCES `lams_kumalive_rubric` (`rubric_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_kumalive_score_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_kumalive_score ( + score_id bigint NOT NULL AUTO_INCREMENT, + rubric_id bigint NOT NULL, + user_id bigint DEFAULT NULL, + batch bigint DEFAULT NULL, + score tinyint DEFAULT NULL, + PRIMARY KEY (score_id), + KEY FK_lams_kumalive_score_1 (rubric_id), + KEY FK_lams_kumalive_score_2 (user_id), + CONSTRAINT FK_lams_kumalive_score_1 FOREIGN KEY (rubric_id) REFERENCES lams_kumalive_rubric (rubric_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_kumalive_score_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learner_progress; --- --- Table structure for table `lams_learner_progress` --- -DROP TABLE IF EXISTS `lams_learner_progress`; - -CREATE TABLE `lams_learner_progress` ( - `learner_progress_id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) NOT NULL, - `lesson_id` bigint(20) NOT NULL, - `lesson_completed_flag` tinyint(1) NOT NULL DEFAULT '0', - `waiting_flag` tinyint(4) NOT NULL, - `start_date_time` datetime NOT NULL, - `finish_date_time` datetime DEFAULT NULL, - `current_activity_id` bigint(20) DEFAULT NULL, - `next_activity_id` bigint(20) DEFAULT NULL, - `previous_activity_id` bigint(20) DEFAULT NULL, - `requires_restart_flag` tinyint(1) NOT NULL, - PRIMARY KEY (`learner_progress_id`), - UNIQUE KEY `IX_lams_learner_progress_1` (`user_id`,`lesson_id`), - KEY `user_id` (`user_id`), - KEY `lesson_id` (`lesson_id`), - KEY `current_activity_id` (`current_activity_id`), - KEY `next_activity_id` (`next_activity_id`), - KEY `previous_activity_id` (`previous_activity_id`), - CONSTRAINT `FK_lams_learner_progress_1` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_lams_learner_progress_2` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`), - CONSTRAINT `FK_lams_learner_progress_3` FOREIGN KEY (`current_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_lams_learner_progress_4` FOREIGN KEY (`next_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_lams_learner_progress_5` FOREIGN KEY (`previous_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) +CREATE TABLE lams_learner_progress ( + learner_progress_id bigint NOT NULL AUTO_INCREMENT, + user_id bigint NOT NULL, + lesson_id bigint NOT NULL, + lesson_completed_flag tinyint(1) NOT NULL DEFAULT '0', + waiting_flag tinyint NOT NULL, + start_date_time datetime NOT NULL, + finish_date_time datetime DEFAULT NULL, + current_activity_id bigint DEFAULT NULL, + next_activity_id bigint DEFAULT NULL, + previous_activity_id bigint DEFAULT NULL, + requires_restart_flag tinyint(1) NOT NULL, + PRIMARY KEY (learner_progress_id), + UNIQUE KEY IX_lams_learner_progress_1 (user_id,lesson_id), + KEY user_id (user_id), + KEY lesson_id (lesson_id), + KEY current_activity_id (current_activity_id), + KEY next_activity_id (next_activity_id), + KEY previous_activity_id (previous_activity_id), + CONSTRAINT FK_lams_learner_progress_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id), + CONSTRAINT FK_lams_learner_progress_2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id), + CONSTRAINT FK_lams_learner_progress_3 FOREIGN KEY (current_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_lams_learner_progress_4 FOREIGN KEY (next_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_lams_learner_progress_5 FOREIGN KEY (previous_activity_id) REFERENCES lams_learning_activity (activity_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learner_progress_archive; --- --- Table structure for table `lams_learner_progress_archive` --- -DROP TABLE IF EXISTS `lams_learner_progress_archive`; - -CREATE TABLE `lams_learner_progress_archive` ( - `learner_progress_id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) NOT NULL, - `lesson_id` bigint(20) NOT NULL, - `attempt_id` tinyint(4) NOT NULL DEFAULT '1', - `lesson_completed_flag` tinyint(1) NOT NULL DEFAULT '0', - `start_date_time` datetime NOT NULL, - `finish_date_time` datetime DEFAULT NULL, - `current_activity_id` bigint(20) DEFAULT NULL, - `archive_date` datetime DEFAULT NULL, - PRIMARY KEY (`learner_progress_id`), - UNIQUE KEY `IX_lams_learner_progress_archive_1` (`user_id`,`lesson_id`,`attempt_id`), - KEY `FK_lams_learner_progress_archive_2` (`lesson_id`), - KEY `FK_lams_learner_progress_archive_3` (`current_activity_id`), - CONSTRAINT `FK_lams_learner_progress_archive_1` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_learner_progress_archive_2` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_learner_progress_archive_3` FOREIGN KEY (`current_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE SET NULL ON UPDATE CASCADE +CREATE TABLE lams_learner_progress_archive ( + learner_progress_id bigint NOT NULL AUTO_INCREMENT, + user_id bigint NOT NULL, + lesson_id bigint NOT NULL, + attempt_id tinyint NOT NULL DEFAULT '1', + lesson_completed_flag tinyint(1) NOT NULL DEFAULT '0', + start_date_time datetime NOT NULL, + finish_date_time datetime DEFAULT NULL, + current_activity_id bigint DEFAULT NULL, + archive_date datetime DEFAULT NULL, + PRIMARY KEY (learner_progress_id), + UNIQUE KEY IX_lams_learner_progress_archive_1 (user_id,lesson_id,attempt_id), + KEY FK_lams_learner_progress_archive_2 (lesson_id), + KEY FK_lams_learner_progress_archive_3 (current_activity_id), + CONSTRAINT FK_lams_learner_progress_archive_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learner_progress_archive_2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learner_progress_archive_3 FOREIGN KEY (current_activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_activity; --- --- Table structure for table `lams_learning_activity` --- -DROP TABLE IF EXISTS `lams_learning_activity`; - -CREATE TABLE `lams_learning_activity` ( - `activity_id` bigint(20) NOT NULL AUTO_INCREMENT, - `activity_ui_id` int(11) DEFAULT NULL, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `xcoord` int(11) DEFAULT NULL, - `ycoord` int(11) DEFAULT NULL, - `parent_activity_id` bigint(20) DEFAULT NULL, - `parent_ui_id` int(11) DEFAULT NULL, - `learning_activity_type_id` int(11) NOT NULL DEFAULT '0', - `grouping_support_type_id` int(3) NOT NULL, - `apply_grouping_flag` tinyint(1) NOT NULL, - `grouping_id` bigint(20) DEFAULT NULL, - `grouping_ui_id` int(11) DEFAULT NULL, - `order_id` int(11) DEFAULT NULL, - `learning_design_id` bigint(20) DEFAULT NULL, - `learning_library_id` bigint(20) DEFAULT NULL, - `create_date_time` datetime NOT NULL, - `max_number_of_options` int(5) DEFAULT NULL, - `min_number_of_options` int(5) DEFAULT NULL, - `options_instructions` mediumtext COLLATE utf8mb4_unicode_ci, - `tool_id` bigint(20) DEFAULT NULL, - `tool_content_id` bigint(20) DEFAULT NULL, - `activity_category_id` int(3), - `gate_activity_level_id` int(11) DEFAULT NULL, - `gate_open_flag` tinyint(1) DEFAULT NULL, - `gate_open_user` bigint(20) DEFAULT NULL, - `gate_open_time` datetime DEFAULT NULL, - `gate_start_time_offset` bigint(38) DEFAULT NULL, - `gate_end_time_offset` bigint(38) DEFAULT NULL, - `gate_activity_completion_based` tinyint(1) DEFAULT NULL, - `library_activity_ui_image` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `create_grouping_id` bigint(20) DEFAULT NULL, - `create_grouping_ui_id` int(11) DEFAULT NULL, - `library_activity_id` bigint(20) DEFAULT NULL, - `language_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `system_tool_id` bigint(20) DEFAULT NULL, +CREATE TABLE lams_learning_activity ( + activity_id bigint NOT NULL AUTO_INCREMENT, + activity_ui_id int DEFAULT NULL, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + xcoord int DEFAULT NULL, + ycoord int DEFAULT NULL, + parent_activity_id bigint DEFAULT NULL, + parent_ui_id int DEFAULT NULL, + learning_activity_type_id int NOT NULL DEFAULT '0', + grouping_support_type_id int NOT NULL, + apply_grouping_flag tinyint(1) NOT NULL, + grouping_id bigint DEFAULT NULL, + grouping_ui_id int DEFAULT NULL, + order_id int DEFAULT NULL, + learning_design_id bigint DEFAULT NULL, + learning_library_id bigint DEFAULT NULL, + create_date_time datetime NOT NULL, + max_number_of_options int DEFAULT NULL, + min_number_of_options int DEFAULT NULL, + options_instructions mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + tool_id bigint DEFAULT NULL, + tool_content_id bigint DEFAULT NULL, + activity_category_id int, + gate_activity_level_id int DEFAULT NULL, + gate_open_flag tinyint(1) DEFAULT NULL, + gate_open_user bigint DEFAULT NULL, + gate_open_time datetime DEFAULT NULL, + gate_start_time_offset bigint DEFAULT NULL, + gate_end_time_offset bigint DEFAULT NULL, + gate_activity_completion_based tinyint(1) DEFAULT NULL, + gate_password varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + library_activity_ui_image varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + create_grouping_id bigint DEFAULT NULL, + create_grouping_ui_id int DEFAULT NULL, + library_activity_id bigint DEFAULT NULL, + language_file varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + system_tool_id bigint DEFAULT NULL, `read_only` tinyint(1) DEFAULT '0', `initialised` tinyint(1) DEFAULT '0', `default_activity_id` bigint(20) DEFAULT NULL, @@ -1033,204 +843,165 @@ CONSTRAINT `FK_learning_activity_6` FOREIGN KEY (`grouping_id`) REFERENCES `lams_grouping` (`grouping_id`) ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_activity_type; --- --- Table structure for table `lams_learning_activity_type` --- - -DROP TABLE IF EXISTS `lams_learning_activity_type`; - -CREATE TABLE `lams_learning_activity_type` ( - `learning_activity_type_id` int(11) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`learning_activity_type_id`) +CREATE TABLE lams_learning_activity_type ( + learning_activity_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (learning_activity_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_command; --- --- Table structure for table `lams_learning_command` --- -DROP TABLE IF EXISTS `lams_learning_command`; - -CREATE TABLE `lams_learning_command` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `lesson_id` bigint(20) DEFAULT NULL, - `user_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `create_date` datetime NOT NULL, - `command_TEXT` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`uid`), - KEY `idx_lesson_id` (`lesson_id`), - KEY `idx_user_name` (`user_name`), - KEY `idx_create_date` (`create_date`) +CREATE TABLE lams_learning_command ( + uid bigint NOT NULL AUTO_INCREMENT, + lesson_id bigint DEFAULT NULL, + user_name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + create_date datetime NOT NULL, + command_TEXT text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (uid), + KEY idx_lesson_id (lesson_id), + KEY idx_user_name (user_name), + KEY idx_create_date (create_date) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_design; --- --- Table structure for table `lams_learning_design` --- -DROP TABLE IF EXISTS `lams_learning_design`; - -CREATE TABLE `lams_learning_design` ( - `learning_design_id` bigint(20) NOT NULL AUTO_INCREMENT, - `learning_design_ui_id` int(11) DEFAULT NULL, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `first_activity_id` bigint(20) DEFAULT NULL, - `floating_activity_id` bigint(20) DEFAULT NULL, - `max_id` int(11) DEFAULT NULL, - `valid_design_flag` tinyint(1) NOT NULL, - `read_only_flag` tinyint(1) NOT NULL, - `date_read_only` datetime DEFAULT NULL, - `user_id` bigint(20) NOT NULL, - `original_user_id` bigint(20) NOT NULL, - `help_text` mediumtext COLLATE utf8mb4_unicode_ci, - `copy_type_id` tinyint(4) NOT NULL, - `create_date_time` datetime NOT NULL, - `version` varchar(56) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `original_learning_design_id` bigint(20) DEFAULT NULL, - `workspace_folder_id` bigint(20) DEFAULT NULL, - `duration` bigint(38) DEFAULT NULL, - `license_id` bigint(20) DEFAULT NULL, - `license_TEXT` mediumtext COLLATE utf8mb4_unicode_ci, - `last_modified_date_time` datetime DEFAULT NULL, - `content_folder_id` char(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `edit_override_lock` tinyint(1) DEFAULT '0', - `edit_override_user_id` bigint(20) DEFAULT NULL, - `design_version` int(11) DEFAULT '1', - `removed` tinyint(1) NOT NULL DEFAULT '0', - `design_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`learning_design_id`), - KEY `user_id` (`user_id`), - KEY `workspace_folder_id` (`workspace_folder_id`), - KEY `license_id` (`license_id`), - KEY `copy_type_id` (`copy_type_id`), - KEY `edit_override_user_id` (`edit_override_user_id`), - KEY `idx_design_parent_id` (`original_learning_design_id`), - KEY `idx_design_first_act` (`first_activity_id`), - KEY `idx_design_floating_act` (`floating_activity_id`), - CONSTRAINT `FK_lams_learning_design_3` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_lams_learning_design_4` FOREIGN KEY (`workspace_folder_id`) REFERENCES `lams_workspace_folder` (`workspace_folder_id`), - CONSTRAINT `FK_lams_learning_design_5` FOREIGN KEY (`license_id`) REFERENCES `lams_license` (`license_id`), - CONSTRAINT `FK_lams_learning_design_6` FOREIGN KEY (`copy_type_id`) REFERENCES `lams_copy_type` (`copy_type_id`), - CONSTRAINT `FK_lams_learning_design_7` FOREIGN KEY (`edit_override_user_id`) REFERENCES `lams_user` (`user_id`) +CREATE TABLE lams_learning_design ( + learning_design_id bigint NOT NULL AUTO_INCREMENT, + learning_design_ui_id int DEFAULT NULL, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + first_activity_id bigint DEFAULT NULL, + floating_activity_id bigint DEFAULT NULL, + max_id int DEFAULT NULL, + valid_design_flag tinyint(1) NOT NULL, + read_only_flag tinyint(1) NOT NULL, + date_read_only datetime DEFAULT NULL, + user_id bigint NOT NULL, + original_user_id bigint NOT NULL, + help_text mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + copy_type_id tinyint NOT NULL, + create_date_time datetime NOT NULL, + version varchar(56) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + original_learning_design_id bigint DEFAULT NULL, + workspace_folder_id bigint DEFAULT NULL, + duration bigint DEFAULT NULL, + license_id bigint DEFAULT NULL, + license_TEXT mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + last_modified_date_time datetime DEFAULT NULL, + content_folder_id char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + edit_override_lock tinyint(1) DEFAULT '0', + edit_override_user_id bigint DEFAULT NULL, + design_version int DEFAULT '1', + removed tinyint(1) NOT NULL DEFAULT '0', + design_type varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (learning_design_id), + KEY user_id (user_id), + KEY workspace_folder_id (workspace_folder_id), + KEY license_id (license_id), + KEY copy_type_id (copy_type_id), + KEY edit_override_user_id (edit_override_user_id), + KEY idx_design_parent_id (original_learning_design_id), + KEY idx_design_first_act (first_activity_id), + KEY idx_design_floating_act (floating_activity_id), + CONSTRAINT FK_lams_learning_design_3 FOREIGN KEY (user_id) REFERENCES lams_user (user_id), + CONSTRAINT FK_lams_learning_design_4 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id), + CONSTRAINT FK_lams_learning_design_5 FOREIGN KEY (license_id) REFERENCES lams_license (license_id), + CONSTRAINT FK_lams_learning_design_6 FOREIGN KEY (copy_type_id) REFERENCES lams_copy_type (copy_type_id), + CONSTRAINT FK_lams_learning_design_7 FOREIGN KEY (edit_override_user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_design_access; --- --- Table structure for table `lams_learning_design_access` --- -DROP TABLE IF EXISTS `lams_learning_design_access`; - -CREATE TABLE `lams_learning_design_access` ( - `learning_design_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `access_date` datetime DEFAULT NULL, - PRIMARY KEY (`learning_design_id`,`user_id`), - KEY `FK_lams_learning_design_access_2` (`user_id`), - CONSTRAINT `FK_lams_learning_design_access_1` FOREIGN KEY (`learning_design_id`) REFERENCES `lams_learning_design` (`learning_design_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_learning_design_access_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_learning_design_access ( + learning_design_id bigint NOT NULL, + user_id bigint NOT NULL, + access_date datetime DEFAULT NULL, + PRIMARY KEY (learning_design_id,user_id), + KEY FK_lams_learning_design_access_2 (user_id), + CONSTRAINT FK_lams_learning_design_access_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_learning_design_access_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_design_annotation; --- --- Table structure for table `lams_learning_design_annotation` --- -DROP TABLE IF EXISTS `lams_learning_design_annotation`; - -CREATE TABLE `lams_learning_design_annotation` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `learning_design_id` bigint(20) NOT NULL, - `ui_id` int(11) DEFAULT NULL, - `title` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `xcoord` int(11) DEFAULT NULL, - `ycoord` int(11) DEFAULT NULL, - `end_xcoord` int(11) DEFAULT NULL, - `end_ycoord` int(11) DEFAULT NULL, - `color` char(7) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `size` tinyint(4) DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `FK_lams_learning_design_annotation_1` (`learning_design_id`), - CONSTRAINT `FK_lams_learning_design_annotation_1` FOREIGN KEY (`learning_design_id`) REFERENCES `lams_learning_design` (`learning_design_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_learning_design_annotation ( + uid bigint NOT NULL AUTO_INCREMENT, + learning_design_id bigint NOT NULL, + ui_id int DEFAULT NULL, + title varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + xcoord int DEFAULT NULL, + ycoord int DEFAULT NULL, + end_xcoord int DEFAULT NULL, + end_ycoord int DEFAULT NULL, + color char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + size tinyint DEFAULT NULL, + PRIMARY KEY (uid), + KEY FK_lams_learning_design_annotation_1 (learning_design_id), + CONSTRAINT FK_lams_learning_design_annotation_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_library; --- --- Table structure for table `lams_learning_library` --- -DROP TABLE IF EXISTS `lams_learning_library`; +CREATE TABLE lams_learning_library ( + learning_library_id bigint NOT NULL AUTO_INCREMENT, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + valid_flag tinyint(1) NOT NULL DEFAULT '1', + create_date_time datetime NOT NULL, + PRIMARY KEY (learning_library_id) +) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `lams_learning_library` ( - `learning_library_id` bigint(20) NOT NULL AUTO_INCREMENT, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `valid_flag` tinyint(1) NOT NULL DEFAULT '1', - `create_date_time` datetime NOT NULL, - PRIMARY KEY (`learning_library_id`) -) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_library_group; --- --- Table structure for table `lams_learning_library_group` --- - -DROP TABLE IF EXISTS `lams_learning_library_group`; - -CREATE TABLE `lams_learning_library_group` ( - `group_id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`group_id`) +CREATE TABLE lams_learning_library_group ( + group_id int NOT NULL AUTO_INCREMENT, + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (group_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_library_to_group; --- --- Table structure for table `lams_learning_library_to_group` --- -DROP TABLE IF EXISTS `lams_learning_library_to_group`; - -CREATE TABLE `lams_learning_library_to_group` ( - `group_id` int(11) NOT NULL, - `learning_library_id` bigint(20) NOT NULL, - PRIMARY KEY (`group_id`,`learning_library_id`) +CREATE TABLE lams_learning_library_to_group ( + group_id int NOT NULL, + learning_library_id bigint NOT NULL, + PRIMARY KEY (group_id,learning_library_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_learning_transition; --- --- Table structure for table `lams_learning_transition` --- -DROP TABLE IF EXISTS `lams_learning_transition`; - -CREATE TABLE `lams_learning_transition` ( - `transition_id` bigint(20) NOT NULL AUTO_INCREMENT, - `transition_ui_id` int(11) DEFAULT NULL, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `to_activity_id` bigint(20) NOT NULL, - `from_activity_id` bigint(20) NOT NULL, - `learning_design_id` bigint(20) DEFAULT NULL, - `create_date_time` datetime NOT NULL, - `to_ui_id` int(11) DEFAULT NULL, - `from_ui_id` int(11) DEFAULT NULL, - `transition_type` tinyint(4) NOT NULL DEFAULT '0', - PRIMARY KEY (`transition_id`), - KEY `from_activity_id` (`from_activity_id`), - KEY `to_activity_id` (`to_activity_id`), - KEY `learning_design_id` (`learning_design_id`), - CONSTRAINT `FK_learning_transition_2` FOREIGN KEY (`to_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `FK_learning_transition_3` FOREIGN KEY (`from_activity_id`) REFERENCES `lams_learning_activity` (`activity_id`), - CONSTRAINT `lddefn_transition_ibfk_1` FOREIGN KEY (`learning_design_id`) REFERENCES `lams_learning_design` (`learning_design_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_learning_transition ( + transition_id bigint NOT NULL AUTO_INCREMENT, + transition_ui_id int DEFAULT NULL, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + to_activity_id bigint NOT NULL, + from_activity_id bigint NOT NULL, + learning_design_id bigint DEFAULT NULL, + create_date_time datetime NOT NULL, + to_ui_id int DEFAULT NULL, + from_ui_id int DEFAULT NULL, + transition_type tinyint NOT NULL DEFAULT '0', + PRIMARY KEY (transition_id), + KEY from_activity_id (from_activity_id), + KEY to_activity_id (to_activity_id), + KEY learning_design_id (learning_design_id), + CONSTRAINT FK_learning_transition_2 FOREIGN KEY (to_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT FK_learning_transition_3 FOREIGN KEY (from_activity_id) REFERENCES lams_learning_activity (activity_id), + CONSTRAINT lddefn_transition_ibfk_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_lesson; --- --- Table structure for table `lams_lesson` --- DROP TABLE IF EXISTS `lams_lesson`; @@ -1274,57 +1045,43 @@ CONSTRAINT `FK_lams_lesson_5` FOREIGN KEY (`class_grouping_id`) REFERENCES `lams_grouping` (`grouping_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_lesson_dependency; --- --- Table structure for table `lams_lesson_dependency` --- -DROP TABLE IF EXISTS `lams_lesson_dependency`; - -CREATE TABLE `lams_lesson_dependency` ( - `lesson_id` bigint(20) NOT NULL, - `preceding_lesson_id` bigint(20) NOT NULL, - PRIMARY KEY (`lesson_id`,`preceding_lesson_id`), - KEY `FK_lams_lesson_dependency_2` (`preceding_lesson_id`), - CONSTRAINT `FK_lams_lesson_dependency_1` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_lesson_dependency_2` FOREIGN KEY (`preceding_lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_lesson_dependency ( + lesson_id bigint NOT NULL, + preceding_lesson_id bigint NOT NULL, + PRIMARY KEY (lesson_id,preceding_lesson_id), + KEY FK_lams_lesson_dependency_2 (preceding_lesson_id), + CONSTRAINT FK_lams_lesson_dependency_1 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_lesson_dependency_2 FOREIGN KEY (preceding_lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_lesson_state; --- --- Table structure for table `lams_lesson_state` --- -DROP TABLE IF EXISTS `lams_lesson_state`; - -CREATE TABLE `lams_lesson_state` ( - `lesson_state_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`lesson_state_id`) +CREATE TABLE lams_lesson_state ( + lesson_state_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (lesson_state_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_license; --- --- Table structure for table `lams_license` --- -DROP TABLE IF EXISTS `lams_license`; - -CREATE TABLE `lams_license` ( - `license_id` bigint(20) NOT NULL, - `name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL, - `code` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL, - `url` varchar(256) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `default_flag` tinyint(1) NOT NULL DEFAULT '0', - `picture_url` varchar(256) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `order_id` tinyint(4) DEFAULT '0', - PRIMARY KEY (`license_id`) +CREATE TABLE lams_license ( + license_id bigint NOT NULL, + `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + url varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + default_flag tinyint(1) NOT NULL DEFAULT '0', + picture_url varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + order_id tinyint DEFAULT '0', + PRIMARY KEY (license_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_log_event; --- --- Table structure for table `lams_log_event` --- DROP TABLE IF EXISTS `lams_log_event`; @@ -1344,183 +1101,145 @@ CONSTRAINT `FK_event_log_event_type` FOREIGN KEY (`log_event_type_id`) REFERENCES `lams_log_event_type` (`log_event_type_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_log_event_type; --- --- Table structure for table `lams_log_event_type` --- -DROP TABLE IF EXISTS `lams_log_event_type`; - -CREATE TABLE `lams_log_event_type` ( - `log_event_type_id` int(5) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `area` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`log_event_type_id`) +CREATE TABLE lams_log_event_type ( + log_event_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + area varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (log_event_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_notebook_entry; --- --- Table structure for table `lams_notebook_entry` --- -DROP TABLE IF EXISTS `lams_notebook_entry`; - -CREATE TABLE `lams_notebook_entry` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `external_id` bigint(20) DEFAULT NULL, - `external_id_type` int(11) DEFAULT NULL, - `external_signature` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `user_id` int(11) DEFAULT NULL, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `entry` mediumtext COLLATE utf8mb4_unicode_ci, - `create_date` datetime DEFAULT NULL, - `last_modified` datetime DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `ext_sig_user` (`external_id`,`external_id_type`,`external_signature`,`user_id`), - KEY `idx_create_date` (`create_date`) +CREATE TABLE lams_notebook_entry ( + uid bigint NOT NULL AUTO_INCREMENT, + external_id bigint DEFAULT NULL, + external_id_type int DEFAULT NULL, + external_signature varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + user_id int DEFAULT NULL, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + entry mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_date datetime DEFAULT NULL, + last_modified datetime DEFAULT NULL, + PRIMARY KEY (uid), + KEY ext_sig_user (external_id,external_id_type,external_signature,user_id), + KEY idx_create_date (create_date) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_notification_event; --- --- Table structure for table `lams_notification_event` --- -DROP TABLE IF EXISTS `lams_notification_event`; - -CREATE TABLE `lams_notification_event` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `scope` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, - `name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, - `event_session_id` bigint(20) DEFAULT NULL, - `subject` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `message` mediumtext COLLATE utf8mb4_unicode_ci, - `fail_time` datetime DEFAULT NULL, - `html_format` tinyint(1) DEFAULT '0', - PRIMARY KEY (`uid`), - KEY `scope` (`scope`,`name`,`event_session_id`) +CREATE TABLE lams_notification_event ( + uid bigint NOT NULL AUTO_INCREMENT, + scope varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + event_session_id bigint DEFAULT NULL, + `subject` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + message mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + fail_time datetime DEFAULT NULL, + html_format tinyint(1) DEFAULT '0', + PRIMARY KEY (uid), + KEY scope (scope,`name`,event_session_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_notification_subscription; --- --- Table structure for table `lams_notification_subscription` --- -DROP TABLE IF EXISTS `lams_notification_subscription`; - -CREATE TABLE `lams_notification_subscription` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) DEFAULT NULL, - `event_uid` bigint(20) DEFAULT NULL, - `delivery_method_id` tinyint(3) unsigned DEFAULT NULL, - `last_operation_message` mediumtext COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`uid`), - KEY `EventSubscriptionsToUsers` (`user_id`), - KEY `event_uid` (`event_uid`), - CONSTRAINT `EventSubscriptionsToEvent` FOREIGN KEY (`event_uid`) REFERENCES `lams_notification_event` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `EventSubscriptionsToUsers` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_notification_subscription ( + uid bigint NOT NULL AUTO_INCREMENT, + user_id bigint DEFAULT NULL, + event_uid bigint DEFAULT NULL, + delivery_method_id tinyint unsigned DEFAULT NULL, + last_operation_message mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (uid), + KEY EventSubscriptionsToUsers (user_id), + KEY event_uid (event_uid), + CONSTRAINT EventSubscriptionsToEvent FOREIGN KEY (event_uid) REFERENCES lams_notification_event (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT EventSubscriptionsToUsers FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_organisation; --- --- Table structure for table `lams_organisation` --- -DROP TABLE IF EXISTS `lams_organisation`; - -CREATE TABLE `lams_organisation` ( - `organisation_id` bigint(20) NOT NULL AUTO_INCREMENT, - `name` varchar(250) COLLATE utf8mb4_unicode_ci NOT NULL, - `code` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `description` mediumtext COLLATE utf8mb4_unicode_ci, - `parent_organisation_id` bigint(20) DEFAULT NULL, - `organisation_type_id` int(3) NOT NULL DEFAULT '0', - `create_date` datetime NOT NULL, - `created_by` bigint(20) NOT NULL, - `organisation_state_id` int(3) NOT NULL, - `admin_add_new_users` tinyint(1) NOT NULL DEFAULT '0', - `admin_browse_all_users` tinyint(1) NOT NULL DEFAULT '0', - `admin_change_status` tinyint(1) NOT NULL DEFAULT '0', - `admin_create_guest` tinyint(1) NOT NULL DEFAULT '0', - `enable_course_notifications` tinyint(1) NOT NULL DEFAULT '0', - `enable_learner_gradebook` tinyint(1) NOT NULL DEFAULT '0', - `enable_single_activity_lessons` tinyint(1) NOT NULL DEFAULT '1', - `enable_live_edit` tinyint(1) NOT NULL DEFAULT '1', - `enable_kumalive` tinyint(1) NOT NULL DEFAULT '0', - `archived_date` datetime DEFAULT NULL, - `ordered_lesson_ids` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`organisation_id`), - KEY `organisation_type_id` (`organisation_type_id`), - KEY `parent_organisation_id` (`parent_organisation_id`), - KEY `organisation_state_id` (`organisation_state_id`), - CONSTRAINT `FK_lams_organisation_1` FOREIGN KEY (`organisation_type_id`) REFERENCES `lams_organisation_type` (`organisation_type_id`), - CONSTRAINT `FK_lams_organisation_3` FOREIGN KEY (`parent_organisation_id`) REFERENCES `lams_organisation` (`organisation_id`), - CONSTRAINT `FK_lams_organisation_4` FOREIGN KEY (`organisation_state_id`) REFERENCES `lams_organisation_state` (`organisation_state_id`) +CREATE TABLE lams_organisation ( + organisation_id bigint NOT NULL AUTO_INCREMENT, + `name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `description` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + parent_organisation_id bigint DEFAULT NULL, + organisation_type_id int NOT NULL DEFAULT '0', + create_date datetime NOT NULL, + created_by bigint NOT NULL, + organisation_state_id int NOT NULL, + admin_add_new_users tinyint(1) NOT NULL DEFAULT '0', + admin_browse_all_users tinyint(1) NOT NULL DEFAULT '0', + admin_change_status tinyint(1) NOT NULL DEFAULT '0', + admin_create_guest tinyint(1) NOT NULL DEFAULT '0', + enable_course_notifications tinyint(1) NOT NULL DEFAULT '0', + enable_learner_gradebook tinyint(1) NOT NULL DEFAULT '0', + enable_single_activity_lessons tinyint(1) NOT NULL DEFAULT '1', + enable_live_edit tinyint(1) NOT NULL DEFAULT '1', + enable_kumalive tinyint(1) NOT NULL DEFAULT '0', + archived_date datetime DEFAULT NULL, + ordered_lesson_ids text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (organisation_id), + KEY organisation_type_id (organisation_type_id), + KEY parent_organisation_id (parent_organisation_id), + KEY organisation_state_id (organisation_state_id), + CONSTRAINT FK_lams_organisation_1 FOREIGN KEY (organisation_type_id) REFERENCES lams_organisation_type (organisation_type_id), + CONSTRAINT FK_lams_organisation_3 FOREIGN KEY (parent_organisation_id) REFERENCES lams_organisation (organisation_id), + CONSTRAINT FK_lams_organisation_4 FOREIGN KEY (organisation_state_id) REFERENCES lams_organisation_state (organisation_state_id) ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_organisation_group; --- --- Table structure for table `lams_organisation_group` --- -DROP TABLE IF EXISTS `lams_organisation_group`; - -CREATE TABLE `lams_organisation_group` ( - `group_id` bigint(20) NOT NULL AUTO_INCREMENT, - `grouping_id` bigint(20) NOT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`group_id`), - KEY `FK_lams_organisation_group_1` (`grouping_id`), - CONSTRAINT `FK_lams_organisation_group_1` FOREIGN KEY (`grouping_id`) REFERENCES `lams_organisation_grouping` (`grouping_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_organisation_group ( + group_id bigint NOT NULL AUTO_INCREMENT, + grouping_id bigint NOT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (group_id), + KEY FK_lams_organisation_group_1 (grouping_id), + CONSTRAINT FK_lams_organisation_group_1 FOREIGN KEY (grouping_id) REFERENCES lams_organisation_grouping (grouping_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_organisation_grouping; --- --- Table structure for table `lams_organisation_grouping` --- -DROP TABLE IF EXISTS `lams_organisation_grouping`; - -CREATE TABLE `lams_organisation_grouping` ( - `grouping_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`grouping_id`), - KEY `FK_lams_organisation_grouping_1` (`organisation_id`), - CONSTRAINT `FK_lams_organisation_grouping_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_organisation_grouping ( + grouping_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (grouping_id), + KEY FK_lams_organisation_grouping_1 (organisation_id), + CONSTRAINT FK_lams_organisation_grouping_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_organisation_state; --- --- Table structure for table `lams_organisation_state` --- -DROP TABLE IF EXISTS `lams_organisation_state`; - -CREATE TABLE `lams_organisation_state` ( - `organisation_state_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`organisation_state_id`) +CREATE TABLE lams_organisation_state ( + organisation_state_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (organisation_state_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_organisation_type; --- --- Table structure for table `lams_organisation_type` --- -DROP TABLE IF EXISTS `lams_organisation_type`; - -CREATE TABLE `lams_organisation_type` ( - `organisation_type_id` int(3) NOT NULL, - `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`organisation_type_id`), - UNIQUE KEY `UQ_lams_organisation_type_name` (`name`) +CREATE TABLE lams_organisation_type ( + organisation_type_id int NOT NULL, + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (organisation_type_id), + UNIQUE KEY UQ_lams_organisation_type_name (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_outcome; --- --- Table structure for table `lams_outcome` --- DROP TABLE IF EXISTS `lams_outcome`; @@ -1539,10 +1258,8 @@ CONSTRAINT `FK_lams_outcome_2` FOREIGN KEY (`scale_id`) REFERENCES `lams_outcome_scale` (`scale_id`) ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_outcome_mapping; --- --- Table structure for table `lams_outcome_mapping` --- DROP TABLE IF EXISTS `lams_outcome_mapping`; @@ -1562,33 +1279,27 @@ CONSTRAINT `FK_lams_outcome_mapping_3` FOREIGN KEY (`tool_content_id`) REFERENCES `lams_tool_content` (`tool_content_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_outcome_result; --- --- Table structure for table `lams_outcome_result` --- -DROP TABLE IF EXISTS `lams_outcome_result`; - -CREATE TABLE `lams_outcome_result` ( - `result_id` bigint(20) NOT NULL AUTO_INCREMENT, - `mapping_id` bigint(20) NOT NULL, - `user_id` bigint(20) DEFAULT NULL, - `value` tinyint(4) DEFAULT NULL, - `create_by` bigint(20) DEFAULT NULL, - `create_date_time` datetime NOT NULL, - PRIMARY KEY (`result_id`), - KEY `FK_lams_outcome_result_1` (`mapping_id`), - KEY `FK_lams_outcome_result_2` (`user_id`), - KEY `FK_lams_outcome_result_3` (`create_by`), - CONSTRAINT `FK_lams_outcome_result_1` FOREIGN KEY (`mapping_id`) REFERENCES `lams_outcome_mapping` (`mapping_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_outcome_result_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_outcome_result_3` FOREIGN KEY (`create_by`) REFERENCES `lams_user` (`user_id`) ON DELETE SET NULL ON UPDATE CASCADE +CREATE TABLE lams_outcome_result ( + result_id bigint NOT NULL AUTO_INCREMENT, + mapping_id bigint NOT NULL, + user_id bigint DEFAULT NULL, + `value` tinyint DEFAULT NULL, + create_by bigint DEFAULT NULL, + create_date_time datetime NOT NULL, + PRIMARY KEY (result_id), + KEY FK_lams_outcome_result_1 (mapping_id), + KEY FK_lams_outcome_result_2 (user_id), + KEY FK_lams_outcome_result_3 (create_by), + CONSTRAINT FK_lams_outcome_result_1 FOREIGN KEY (mapping_id) REFERENCES lams_outcome_mapping (mapping_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_outcome_result_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_outcome_result_3 FOREIGN KEY (create_by) REFERENCES lams_user (user_id) ON DELETE SET NULL ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_outcome_scale; --- --- Table structure for table `lams_outcome_scale` --- DROP TABLE IF EXISTS `lams_outcome_scale`; @@ -1604,640 +1315,509 @@ KEY `code` (`code`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_outcome_scale_item; --- --- Table structure for table `lams_outcome_scale_item` --- -DROP TABLE IF EXISTS `lams_outcome_scale_item`; - -CREATE TABLE `lams_outcome_scale_item` ( - `item_id` int(11) NOT NULL AUTO_INCREMENT, - `scale_id` mediumint(9) DEFAULT NULL, - `value` tinyint(4) DEFAULT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`item_id`), - KEY `FK_lams_outcome_scale_item_1` (`scale_id`), - CONSTRAINT `FK_lams_outcome_scale_item_1` FOREIGN KEY (`scale_id`) REFERENCES `lams_outcome_scale` (`scale_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_outcome_scale_item ( + item_id int NOT NULL AUTO_INCREMENT, + scale_id mediumint DEFAULT NULL, + `value` tinyint DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (item_id), + KEY FK_lams_outcome_scale_item_1 (scale_id), + CONSTRAINT FK_lams_outcome_scale_item_1 FOREIGN KEY (scale_id) REFERENCES lams_outcome_scale (scale_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_password_request; --- --- Table structure for table `lams_password_request` --- -DROP TABLE IF EXISTS `lams_password_request`; - -CREATE TABLE `lams_password_request` ( - `request_id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) NOT NULL, - `request_key` char(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `request_date` datetime NOT NULL, - PRIMARY KEY (`request_id`), - UNIQUE KEY `IX_lams_psswd_rqst_key` (`request_key`) +CREATE TABLE lams_password_request ( + request_id bigint NOT NULL AUTO_INCREMENT, + user_id bigint NOT NULL, + request_key char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + request_date datetime NOT NULL, + PRIMARY KEY (request_id), + UNIQUE KEY IX_lams_psswd_rqst_key (request_key) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_planner_activity_metadata; --- --- Table structure for table `lams_planner_activity_metadata` --- -DROP TABLE IF EXISTS `lams_planner_activity_metadata`; - -CREATE TABLE `lams_planner_activity_metadata` ( - `activity_id` bigint(20) NOT NULL, - `collapsed` tinyint(1) DEFAULT '0', - `expanded` tinyint(1) DEFAULT '0', - `hidden` tinyint(1) DEFAULT '0', - `editing_advice` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - KEY `FK_lams_planner_metadata_primary` (`activity_id`), - CONSTRAINT `FK_lams_planner_metadata_primary` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_planner_activity_metadata ( + activity_id bigint NOT NULL, + collapsed tinyint(1) DEFAULT '0', + expanded tinyint(1) DEFAULT '0', + hidden tinyint(1) DEFAULT '0', + editing_advice varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + KEY FK_lams_planner_metadata_primary (activity_id), + CONSTRAINT FK_lams_planner_metadata_primary FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_planner_node_role; --- --- Table structure for table `lams_planner_node_role` --- -DROP TABLE IF EXISTS `lams_planner_node_role`; - -CREATE TABLE `lams_planner_node_role` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `node_uid` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - `role_id` int(6) NOT NULL, - PRIMARY KEY (`uid`), - KEY `FK_planner_node_role_user` (`user_id`), - KEY `FK_planner_node_role_node` (`node_uid`), - KEY `FK_planner_node_role_role` (`role_id`), - CONSTRAINT `FK_planner_node_role_node` FOREIGN KEY (`node_uid`) REFERENCES `lams_planner_nodes` (`uid`) ON DELETE CASCADE, - CONSTRAINT `FK_planner_node_role_role` FOREIGN KEY (`role_id`) REFERENCES `lams_role` (`role_id`) ON DELETE CASCADE, - CONSTRAINT `FK_planner_node_role_user` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE +CREATE TABLE lams_planner_node_role ( + uid bigint NOT NULL AUTO_INCREMENT, + node_uid bigint NOT NULL, + user_id bigint NOT NULL, + role_id int NOT NULL, + PRIMARY KEY (uid), + KEY FK_planner_node_role_user (user_id), + KEY FK_planner_node_role_node (node_uid), + KEY FK_planner_node_role_role (role_id), + CONSTRAINT FK_planner_node_role_node FOREIGN KEY (node_uid) REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE, + CONSTRAINT FK_planner_node_role_role FOREIGN KEY (role_id) REFERENCES lams_role (role_id) ON DELETE CASCADE, + CONSTRAINT FK_planner_node_role_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_planner_nodes; --- --- Table structure for table `lams_planner_nodes` --- -DROP TABLE IF EXISTS `lams_planner_nodes`; - -CREATE TABLE `lams_planner_nodes` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `parent_uid` bigint(20) DEFAULT NULL, - `order_id` tinyint(3) unsigned NOT NULL, +CREATE TABLE lams_planner_nodes ( + uid bigint NOT NULL AUTO_INCREMENT, + parent_uid bigint DEFAULT NULL, + order_id tinyint unsigned NOT NULL, `locked` tinyint(1) NOT NULL DEFAULT '0', - `content_folder_id` char(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `brief_desc` mediumtext COLLATE utf8mb4_unicode_ci, - `full_desc` mediumtext COLLATE utf8mb4_unicode_ci, - `ld_id` bigint(20) DEFAULT NULL, - `user_id` bigint(20) DEFAULT NULL, - `permissions` int(11) DEFAULT NULL, - PRIMARY KEY (`uid`), - UNIQUE KEY `parent_uid` (`parent_uid`,`order_id`), - KEY `FK_lams_planner_node_user` (`user_id`), - CONSTRAINT `FK_lams_planner_node_parent` FOREIGN KEY (`parent_uid`) REFERENCES `lams_planner_nodes` (`uid`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_planner_node_user` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE SET NULL ON UPDATE SET NULL + content_folder_id char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + brief_desc mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + full_desc mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + ld_id bigint DEFAULT NULL, + user_id bigint DEFAULT NULL, + permissions int DEFAULT NULL, + PRIMARY KEY (uid), + UNIQUE KEY parent_uid (parent_uid,order_id), + KEY FK_lams_planner_node_user (user_id), + CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid) REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_planner_node_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE SET NULL ON UPDATE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_planner_recent_learning_designs; --- --- Table structure for table `lams_planner_recent_learning_designs` --- -DROP TABLE IF EXISTS `lams_planner_recent_learning_designs`; - -CREATE TABLE `lams_planner_recent_learning_designs` ( - `user_id` bigint(20) NOT NULL, - `learning_design_id` bigint(20) NOT NULL, - `last_modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`user_id`,`learning_design_id`), - KEY `FK_lams_planner_recent_learning_designs_2` (`learning_design_id`), - CONSTRAINT `FK_lams_planner_recent_learning_designs_1` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_planner_recent_learning_designs_2` FOREIGN KEY (`learning_design_id`) REFERENCES `lams_learning_design` (`learning_design_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_planner_recent_learning_designs ( + user_id bigint NOT NULL, + learning_design_id bigint NOT NULL, + last_modified_date timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (user_id,learning_design_id), + KEY FK_lams_planner_recent_learning_designs_2 (learning_design_id), + CONSTRAINT FK_lams_planner_recent_learning_designs_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_policy; --- --- Table structure for table `lams_policy` --- -DROP TABLE IF EXISTS `lams_policy`; - -CREATE TABLE `lams_policy` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `policy_id` bigint(20) DEFAULT NULL, - `created_by` bigint(20) NOT NULL, - `policy_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `version` mediumtext COLLATE utf8mb4_unicode_ci, - `summary` text COLLATE utf8mb4_unicode_ci, - `full_policy` text COLLATE utf8mb4_unicode_ci, - `last_modified` datetime NOT NULL, - `policy_state_id` int(3) NOT NULL, - `policy_type_id` int(3) NOT NULL, - PRIMARY KEY (`uid`), - KEY `created_by` (`created_by`), - KEY `policy_state_id` (`policy_state_id`), - KEY `policy_type_id` (`policy_type_id`), - CONSTRAINT `FK_lams_lesson_1` FOREIGN KEY (`created_by`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_lams_policy_2` FOREIGN KEY (`policy_state_id`) REFERENCES `lams_policy_state` (`policy_state_id`), - CONSTRAINT `FK_lams_policy_3` FOREIGN KEY (`policy_type_id`) REFERENCES `lams_policy_type` (`policy_type_id`) +CREATE TABLE lams_policy ( + uid bigint NOT NULL AUTO_INCREMENT, + policy_id bigint DEFAULT NULL, + created_by bigint NOT NULL, + policy_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + version mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + summary text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + full_policy text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + last_modified datetime NOT NULL, + policy_state_id int NOT NULL, + policy_type_id int NOT NULL, + PRIMARY KEY (uid), + KEY created_by (created_by), + KEY policy_state_id (policy_state_id), + KEY policy_type_id (policy_type_id), + CONSTRAINT FK_lams_lesson_1 FOREIGN KEY (created_by) REFERENCES lams_user (user_id), + CONSTRAINT FK_lams_policy_2 FOREIGN KEY (policy_state_id) REFERENCES lams_policy_state (policy_state_id), + CONSTRAINT FK_lams_policy_3 FOREIGN KEY (policy_type_id) REFERENCES lams_policy_type (policy_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_policy_consent; --- --- Table structure for table `lams_policy_consent` --- -DROP TABLE IF EXISTS `lams_policy_consent`; - -CREATE TABLE `lams_policy_consent` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `date_agreed_on` datetime NOT NULL, - `policy_uid` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - PRIMARY KEY (`uid`), - KEY `policy_uid` (`policy_uid`), - KEY `user_id` (`user_id`), - CONSTRAINT `FK_lams_consent_1_1` FOREIGN KEY (`policy_uid`) REFERENCES `lams_policy` (`uid`), - CONSTRAINT `FK_lams_consent_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) +CREATE TABLE lams_policy_consent ( + uid bigint NOT NULL AUTO_INCREMENT, + date_agreed_on datetime NOT NULL, + policy_uid bigint NOT NULL, + user_id bigint NOT NULL, + PRIMARY KEY (uid), + KEY policy_uid (policy_uid), + KEY user_id (user_id), + CONSTRAINT FK_lams_consent_1_1 FOREIGN KEY (policy_uid) REFERENCES lams_policy (uid), + CONSTRAINT FK_lams_consent_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_policy_state; --- --- Table structure for table `lams_policy_state` --- -DROP TABLE IF EXISTS `lams_policy_state`; - - -CREATE TABLE `lams_policy_state` ( - `policy_state_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`policy_state_id`) +CREATE TABLE lams_policy_state ( + policy_state_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (policy_state_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_policy_type; --- --- Table structure for table `lams_policy_type` --- -DROP TABLE IF EXISTS `lams_policy_type`; - -CREATE TABLE `lams_policy_type` ( - `policy_type_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`policy_type_id`) +CREATE TABLE lams_policy_type ( + policy_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (policy_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_presence_chat_msgs; --- --- Table structure for table `lams_presence_chat_msgs` --- -DROP TABLE IF EXISTS `lams_presence_chat_msgs`; - -CREATE TABLE `lams_presence_chat_msgs` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `lesson_id` bigint(20) DEFAULT NULL, - `from_user` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `to_user` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `date_sent` datetime DEFAULT NULL, - `message` varchar(1023) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `FK_lams_presence_chat_msgs_lesson` (`lesson_id`), - KEY `idx_lams_presence_chat_msgs_from` (`from_user`), - KEY `idx_lams_presence_chat_msgs_to` (`to_user`), - CONSTRAINT `FK_lams_presence_chat_msgs_lesson` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_presence_chat_msgs ( + uid bigint NOT NULL AUTO_INCREMENT, + lesson_id bigint DEFAULT NULL, + from_user varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + to_user varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + date_sent datetime DEFAULT NULL, + message varchar(1023) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (uid), + KEY FK_lams_presence_chat_msgs_lesson (lesson_id), + KEY idx_lams_presence_chat_msgs_from (from_user), + KEY idx_lams_presence_chat_msgs_to (to_user), + CONSTRAINT FK_lams_presence_chat_msgs_lesson FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_presence_user; --- --- Table structure for table `lams_presence_user` --- -DROP TABLE IF EXISTS `lams_presence_user`; - -CREATE TABLE `lams_presence_user` ( - `nickname` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, - `lesson_id` bigint(20) NOT NULL, - `last_presence` datetime DEFAULT NULL, - PRIMARY KEY (`nickname`,`lesson_id`), - KEY `FK_lams_presence_user_lesson` (`lesson_id`), - CONSTRAINT `FK_lams_presence_user_lesson` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_presence_user ( + nickname varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + lesson_id bigint NOT NULL, + last_presence datetime DEFAULT NULL, + PRIMARY KEY (nickname,lesson_id), + KEY FK_lams_presence_user_lesson (lesson_id), + CONSTRAINT FK_lams_presence_user_lesson FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_progress_attempted; --- --- Table structure for table `lams_progress_attempted` --- -DROP TABLE IF EXISTS `lams_progress_attempted`; - -CREATE TABLE `lams_progress_attempted` ( - `learner_progress_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `start_date_time` datetime DEFAULT NULL, - PRIMARY KEY (`learner_progress_id`,`activity_id`), - KEY `learner_progress_id` (`learner_progress_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_lams_progress_current_1` FOREIGN KEY (`learner_progress_id`) REFERENCES `lams_learner_progress` (`learner_progress_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_progress_current_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_progress_attempted ( + learner_progress_id bigint NOT NULL, + activity_id bigint NOT NULL, + start_date_time datetime DEFAULT NULL, + PRIMARY KEY (learner_progress_id,activity_id), + KEY learner_progress_id (learner_progress_id), + KEY activity_id (activity_id), + CONSTRAINT FK_lams_progress_current_1 FOREIGN KEY (learner_progress_id) REFERENCES lams_learner_progress (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_current_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_progress_attempted_archive; --- --- Table structure for table `lams_progress_attempted_archive` --- -DROP TABLE IF EXISTS `lams_progress_attempted_archive`; - -CREATE TABLE `lams_progress_attempted_archive` ( - `learner_progress_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `start_date_time` datetime DEFAULT NULL, - PRIMARY KEY (`learner_progress_id`,`activity_id`), - KEY `FK_lams_progress_current_archive_2` (`activity_id`), - CONSTRAINT `FK_lams_progress_current_archive_1` FOREIGN KEY (`learner_progress_id`) REFERENCES `lams_learner_progress_archive` (`learner_progress_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_progress_current_archive_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_progress_attempted_archive ( + learner_progress_id bigint NOT NULL, + activity_id bigint NOT NULL, + start_date_time datetime DEFAULT NULL, + PRIMARY KEY (learner_progress_id,activity_id), + KEY FK_lams_progress_current_archive_2 (activity_id), + CONSTRAINT FK_lams_progress_current_archive_1 FOREIGN KEY (learner_progress_id) REFERENCES lams_learner_progress_archive (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_current_archive_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_progress_completed; --- --- Table structure for table `lams_progress_completed` --- -DROP TABLE IF EXISTS `lams_progress_completed`; - -CREATE TABLE `lams_progress_completed` ( - `learner_progress_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `completed_date_time` datetime DEFAULT NULL, - `start_date_time` datetime DEFAULT NULL, - PRIMARY KEY (`learner_progress_id`,`activity_id`), - KEY `learner_progress_id` (`learner_progress_id`), - KEY `activity_id` (`activity_id`), - CONSTRAINT `FK_lams_progress_completed_1` FOREIGN KEY (`learner_progress_id`) REFERENCES `lams_learner_progress` (`learner_progress_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_progress_completed_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_progress_completed ( + learner_progress_id bigint NOT NULL, + activity_id bigint NOT NULL, + completed_date_time datetime DEFAULT NULL, + start_date_time datetime DEFAULT NULL, + PRIMARY KEY (learner_progress_id,activity_id), + KEY learner_progress_id (learner_progress_id), + KEY activity_id (activity_id), + CONSTRAINT FK_lams_progress_completed_1 FOREIGN KEY (learner_progress_id) REFERENCES lams_learner_progress (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_completed_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_progress_completed_archive; --- --- Table structure for table `lams_progress_completed_archive` --- -DROP TABLE IF EXISTS `lams_progress_completed_archive`; - -CREATE TABLE `lams_progress_completed_archive` ( - `learner_progress_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `completed_date_time` datetime DEFAULT NULL, - `start_date_time` datetime DEFAULT NULL, - PRIMARY KEY (`learner_progress_id`,`activity_id`), - KEY `FK_lams_progress_completed_archive_2` (`activity_id`), - CONSTRAINT `FK_lams_progress_completed_archive_1` FOREIGN KEY (`learner_progress_id`) REFERENCES `lams_learner_progress_archive` (`learner_progress_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_progress_completed_archive_2` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_progress_completed_archive ( + learner_progress_id bigint NOT NULL, + activity_id bigint NOT NULL, + completed_date_time datetime DEFAULT NULL, + start_date_time datetime DEFAULT NULL, + PRIMARY KEY (learner_progress_id,activity_id), + KEY FK_lams_progress_completed_archive_2 (activity_id), + CONSTRAINT FK_lams_progress_completed_archive_1 FOREIGN KEY (learner_progress_id) REFERENCES lams_learner_progress_archive (learner_progress_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_progress_completed_archive_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_rating; --- --- Table structure for table `lams_rating` --- -DROP TABLE IF EXISTS `lams_rating`; - -CREATE TABLE `lams_rating` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `rating_criteria_id` bigint(20) NOT NULL, - `item_id` bigint(20) DEFAULT NULL, - `user_id` bigint(20) NOT NULL, - `rating` float DEFAULT NULL, - `tool_session_id` bigint(20) DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `rating_criteria_id` (`rating_criteria_id`), - KEY `user_id` (`user_id`), - KEY `FK_lams_rating_3` (`tool_session_id`), - CONSTRAINT `FK_lams_rating_1` FOREIGN KEY (`rating_criteria_id`) REFERENCES `lams_rating_criteria` (`rating_criteria_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_rating_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_rating ( + uid bigint NOT NULL AUTO_INCREMENT, + rating_criteria_id bigint NOT NULL, + item_id bigint DEFAULT NULL, + user_id bigint NOT NULL, + rating float DEFAULT NULL, + tool_session_id bigint DEFAULT NULL, + PRIMARY KEY (uid), + KEY rating_criteria_id (rating_criteria_id), + KEY user_id (user_id), + KEY FK_lams_rating_3 (tool_session_id), + CONSTRAINT FK_lams_rating_1 FOREIGN KEY (rating_criteria_id) REFERENCES lams_rating_criteria (rating_criteria_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_rating_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_rating_comment; --- --- Table structure for table `lams_rating_comment` --- -DROP TABLE IF EXISTS `lams_rating_comment`; - -CREATE TABLE `lams_rating_comment` ( - `uid` bigint(20) NOT NULL AUTO_INCREMENT, - `rating_criteria_id` bigint(20) NOT NULL, - `item_id` bigint(20) DEFAULT NULL, - `user_id` bigint(20) NOT NULL, - `comment` mediumtext COLLATE utf8mb4_unicode_ci, - `posted_date` datetime DEFAULT NULL, - `tool_session_id` bigint(20) DEFAULT NULL, - PRIMARY KEY (`uid`), - KEY `rating_criteria_id` (`rating_criteria_id`), - KEY `user_id` (`user_id`), - KEY `FK_lams_rating_comment_3` (`tool_session_id`), - CONSTRAINT `FK_lams_rating_comment_1` FOREIGN KEY (`rating_criteria_id`) REFERENCES `lams_rating_criteria` (`rating_criteria_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_rating_comment_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_rating_comment ( + uid bigint NOT NULL AUTO_INCREMENT, + rating_criteria_id bigint NOT NULL, + item_id bigint DEFAULT NULL, + user_id bigint NOT NULL, + `comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + posted_date datetime DEFAULT NULL, + tool_session_id bigint DEFAULT NULL, + PRIMARY KEY (uid), + KEY rating_criteria_id (rating_criteria_id), + KEY user_id (user_id), + KEY FK_lams_rating_comment_3 (tool_session_id), + CONSTRAINT FK_lams_rating_comment_1 FOREIGN KEY (rating_criteria_id) REFERENCES lams_rating_criteria (rating_criteria_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_rating_comment_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_rating_criteria; --- --- Table structure for table `lams_rating_criteria` --- -DROP TABLE IF EXISTS `lams_rating_criteria`; - -CREATE TABLE `lams_rating_criteria` ( - `rating_criteria_id` bigint(20) NOT NULL AUTO_INCREMENT, - `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `rating_criteria_type_id` int(11) NOT NULL DEFAULT '0', - `comments_enabled` tinyint(1) NOT NULL DEFAULT '0', - `comments_min_words_limit` int(11) DEFAULT '0', - `order_id` int(11) NOT NULL, - `tool_content_id` bigint(20) DEFAULT NULL, - `item_id` bigint(20) DEFAULT NULL, - `lesson_id` bigint(20) DEFAULT NULL, - `rating_style` bigint(20) NOT NULL DEFAULT '1', - `max_rating` bigint(20) NOT NULL DEFAULT '5', - `minimum_rates` int(11) DEFAULT '0', - `maximum_rates` int(11) DEFAULT '0', - PRIMARY KEY (`rating_criteria_id`), - KEY `rating_criteria_type_id` (`rating_criteria_type_id`), - KEY `tool_content_id` (`tool_content_id`), - KEY `lesson_id` (`lesson_id`), - CONSTRAINT `FK_lams_rating_criteria_1` FOREIGN KEY (`rating_criteria_type_id`) REFERENCES `lams_rating_criteria_type` (`rating_criteria_type_id`), - CONSTRAINT `FK_lams_rating_criteria_2` FOREIGN KEY (`tool_content_id`) REFERENCES `lams_tool_content` (`tool_content_id`), - CONSTRAINT `FK_lams_rating_criteria_3` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`) +CREATE TABLE lams_rating_criteria ( + rating_criteria_id bigint NOT NULL AUTO_INCREMENT, + title varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + rating_criteria_type_id int NOT NULL DEFAULT '0', + comments_enabled tinyint(1) NOT NULL DEFAULT '0', + comments_min_words_limit int DEFAULT '0', + order_id int NOT NULL, + tool_content_id bigint DEFAULT NULL, + item_id bigint DEFAULT NULL, + lesson_id bigint DEFAULT NULL, + rating_style bigint NOT NULL DEFAULT '1', + max_rating bigint NOT NULL DEFAULT '5', + minimum_rates int DEFAULT '0', + maximum_rates int DEFAULT '0', + PRIMARY KEY (rating_criteria_id), + KEY rating_criteria_type_id (rating_criteria_type_id), + KEY tool_content_id (tool_content_id), + KEY lesson_id (lesson_id), + CONSTRAINT FK_lams_rating_criteria_1 FOREIGN KEY (rating_criteria_type_id) REFERENCES lams_rating_criteria_type (rating_criteria_type_id), + CONSTRAINT FK_lams_rating_criteria_2 FOREIGN KEY (tool_content_id) REFERENCES lams_tool_content (tool_content_id), + CONSTRAINT FK_lams_rating_criteria_3 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_rating_criteria_type; --- --- Table structure for table `lams_rating_criteria_type` --- -DROP TABLE IF EXISTS `lams_rating_criteria_type`; - -CREATE TABLE `lams_rating_criteria_type` ( - `rating_criteria_type_id` int(11) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`rating_criteria_type_id`) +CREATE TABLE lams_rating_criteria_type ( + rating_criteria_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (rating_criteria_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_role; --- --- Table structure for table `lams_role` --- -DROP TABLE IF EXISTS `lams_role`; - -CREATE TABLE `lams_role` ( - `role_id` int(6) NOT NULL, - `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` text COLLATE utf8mb4_unicode_ci, - `create_date` datetime NOT NULL, - PRIMARY KEY (`role_id`), - KEY `gname` (`name`) +CREATE TABLE lams_role ( + role_id int NOT NULL, + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_date datetime NOT NULL, + PRIMARY KEY (role_id), + KEY gname (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_signup_organisation; --- --- Table structure for table `lams_signup_organisation` --- -DROP TABLE IF EXISTS `lams_signup_organisation`; - -CREATE TABLE `lams_signup_organisation` ( - `signup_organisation_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `add_to_lessons` tinyint(1) DEFAULT '1', - `add_as_staff` tinyint(1) DEFAULT '0', - `add_with_author` tinyint(1) DEFAULT '0', - `add_with_monitor` tinyint(1) DEFAULT '0', - `email_verify` tinyint(1) DEFAULT '0', - `course_key` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `blurb` text COLLATE utf8mb4_unicode_ci, - `create_date` datetime DEFAULT NULL, - `disabled` tinyint(1) DEFAULT '0', - `conTEXT` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, - `login_tab_active` tinyint(1) DEFAULT '0', - PRIMARY KEY (`signup_organisation_id`), +CREATE TABLE lams_signup_organisation ( + signup_organisation_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + add_to_lessons tinyint(1) DEFAULT '1', + add_as_staff tinyint(1) DEFAULT '0', + add_with_author tinyint(1) DEFAULT '0', + add_with_monitor tinyint(1) DEFAULT '0', + email_verify tinyint(1) DEFAULT '0', + course_key varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + blurb text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_date datetime DEFAULT NULL, + disabled tinyint(1) DEFAULT '0', + `conTEXT` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + login_tab_active tinyint(1) DEFAULT '0', + PRIMARY KEY (signup_organisation_id), UNIQUE KEY `conTEXT` (`conTEXT`), - KEY `organisation_id` (`organisation_id`) + KEY organisation_id (organisation_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_supported_locale; --- --- Table structure for table `lams_supported_locale` --- -DROP TABLE IF EXISTS `lams_supported_locale`; - -CREATE TABLE `lams_supported_locale` ( - `locale_id` int(11) NOT NULL AUTO_INCREMENT, - `language_iso_code` varchar(2) COLLATE utf8mb4_unicode_ci NOT NULL, - `country_iso_code` varchar(2) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `direction` varchar(3) COLLATE utf8mb4_unicode_ci NOT NULL, - `fckeditor_code` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`locale_id`) +CREATE TABLE lams_supported_locale ( + locale_id int NOT NULL AUTO_INCREMENT, + language_iso_code varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + country_iso_code varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + direction varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + fckeditor_code varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (locale_id) ) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_system_tool; --- --- Table structure for table `lams_system_tool` --- -DROP TABLE IF EXISTS `lams_system_tool`; +CREATE TABLE lams_system_tool ( + system_tool_id bigint NOT NULL AUTO_INCREMENT, + learning_activity_type_id int NOT NULL, + tool_display_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + learner_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + learner_preview_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + learner_progress_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + monitor_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + contribute_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + help_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_date_time datetime NOT NULL, + admin_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + pedagogical_planner_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (system_tool_id), + UNIQUE KEY UQ_systool_activity_type (learning_activity_type_id), + CONSTRAINT FK_lams_system_tool FOREIGN KEY (learning_activity_type_id) REFERENCES lams_learning_activity_type (learning_activity_type_id) +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `lams_system_tool` ( - `system_tool_id` bigint(20) NOT NULL AUTO_INCREMENT, - `learning_activity_type_id` int(11) NOT NULL, - `tool_display_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` text COLLATE utf8mb4_unicode_ci, - `learner_url` text COLLATE utf8mb4_unicode_ci, - `learner_preview_url` text COLLATE utf8mb4_unicode_ci, - `learner_progress_url` text COLLATE utf8mb4_unicode_ci, - `monitor_url` text COLLATE utf8mb4_unicode_ci, - `contribute_url` text COLLATE utf8mb4_unicode_ci, - `help_url` text COLLATE utf8mb4_unicode_ci, - `create_date_time` datetime NOT NULL, - `admin_url` text COLLATE utf8mb4_unicode_ci, - `pedagogical_planner_url` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`system_tool_id`), - UNIQUE KEY `UQ_systool_activity_type` (`learning_activity_type_id`), - CONSTRAINT `FK_lams_system_tool` FOREIGN KEY (`learning_activity_type_id`) REFERENCES `lams_learning_activity_type` (`learning_activity_type_id`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_text_search_condition; --- --- Table structure for table `lams_text_search_condition` --- - -DROP TABLE IF EXISTS `lams_text_search_condition`; - -CREATE TABLE `lams_text_search_condition` ( - `condition_id` bigint(20) NOT NULL, - `text_search_all_words` text COLLATE utf8mb4_unicode_ci, - `text_search_phrase` text COLLATE utf8mb4_unicode_ci, - `text_search_any_words` text COLLATE utf8mb4_unicode_ci, - `text_search_excluded_words` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`condition_id`), - CONSTRAINT `TextSearchConditionInheritance` FOREIGN KEY (`condition_id`) REFERENCES `lams_branch_condition` (`condition_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_text_search_condition ( + condition_id bigint NOT NULL, + text_search_all_words text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + text_search_phrase text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + text_search_any_words text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + text_search_excluded_words text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (condition_id), + CONSTRAINT TextSearchConditionInheritance FOREIGN KEY (condition_id) REFERENCES lams_branch_condition (condition_id) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_theme; --- --- Table structure for table `lams_theme` --- -DROP TABLE IF EXISTS `lams_theme`; - -CREATE TABLE `lams_theme` ( - `theme_id` bigint(20) NOT NULL AUTO_INCREMENT, - `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `image_directory` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`theme_id`), - UNIQUE KEY `UQ_name` (`name`) +CREATE TABLE lams_theme ( + theme_id bigint NOT NULL AUTO_INCREMENT, + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + image_directory varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (theme_id), + UNIQUE KEY UQ_name (`name`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_timezone; --- --- Table structure for table `lams_timezone` --- -DROP TABLE IF EXISTS `lams_timezone`; - -CREATE TABLE `lams_timezone` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `timezone_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `server_timezone` tinyint(1) DEFAULT '0', - PRIMARY KEY (`id`) +CREATE TABLE lams_timezone ( + id bigint NOT NULL AUTO_INCREMENT, + timezone_id varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + server_timezone tinyint(1) DEFAULT '0', + PRIMARY KEY (id) ) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_tool; --- --- Table structure for table `lams_tool` --- -DROP TABLE IF EXISTS `lams_tool`; +CREATE TABLE lams_tool ( + tool_id bigint NOT NULL AUTO_INCREMENT, + tool_signature varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + service_name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + tool_display_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + tool_identifier varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + tool_version varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + learning_library_id bigint DEFAULT NULL, + default_tool_content_id bigint DEFAULT NULL, + valid_flag tinyint(1) NOT NULL DEFAULT '1', + grouping_support_type_id int NOT NULL, + learner_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + learner_preview_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + learner_progress_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + author_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + monitor_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + pedagogical_planner_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + help_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + create_date_time datetime NOT NULL, + language_file varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + modified_date_time datetime DEFAULT NULL, + admin_url text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + supports_outputs tinyint(1) DEFAULT '0', + ext_lms_id varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (tool_id), + UNIQUE KEY UQ_lams_tool_sig (tool_signature), + UNIQUE KEY UQ_lams_tool_class_name (service_name), + KEY learning_library_id (learning_library_id), + KEY grouping_support_type_id (grouping_support_type_id), + CONSTRAINT FK_lams_tool_1 FOREIGN KEY (learning_library_id) REFERENCES lams_learning_library (learning_library_id), + CONSTRAINT FK_lams_tool_2 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) +) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `lams_tool` ( - `tool_id` bigint(20) NOT NULL AUTO_INCREMENT, - `tool_signature` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `service_name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL, - `tool_display_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` text COLLATE utf8mb4_unicode_ci, - `tool_identifier` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `tool_version` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, - `learning_library_id` bigint(20) DEFAULT NULL, - `default_tool_content_id` bigint(20) DEFAULT NULL, - `valid_flag` tinyint(1) NOT NULL DEFAULT '1', - `grouping_support_type_id` int(3) NOT NULL, - `learner_url` text COLLATE utf8mb4_unicode_ci NOT NULL, - `learner_preview_url` text COLLATE utf8mb4_unicode_ci, - `learner_progress_url` text COLLATE utf8mb4_unicode_ci, - `author_url` text COLLATE utf8mb4_unicode_ci NOT NULL, - `monitor_url` text COLLATE utf8mb4_unicode_ci, - `pedagogical_planner_url` text COLLATE utf8mb4_unicode_ci, - `help_url` text COLLATE utf8mb4_unicode_ci, - `create_date_time` datetime NOT NULL, - `language_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `modified_date_time` datetime DEFAULT NULL, - `admin_url` text COLLATE utf8mb4_unicode_ci, - `supports_outputs` tinyint(1) DEFAULT '0', - `ext_lms_id` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - PRIMARY KEY (`tool_id`), - UNIQUE KEY `UQ_lams_tool_sig` (`tool_signature`), - UNIQUE KEY `UQ_lams_tool_class_name` (`service_name`), - KEY `learning_library_id` (`learning_library_id`), - KEY `grouping_support_type_id` (`grouping_support_type_id`), - CONSTRAINT `FK_lams_tool_1` FOREIGN KEY (`learning_library_id`) REFERENCES `lams_learning_library` (`learning_library_id`), - CONSTRAINT `FK_lams_tool_2` FOREIGN KEY (`grouping_support_type_id`) REFERENCES `lams_grouping_support_type` (`grouping_support_type_id`) -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_tool_content; --- --- Table structure for table `lams_tool_content` --- +CREATE TABLE lams_tool_content ( + tool_content_id bigint NOT NULL AUTO_INCREMENT, + tool_id bigint NOT NULL, + PRIMARY KEY (tool_content_id), + KEY tool_id (tool_id), + CONSTRAINT FK_lams_tool_content_1 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) +) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `lams_tool_content`; +DROP TABLE IF EXISTS lams_tool_session; -CREATE TABLE `lams_tool_content` ( - `tool_content_id` bigint(20) NOT NULL AUTO_INCREMENT, - `tool_id` bigint(20) NOT NULL, - PRIMARY KEY (`tool_content_id`), - KEY `tool_id` (`tool_id`), - CONSTRAINT `FK_lams_tool_content_1` FOREIGN KEY (`tool_id`) REFERENCES `lams_tool` (`tool_id`) -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - --- --- Table structure for table `lams_tool_session` --- - -DROP TABLE IF EXISTS `lams_tool_session`; - -CREATE TABLE `lams_tool_session` ( - `tool_session_id` bigint(20) NOT NULL AUTO_INCREMENT, - `tool_session_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `tool_session_type_id` int(3) NOT NULL, - `lesson_id` bigint(20) NOT NULL, - `activity_id` bigint(20) NOT NULL, - `tool_session_state_id` int(3) NOT NULL, - `create_date_time` datetime NOT NULL, - `group_id` bigint(20) DEFAULT NULL, - `user_id` bigint(20) DEFAULT NULL, - `unique_key` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`tool_session_id`), - UNIQUE KEY `UQ_lams_tool_session_1` (`unique_key`), - KEY `tool_session_state_id` (`tool_session_state_id`), - KEY `user_id` (`user_id`), - KEY `tool_session_type_id` (`tool_session_type_id`), - KEY `activity_id` (`activity_id`), - KEY `group_id` (`group_id`), - CONSTRAINT `FK_lams_tool_session_1` FOREIGN KEY (`group_id`) REFERENCES `lams_group` (`group_id`), - CONSTRAINT `FK_lams_tool_session_4` FOREIGN KEY (`tool_session_state_id`) REFERENCES `lams_tool_session_state` (`tool_session_state_id`), - CONSTRAINT `FK_lams_tool_session_5` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_lams_tool_session_7` FOREIGN KEY (`tool_session_type_id`) REFERENCES `lams_tool_session_type` (`tool_session_type_id`), - CONSTRAINT `FK_lams_tool_session_8` FOREIGN KEY (`activity_id`) REFERENCES `lams_learning_activity` (`activity_id`) +CREATE TABLE lams_tool_session ( + tool_session_id bigint NOT NULL AUTO_INCREMENT, + tool_session_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + tool_session_type_id int NOT NULL, + lesson_id bigint NOT NULL, + activity_id bigint NOT NULL, + tool_session_state_id int NOT NULL, + create_date_time datetime NOT NULL, + group_id bigint DEFAULT NULL, + user_id bigint DEFAULT NULL, + unique_key varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (tool_session_id), + UNIQUE KEY UQ_lams_tool_session_1 (unique_key), + KEY tool_session_state_id (tool_session_state_id), + KEY user_id (user_id), + KEY tool_session_type_id (tool_session_type_id), + KEY activity_id (activity_id), + KEY group_id (group_id), + CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id), + CONSTRAINT FK_lams_tool_session_4 FOREIGN KEY (tool_session_state_id) REFERENCES lams_tool_session_state (tool_session_state_id), + CONSTRAINT FK_lams_tool_session_5 FOREIGN KEY (user_id) REFERENCES lams_user (user_id), + CONSTRAINT FK_lams_tool_session_7 FOREIGN KEY (tool_session_type_id) REFERENCES lams_tool_session_type (tool_session_type_id), + CONSTRAINT FK_lams_tool_session_8 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_tool_session_state; --- --- Table structure for table `lams_tool_session_state` --- -DROP TABLE IF EXISTS `lams_tool_session_state`; - -CREATE TABLE `lams_tool_session_state` ( - `tool_session_state_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`tool_session_state_id`) +CREATE TABLE lams_tool_session_state ( + tool_session_state_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (tool_session_state_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_tool_session_type; --- --- Table structure for table `lams_tool_session_type` --- -DROP TABLE IF EXISTS `lams_tool_session_type`; - -CREATE TABLE `lams_tool_session_type` ( - `tool_session_type_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`tool_session_type_id`) +CREATE TABLE lams_tool_session_type ( + tool_session_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (tool_session_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user; --- --- Table structure for table `lams_user` --- DROP TABLE IF EXISTS `lams_user`; @@ -2293,151 +1873,134 @@ CONSTRAINT `FK_lams_user_7` FOREIGN KEY (`last_visited_organisation_id`) REFERENCES `lams_organisation` (`organisation_id`) ) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user_group; --- --- Table structure for table `lams_user_group` --- -DROP TABLE IF EXISTS `lams_user_group`; - -CREATE TABLE `lams_user_group` ( - `user_id` bigint(20) NOT NULL, - `group_id` bigint(20) NOT NULL, - `scheduled_lesson_end_date` datetime DEFAULT NULL, - PRIMARY KEY (`user_id`,`group_id`), - KEY `user_id` (`user_id`), - KEY `group_id` (`group_id`), - CONSTRAINT `FK_lams_user_group_1` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`), - CONSTRAINT `FK_lams_user_group_2` FOREIGN KEY (`group_id`) REFERENCES `lams_group` (`group_id`) +CREATE TABLE lams_user_group ( + user_id bigint NOT NULL, + group_id bigint NOT NULL, + scheduled_lesson_end_date datetime DEFAULT NULL, + PRIMARY KEY (user_id,group_id), + KEY user_id (user_id), + KEY group_id (group_id), + CONSTRAINT FK_lams_user_group_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id), + CONSTRAINT FK_lams_user_group_2 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user_organisation; --- --- Table structure for table `lams_user_organisation` --- -DROP TABLE IF EXISTS `lams_user_organisation`; - -CREATE TABLE `lams_user_organisation` ( - `user_organisation_id` bigint(20) NOT NULL AUTO_INCREMENT, - `organisation_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - PRIMARY KEY (`user_organisation_id`), - KEY `organisation_id` (`organisation_id`), - KEY `user_id` (`user_id`), - CONSTRAINT `FK_lams_user_organisation_1` FOREIGN KEY (`organisation_id`) REFERENCES `lams_organisation` (`organisation_id`), - CONSTRAINT `FK_lams_user_organisation_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) +CREATE TABLE lams_user_organisation ( + user_organisation_id bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + user_id bigint NOT NULL, + PRIMARY KEY (user_organisation_id), + KEY organisation_id (organisation_id), + KEY user_id (user_id), + CONSTRAINT FK_lams_user_organisation_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id), + CONSTRAINT FK_lams_user_organisation_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user_organisation_collapsed; --- --- Table structure for table `lams_user_organisation_group` --- -DROP TABLE IF EXISTS `lams_user_organisation_group`; - -CREATE TABLE `lams_user_organisation_group` ( - `group_id` bigint(20) NOT NULL, - `user_id` bigint(20) NOT NULL, - PRIMARY KEY (`group_id`,`user_id`), - KEY `FK_lams_user_organisation_group_2` (`user_id`), - CONSTRAINT `FK_lams_user_organisation_group_1` FOREIGN KEY (`group_id`) REFERENCES `lams_organisation_group` (`group_id`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `FK_lams_user_organisation_group_2` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE +CREATE TABLE lams_user_organisation_collapsed ( + uid bigint NOT NULL AUTO_INCREMENT, + organisation_id bigint NOT NULL, + user_id bigint NOT NULL, + collapsed tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (uid), + KEY organisation_id (organisation_id), + KEY user_id (user_id), + CONSTRAINT FK_lams_user_organisation_collapsed_1 FOREIGN KEY (organisation_id) REFERENCES lams_organisation (organisation_id), + CONSTRAINT FK_lams_user_organisation_collapsed_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user_organisation_group; --- --- Table structure for table `lams_user_organisation_role` --- -DROP TABLE IF EXISTS `lams_user_organisation_role`; +CREATE TABLE lams_user_organisation_group ( + group_id bigint NOT NULL, + user_id bigint NOT NULL, + PRIMARY KEY (group_id,user_id), + KEY FK_lams_user_organisation_group_2 (user_id), + CONSTRAINT FK_lams_user_organisation_group_1 FOREIGN KEY (group_id) REFERENCES lams_organisation_group (group_id) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT FK_lams_user_organisation_group_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `lams_user_organisation_role` ( - `user_organisation_role_id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_organisation_id` bigint(20) NOT NULL, - `role_id` int(6) NOT NULL, - PRIMARY KEY (`user_organisation_role_id`), - KEY `role_id` (`role_id`), - KEY `user_organisation_id` (`user_organisation_id`), - CONSTRAINT `FK_lams_user_organisation_role_2` FOREIGN KEY (`role_id`) REFERENCES `lams_role` (`role_id`), - CONSTRAINT `FK_lams_user_organisation_role_3` FOREIGN KEY (`user_organisation_id`) REFERENCES `lams_user_organisation` (`user_organisation_id`) -) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_user_organisation_role; --- --- Table structure for table `lams_workspace_folder` --- +CREATE TABLE lams_user_organisation_role ( + user_organisation_role_id bigint NOT NULL AUTO_INCREMENT, + user_organisation_id bigint NOT NULL, + role_id int NOT NULL, + PRIMARY KEY (user_organisation_role_id), + KEY role_id (role_id), + KEY user_organisation_id (user_organisation_id), + CONSTRAINT FK_lams_user_organisation_role_2 FOREIGN KEY (role_id) REFERENCES lams_role (role_id), + CONSTRAINT FK_lams_user_organisation_role_3 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) +) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -DROP TABLE IF EXISTS `lams_workspace_folder`; +DROP TABLE IF EXISTS lams_workspace_folder; -CREATE TABLE `lams_workspace_folder` ( - `workspace_folder_id` bigint(20) NOT NULL AUTO_INCREMENT, - `parent_folder_id` bigint(20) DEFAULT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `user_id` bigint(20) NOT NULL, - `organisation_id` bigint(20) DEFAULT NULL, - `create_date_time` datetime NOT NULL, - `last_modified_date_time` datetime DEFAULT NULL, - `lams_workspace_folder_type_id` int(3) NOT NULL, - PRIMARY KEY (`workspace_folder_id`), - KEY `parent_folder_id` (`parent_folder_id`), - KEY `lams_workspace_folder_type_id` (`lams_workspace_folder_type_id`), - CONSTRAINT `FK_lams_workspace_folder_2` FOREIGN KEY (`parent_folder_id`) REFERENCES `lams_workspace_folder` (`workspace_folder_id`), - CONSTRAINT `FK_lams_workspace_folder_4` FOREIGN KEY (`lams_workspace_folder_type_id`) REFERENCES `lams_workspace_folder_type` (`lams_workspace_folder_type_id`) + +CREATE TABLE lams_workspace_folder ( + workspace_folder_id bigint NOT NULL AUTO_INCREMENT, + parent_folder_id bigint DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + user_id bigint NOT NULL, + organisation_id bigint DEFAULT NULL, + create_date_time datetime NOT NULL, + last_modified_date_time datetime DEFAULT NULL, + lams_workspace_folder_type_id int NOT NULL, + PRIMARY KEY (workspace_folder_id), + KEY parent_folder_id (parent_folder_id), + KEY lams_workspace_folder_type_id (lams_workspace_folder_type_id), + CONSTRAINT FK_lams_workspace_folder_2 FOREIGN KEY (parent_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id), + CONSTRAINT FK_lams_workspace_folder_4 FOREIGN KEY (lams_workspace_folder_type_id) REFERENCES lams_workspace_folder_type (lams_workspace_folder_type_id) ) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_workspace_folder_content; --- --- Table structure for table `lams_workspace_folder_content` --- -DROP TABLE IF EXISTS `lams_workspace_folder_content`; - -CREATE TABLE `lams_workspace_folder_content` ( - `folder_content_id` bigint(20) NOT NULL AUTO_INCREMENT, - `content_type_id` int(3) NOT NULL, - `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `description` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `create_date_time` datetime NOT NULL, - `last_modified_date` datetime NOT NULL, - `workspace_folder_id` bigint(20) NOT NULL, - `uuid` bigint(20) DEFAULT NULL, - `version_id` bigint(20) DEFAULT NULL, - `mime_type` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`folder_content_id`), - UNIQUE KEY `unique_content_name` (`name`,`workspace_folder_id`,`mime_type`), - UNIQUE KEY `unique_node_version` (`workspace_folder_id`,`uuid`,`version_id`), - KEY `content_type_id` (`content_type_id`), - KEY `workspace_folder_id` (`workspace_folder_id`), - CONSTRAINT `FK_lams_workspace_folder_content_1` FOREIGN KEY (`workspace_folder_id`) REFERENCES `lams_workspace_folder` (`workspace_folder_id`) +CREATE TABLE lams_workspace_folder_content ( + folder_content_id bigint NOT NULL AUTO_INCREMENT, + content_type_id int NOT NULL, + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `description` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + create_date_time datetime NOT NULL, + last_modified_date datetime NOT NULL, + workspace_folder_id bigint NOT NULL, + uuid bigint DEFAULT NULL, + version_id bigint DEFAULT NULL, + mime_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (folder_content_id), + UNIQUE KEY unique_content_name (`name`,workspace_folder_id,mime_type), + UNIQUE KEY unique_node_version (workspace_folder_id,uuid,version_id), + KEY content_type_id (content_type_id), + KEY workspace_folder_id (workspace_folder_id), + CONSTRAINT FK_lams_workspace_folder_content_1 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS lams_workspace_folder_type; --- --- Table structure for table `lams_workspace_folder_type` --- -DROP TABLE IF EXISTS `lams_workspace_folder_type`; - -CREATE TABLE `lams_workspace_folder_type` ( - `lams_workspace_folder_type_id` int(3) NOT NULL, - `description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`lams_workspace_folder_type_id`) +CREATE TABLE lams_workspace_folder_type ( + lams_workspace_folder_type_id int NOT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + PRIMARY KEY (lams_workspace_folder_type_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +DROP TABLE IF EXISTS patches; --- --- Table structure for table `patches` --- -DROP TABLE IF EXISTS `patches`; - -CREATE TABLE `patches` ( - `system_name` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL, - `patch_level` int(11) NOT NULL, - `patch_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `patch_in_progress` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'F', - PRIMARY KEY (`system_name`,`patch_level`) +CREATE TABLE patches ( + system_name varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + patch_level int NOT NULL, + patch_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + patch_in_progress char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'F', + PRIMARY KEY (system_name,patch_level) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; Index: lams_common/db/sql/insert_lams_config_data.sql =================================================================== diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_common/db/sql/insert_lams_config_data.sql (.../insert_lams_config_data.sql) (revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe) +++ lams_common/db/sql/insert_lams_config_data.sql (.../insert_lams_config_data.sql) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -6,7 +6,8 @@ -- LOCK TABLES `lams_configuration` WRITE; -INSERT INTO `lams_configuration` VALUES ('AdminScreenSize','1280x720','config.admin.screen.size','config.header.look.feel','STRING',1),('AllowDirectAccessIntgrtnLrnr','false','config.allow.direct.access.for.integration.learners','config.header.features','BOOLEAN',1),('AllowDirectLessonLaunch','false','config.allow.direct.lesson.launch','config.header.features','BOOLEAN',1),('AllowKumalive','true','config.allow.kumalive','config.header.features','BOOLEAN',1),('AllowLiveEdit','true','config.allow.live.edit','config.header.features','BOOLEAN',1),('AuthoringScreenSize','1280x720','config.authoring.screen.size','config.header.look.feel','STRING',1),('CleanupPreviewOlderThanDays','7','config.cleanup.preview.older.than.days','config.header.system','LONG',1),('ConfigCacheRefreshInterval','0','config.cache.refresh','config.header.system','LONG',0),('ContentRepositoryPath','@contentrepository.directory@','config.content.repository.path','config.header.uploads','STRING',1),('CustomTabLink','','config.custom.tab.link','config.header.look.feel','STRING',0),('CustomTabTitle','','config.custom.tab.title','config.header.look.feel','STRING',0),('DefaultTheme','defaultHTML','config.default.html.theme','config.header.look.feel','STRING',1),('DictionaryDateCreated','2018-12-28','config.dictionary.date.created','config.header.versions','STRING',1),('DisplayPortrait','true','config.display.portrait','config.header.look.feel','BOOLEAN',0),('DisplayPrintButton','false','config.display.print.button','config.header.features','BOOLEAN',1),('EARDir','@ear.directory@','config.ear.dir','config.header.system','STRING',1),('EnableForgotYourPasswordLink','true','config.enable.forgot.your.password.link','config.header.features','BOOLEAN',0),('EnablePortraitEditing','true','config.enable.portrait.editing','config.header.features','BOOLEAN',0),('EnableServerRegistration','false','config.server2server.registration.enable','config.header.system','BOOLEAN',1),('ErrorStackTrace','true','config.stacktrace.error','config.header.system','BOOLEAN',0),('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp','config.executable.extensions','config.header.uploads','STRING',1),('FailedAttempts','3','config.failed.attempts','config.header.password.policy','LONG',1),('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/','config.help.url','config.header.system','STRING',1),('LamsSupportEmail','','config.lams.support.email','config.header.email','STRING',0),('LDAPAddr1Attr','postalAddress','admin.user.address_line_1','config.header.ldap.attributes','STRING',0),('LDAPAddr2Attr','','admin.user.address_line_2','config.header.ldap.attributes','STRING',0),('LDAPAddr3Attr','','admin.user.address_line_3','config.header.ldap.attributes','STRING',0),('LDAPAuthorMap','Teacher;SeniorStaff;Principal','config.ldap.author.map','config.header.ldap.attributes','STRING',0),('LDAPBaseDN','ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au','config.ldap.base.dn','config.header.ldap','STRING',0),('LDAPBindUserDN','','config.ldap.bind.user.dn','config.header.ldap','STRING',0),('LDAPBindUserPassword','','config.ldap.bind.user.password','config.header.ldap','STRING',0),('LDAPCityAttr','l','admin.user.city','config.header.ldap.attributes','STRING',0),('LDAPCountryAttr','','admin.user.country','config.header.ldap.attributes','STRING',0),('LDAPDayPhoneAttr','telephoneNumber','admin.user.day_phone','config.header.ldap.attributes','STRING',0),('LDAPDisabledAttr','!accountStatus','sysadmin.disabled','config.header.ldap.attributes','STRING',0),('LDAPEmailAttr','mail','admin.user.email','config.header.ldap.attributes','STRING',0),('LDAPEveningPhoneAttr','homePhone','admin.user.evening_phone','config.header.ldap.attributes','STRING',0),('LDAPFaxAttr','facsimileTelephoneNumber','admin.user.fax','config.header.ldap.attributes','STRING',0),('LDAPFNameAttr','givenName','admin.user.first_name','config.header.ldap.attributes','STRING',0),('LDAPGroupManagerMap','Principal;Teacher;SeniorStaff','config.ldap.group.manager.map','config.header.ldap.attributes','STRING',0),('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal','config.ldap.learner.map','config.header.ldap.attributes','STRING',0),('LDAPLNameAttr','sn','admin.user.last_name','config.header.ldap.attributes','STRING',0),('LDAPLocaleAttr','preferredLanguage','admin.organisation.locale','config.header.ldap.attributes','STRING',0),('LDAPLoginAttr','uid','admin.user.login','config.header.ldap.attributes','STRING',0),('LDAPMobileAttr','mobile','admin.user.mobile_phone','config.header.ldap.attributes','STRING',0),('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal','config.ldap.monitor.map','config.header.ldap.attributes','STRING',0),('LDAPOnlyOneOrg','true','config.ldap.only.one.org','config.header.ldap','BOOLEAN',1),('LDAPOrgAttr','schoolCode','admin.course','config.header.ldap.attributes','STRING',0),('LDAPOrgField','code','config.ldap.org.field','config.header.ldap.attributes','STRING',0),('LDAPPostcodeAttr','postalCode','admin.user.postcode','config.header.ldap.attributes','STRING',0),('LDAPProviderURL','ldap://192.168.111.15','config.ldap.provider.url','config.header.ldap','STRING',0),('LDAPProvisioningEnabled','false','config.ldap.provisioning.enabled','config.header.ldap','BOOLEAN',1),('LDAPRolesAttr','memberOf','admin.user.roles','config.header.ldap.attributes','STRING',0),('LDAPSearchFilter','(cn={0})','config.ldap.search.filter','config.header.ldap','STRING',0),('LDAPSearchResultsPageSize','100','config.ldap.search.results.page.size','config.header.ldap','LONG',0),('LDAPSecurityAuthentication','simple','config.ldap.security.authentication','config.header.ldap','STRING',0),('LDAPSecurityProtocol','','config.ldap.security.protocol','config.header.ldap','STRING',0),('LDAPStateAttr','st','admin.user.state','config.header.ldap.attributes','STRING',0),('LDAPUpdateOnLogin','true','config.ldap.update.on.login','config.header.ldap','BOOLEAN',1),('LearnerScreenSize','1280x720','config.learner.screen.size','config.header.look.feel','STRING',1),('LockOutTime','5','config.lock.out.time','config.header.password.policy','LONG',1),('MonitorScreenSize','1280x720','config.monitor.screen.size','config.header.look.feel','STRING',1),('PasswordPolicyLowercase','true','config.password.lowercase','config.header.password.policy','BOOLEAN',0),('PasswordPolicyMinChars','8','config.password.minimum.characters','config.header.password.policy','LONG',1),('PasswordPolicyNumerics','true','config.password.numerics','config.header.password.policy','BOOLEAN',0),('PasswordPolicySymbols','false','config.password.symbols','config.header.password.policy','BOOLEAN',0),('PasswordPolicyUppercase','true','config.password.uppercase','config.header.password.policy','BOOLEAN',0),('ProfileEditEnable','true','config.profile.edit.enable','config.header.features','BOOLEAN',1),('ProfilePartialEditEnable','true','config.profile.partial.edit.enable','config.header.features','BOOLEAN',1),('ServerCountry','AU','config.server.country','config.header.look.feel','STRING',1),('ServerLanguage','en_AU','config.server.language','config.header.look.feel','STRING',1),('ServerPageDirection','LTR','config.server.page.direction','config.header.look.feel','STRING',1),('ServerURL','http://localhost:8080/lams/','config.server.url','config.header.system','STRING',1),('ServerURLContextPath','lams/','config.server.url.context.path','config.header.system','STRING',1),('ServerVersionNumber','3.1','config.server.version.number','config.header.versions','STRING',1),('ShowAllMyLessonLink','true','config.show.all.my.lesson.link','config.header.features','BOOLEAN',1),('ShowTimezoneWarning','true','config.show.timezone.warning','config.header.features','BOOLEAN',1),('SiteName','LAMS','config.site.name','config.header.system','STRING',1),('SMTPAuthSecurity','none','config.smtp.auth.security','config.header.email','STRING',1),('SMTPPassword','','config.smtp.password','config.header.email','STRING',0),('SMTPPort','25','config.smtp.port','config.header.email','LONG',0),('SMTPServer','','config.smtp.server','config.header.email','STRING',0),('SMTPUser','','config.smtp.user','config.header.email','STRING',0),('SuffixImportedLD','false','config.authoring.suffix','config.header.features','BOOLEAN',0),('TempDir','@temp.directory@','config.temp.dir','config.header.system','STRING',1),('UploadFileMaxMemorySize','4096','config.upload.file.max.memory.size','config.header.uploads','LONG',1),('UploadFileMaxSize','10485760','config.upload.file.max.size','config.header.uploads','LONG',1),('UploadLargeFileMaxSize','104857600','config.upload.large.file.max.size','config.header.uploads','LONG',1),('UserInactiveTimeout','10800','config.user.inactive.timeout','config.header.system','LONG',1),('UserValidationEmail','true','config.user.validation.emails','config.header.user.validation','BOOLEAN',0),('UserValidationFirstLastName','true','config.user.validation.first.last.name','config.header.user.validation','BOOLEAN',0),('UserValidationUsername','true','config.user.validation.username','config.header.user.validation','BOOLEAN',0),('Version','3.1','config.version','config.header.system','STRING',1), +INSERT INTO `lams_configuration` VALUES ('AdminScreenSize','1280x720','config.admin.screen.size','config.header.look.feel','STRING',1),('AllowDirectAccessIntgrtnLrnr','false','config.allow.direct.access.for.integration.learners','config.header.features','BOOLEAN',1),('AllowDirectLessonLaunch','false','config.allow.direct.lesson.launch','config.header.features','BOOLEAN',1),('AllowKumalive','true','config.allow.kumalive','config.header.features','BOOLEAN',1),('AllowLiveEdit','true','config.allow.live.edit','config.header.features','BOOLEAN',1),('AuthoringScreenSize','1280x720','config.authoring.screen.size','config.header.look.feel','STRING',1),('CleanupPreviewOlderThanDays','7','config.cleanup.preview.older.than.days','config.header.system','LONG',1),('ConfigCacheRefreshInterval','0','config.cache.refresh','config.header.system','LONG',0),('ContentRepositoryPath','@contentrepository.directory@','config.content.repository.path','config.header.uploads','STRING',1),('CustomTabLink','','config.custom.tab.link','config.header.look.feel','STRING',0),('CustomTabTitle','','config.custom.tab.title','config.header.look.feel','STRING',0),('DefaultTheme','defaultHTML','config.default.html.theme','config.header.look.feel','STRING',1),('DictionaryDateCreated','2020-11-21','config.dictionary.date.created','config.header.versions','STRING',1),('DisplayPortrait','true','config.display.portrait','config.header.look.feel','BOOLEAN',0),('DisplayPrintButton','false','config.display.print.button','config.header.features','BOOLEAN',1),('EARDir','@ear.directory@','config.ear.dir','config.header.system','STRING',1),('EnableForgotYourPasswordLink','true','config.enable.forgot.your.password.link','config.header.features','BOOLEAN',0),('EnablePortraitEditing','true','config.enable.portrait.editing','config.header.features','BOOLEAN',0),('EnableServerRegistration','false','config.server2server.registration.enable','config.header.system','BOOLEAN',1),('ErrorStackTrace','true','config.stacktrace.error','config.header.system','BOOLEAN',0),('ExecutableExtensions','.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs,.php,.jsp,.asp,.aspx,.pl,.do,.py,.tcl,.cgi,.shtml,.stm,.cfm,.adp','config.executable.extensions','config.header.uploads','STRING',1),('FailedAttempts','3','config.failed.attempts','config.header.password.policy','LONG',1),('HelpURL','http://wiki.lamsfoundation.org/display/lamsdocs/','config.help.url','config.header.system','STRING',1),('LamsSupportEmail','','config.lams.support.email','config.header.email','STRING',0),('LDAPAddr1Attr','postalAddress','admin.user.address_line_1','config.header.ldap.attributes','STRING',0),('LDAPAddr2Attr','','admin.user.address_line_2','config.header.ldap.attributes','STRING',0),('LDAPAddr3Attr','','admin.user.address_line_3','config.header.ldap.attributes','STRING',0),('LDAPAuthorMap','Teacher;SeniorStaff;Principal','config.ldap.author.map','config.header.ldap.attributes','STRING',0),('LDAPBaseDN','ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au','config.ldap.base.dn','config.header.ldap','STRING',0),('LDAPBindUserDN','','config.ldap.bind.user.dn','config.header.ldap','STRING',0),('LDAPBindUserPassword','','config.ldap.bind.user.password','config.header.ldap','STRING',0),('LDAPCityAttr','l','admin.user.city','config.header.ldap.attributes','STRING',0),('LDAPCountryAttr','','admin.user.country','config.header.ldap.attributes','STRING',0),('LDAPDayPhoneAttr','telephoneNumber','admin.user.day_phone','config.header.ldap.attributes','STRING',0),('LDAPDisabledAttr','!accountStatus','sysadmin.disabled','config.header.ldap.attributes','STRING',0),('LDAPEmailAttr','mail','admin.user.email','config.header.ldap.attributes','STRING',0),('LDAPEveningPhoneAttr','homePhone','admin.user.evening_phone','config.header.ldap.attributes','STRING',0),('LDAPFaxAttr','facsimileTelephoneNumber','admin.user.fax','config.header.ldap.attributes','STRING',0),('LDAPFNameAttr','givenName','admin.user.first_name','config.header.ldap.attributes','STRING',0),('LDAPGroupManagerMap','Principal;Teacher;SeniorStaff','config.ldap.group.manager.map','config.header.ldap.attributes','STRING',0),('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal','config.ldap.learner.map','config.header.ldap.attributes','STRING',0),('LDAPLNameAttr','sn','admin.user.last_name','config.header.ldap.attributes','STRING',0),('LDAPLocaleAttr','preferredLanguage','admin.organisation.locale','config.header.ldap.attributes','STRING',0),('LDAPLoginAttr','uid','admin.user.login','config.header.ldap.attributes','STRING',0),('LDAPMobileAttr','mobile','admin.user.mobile_phone','config.header.ldap.attributes','STRING',0),('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal','config.ldap.monitor.map','config.header.ldap.attributes','STRING',0),('LDAPOnlyOneOrg','true','config.ldap.only.one.org','config.header.ldap','BOOLEAN',1),('LDAPOrgAttr','schoolCode','admin.course','config.header.ldap.attributes','STRING',0),('LDAPOrgField','code','config.ldap.org.field','config.header.ldap.attributes','STRING',0),('LDAPPostcodeAttr','postalCode','admin.user.postcode','config.header.ldap.attributes','STRING',0),('LDAPProviderURL','ldap://192.168.111.15','config.ldap.provider.url','config.header.ldap','STRING',0),('LDAPProvisioningEnabled','false','config.ldap.provisioning.enabled','config.header.ldap','BOOLEAN',1),('LDAPRolesAttr','memberOf','admin.user.roles','config.header.ldap.attributes','STRING',0),('LDAPSearchFilter','(cn={0})','config.ldap.search.filter','config.header.ldap','STRING',0),('LDAPSearchResultsPageSize','100','config.ldap.search.results.page.size','config.header.ldap','LONG',0),('LDAPSecurityAuthentication','simple','config.ldap.security.authentication','config.header.ldap','STRING',0),('LDAPSecurityProtocol','','config.ldap.security.protocol','config.header.ldap','STRING',0),('LDAPStateAttr','st','admin.user.state','config.header.ldap.attributes','STRING',0),('LDAPUpdateOnLogin','true','config.ldap.update.on.login','config.header.ldap','BOOLEAN',1),('LearnerScreenSize','1280x720','config.learner.screen.size','config.header.look.feel','STRING',1),('LockOutTime','5','config.lock.out.time','config.header.password.policy','LONG',1),('MonitorScreenSize','1280x720','config.monitor.screen.size','config.header.look.feel','STRING',1),('PasswordPolicyLowercase','true','config.password.lowercase','config.header.password.policy','BOOLEAN',0),('PasswordPolicyMinChars','8','config.password.minimum.characters','config.header.password.policy','LONG',1),('PasswordPolicyNumerics','true','config.password.numerics','config.header.password.policy','BOOLEAN',0),('PasswordPolicySymbols','false','config.password.symbols','config.header.password.policy','BOOLEAN',0),('PasswordPolicyUppercase','true','config.password.uppercase','config.header.password.policy','BOOLEAN',0),('ProfileEditEnable','true','config.profile.edit.enable','config.header.features','BOOLEAN',1),('ProfilePartialEditEnable','true','config.profile.partial.edit.enable','config.header.features','BOOLEAN',1),('ServerCountry','AU','config.server.country','config.header.look.feel','STRING',1),('ServerLanguage','en_AU','config.server.language','config.header.look.feel','STRING',1),('ServerPageDirection','LTR','config.server.page.direction','config.header.look.feel','STRING',1),('ServerURL','http://localhost:8080/lams/','config.server.url','config.header.system','STRING',1),('ServerURLContextPath','lams/','config.server.url.context.path','config.header.system','STRING',1),('ServerVersionNumber','4.0','config.server.version.number','config.header.versions','STRING',1),('ShowAllMyLessonLink','true','config.show.all.my.lesson.link','config.header.features','BOOLEAN',1),('ShowTimezoneWarning','true','config.show.timezone.warning','config.header.features','BOOLEAN',1),('SiteName','LAMS','config.site.name','config.header.system','STRING',1),('SMTPAuthSecurity','none','config.smtp.auth.security','config.header.email','STRING',1),('SMTPPassword','','config.smtp.password','config.header.email','STRING',0),('SMTPPort','25','config.smtp.port','config.header.email','LONG',0),('SMTPServer','','config.smtp.server','config.header.email','STRING',0),('SMTPUser','','config.smtp.user','config.header.email','STRING',0),('SuffixImportedLD','false','config.authoring.suffix','config.header.features','BOOLEAN',0),('TempDir','@temp.directory@','config.temp.dir','config.header.system','STRING',1),('UploadFileMaxMemorySize','4096','config.upload.file.max.memory.size','config.header.uploads','LONG',1),('UploadFileMaxSize','10485760','config.upload.file.max.size','config.header.uploads','LONG',1),('UploadLargeFileMaxSize','104857600','config.upload.large.file.max.size','config.header.uploads','LONG',1),('UserInactiveTimeout','10800','config.user.inactive.timeout','config.header.system','LONG',1),('UserValidationEmail','true','config.user.validation.emails','config.header.user.validation','BOOLEAN',0),('UserValidationFirstLastName','true','config.user.validation.first.last.name','config.header.user.validation','BOOLEAN',0),('UserValidationUsername','true','config.user.validation.username','config.header.user.validation','BOOLEAN',0),('Version','3.1','config.version','config.header.system','STRING',1),('RestrictedGroupUserNames','true', 'config.restricted.displaying.user.names.in.groupings', 'config.header.privacy.settings', 'BOOLEAN', 0),('EnableCollapsingSubcourses','false', 'config.enable.collapsing.subcourses', 'config.header.features', 'BOOLEAN', 0),('EtherpadServerUrl','http://localhost:9001','config.etherpad.server.url','config.header.etherpad','STRING', 0),('EtherpadApiKey','','config.etherpad.api.key','config.header.etherpad','STRING', 0),('EtherpadInstanceID','LAMS','config.etherpad.instance.id','config.header.etherpad','STRING', 0); +INSERT INTO `lams_configuration` VALUES ('AntivirusEnable', 'false', 'config.av.enable', 'config.header.antivirus', 'BOOLEAN', 1), ('AntivirusHost', 'localhost', 'config.av.host', 'config.header.antivirus', 'STRING', 0), ('AntivirusPort', '3310', 'config.av.port', 'config.header.antivirus', 'LONG', 0), @@ -17,10 +18,7 @@ ('QbStatsMinParticipants', '2', 'config.qb.stats.min.participants', 'config.header.qb', 'LONG', 1), ('QbStatsGroupSize', '27', 'config.qb.stats.group.size', 'config.header.qb', 'LONG', 1), ('QbMergeEnable', 'true', 'config.qb.merge.enable', 'config.header.qb', 'BOOLEAN', 1), -('QbCollectionsTransferEnable', 'true', 'config.qb.collections.transfer.enable', 'config.header.qb', 'BOOLEAN', 1), -('RestrictedGroupUserNames','true', 'config.restricted.displaying.user.names.in.groupings', 'config.header.privacy.settings', 'BOOLEAN', 0), -('EnableCollapsingSubcourses','false', 'config.enable.collapsing.subcourses', 'config.header.features', 'BOOLEAN', 0), -('LearningOutcomeQuickAddEnable', 'true', 'config.learning.outcome.add.enable', 'config.header.features', 'BOOLEAN', 1); +('QbCollectionsTransferEnable', 'true', 'config.qb.collections.transfer.enable', 'config.header.qb', 'BOOLEAN', 1); UNLOCK TABLES; SET FOREIGN_KEY_CHECKS=1; Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -78,7 +78,7 @@ -- LOCK TABLES `lams_learning_activity_type` WRITE; -INSERT INTO `lams_learning_activity_type` VALUES (1,'TOOL'),(2,'GROUPING'),(3,'GATE_SYNCH'),(4,'GATE_SCHEDULE'),(5,'GATE_PERMISSION'),(6,'PARALLEL'),(7,'OPTIONS'),(8,'SEQUENCE'),(9,'GATE_SYSTEM'),(10,'BRANCHING_CHOSEN'),(11,'BRANCHING_GROUP'),(12,'BRANCHING_TOOL'),(13,'OPTIONS_WITH_SEQUENCES'),(14,'GATE_CONDITION'),(15,'FLOATING'); +INSERT INTO `lams_learning_activity_type` VALUES (1,'TOOL'),(2,'GROUPING'),(3,'GATE_SYNCH'),(4,'GATE_SCHEDULE'),(5,'GATE_PERMISSION'),(6,'PARALLEL'),(7,'OPTIONS'),(8,'SEQUENCE'),(9,'GATE_SYSTEM'),(10,'BRANCHING_CHOSEN'),(11,'BRANCHING_GROUP'),(12,'BRANCHING_TOOL'),(13,'OPTIONS_WITH_SEQUENCES'),(14,'GATE_CONDITION'),(15,'FLOATING'),(16, 'GATE_PASSWORD'); UNLOCK TABLES; -- @@ -190,7 +190,7 @@ -- LOCK TABLES `lams_system_tool` WRITE; -INSERT INTO `lams_system_tool` VALUES (1,2,'Grouping','All types of grouping including random and chosen.','learning/grouping/performGrouping.do','learning/grouping/performGrouping.do','learning/grouping/viewGrouping.do?mode=teacher','monitoring/grouping/startGrouping.do','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,'pedagogicalPlanner/grouping.do?method=initGrouping'),(2,3,'Sync Gate','Gate: Synchronise Learners.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(3,4,'Schedule Gate','Gate: Opens/shuts at particular times.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(4,5,'Permission Gate','Gate: Opens under teacher or staff control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(5,9,'System Gate','Gate: Opens under system control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(6,10,'Monitor Chosen Branching','Select between multiple sequence activities, with the branch chosen in monitoring.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/chosenBranching.do?method=assignBranch','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,NULL),(7,11,'Group Based Branching','Select between multiple sequence activities, with the branch chosen by an existing group.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/groupedBranching.do?method=viewBranching','monitoring/groupedBranching.do?method=assignBranch',NULL,NOW(),NULL,NULL),(8,12,'Tool Output Based Branching','Select between multiple sequence activities, with the branch chosen on results of another activity.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/toolBranching.do?method=viewBranching','monitoring/toolBranching.do?method=viewBranching',NULL,NOW(),NULL,NULL),(9,8,'Sequence','A sequence of activities','learning/SequenceActivity.do','learning/SequenceActivity.do','monitoring/complexProgress.do','monitoring/sequence/viewSequence.do','monitoring/sequence/viewSequence.do',NULL,NOW(),NULL,NULL),(10,14,'Condition Gate','Gate: Opens if conditions are met','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(11,15,'Floating Activities','A collection of floating activities',NULL,NULL,NULL,'monitoring/floating.do?method=viewFloating','monitoring/floating.do?method=viewFloating',NULL,NOW(),NULL,NULL); +INSERT INTO `lams_system_tool` VALUES (1,2,'Grouping','All types of grouping including random and chosen.','learning/grouping/performGrouping.do','learning/grouping/performGrouping.do','learning/grouping/viewGrouping.do?mode=teacher','monitoring/grouping/startGrouping.do','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,'pedagogicalPlanner/grouping.do?method=initGrouping'),(2,3,'Sync Gate','Gate: Synchronise Learners.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(3,4,'Schedule Gate','Gate: Opens/shuts at particular times.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(4,5,'Permission Gate','Gate: Opens under teacher or staff control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(5,9,'System Gate','Gate: Opens under system control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(6,10,'Monitor Chosen Branching','Select between multiple sequence activities, with the branch chosen in monitoring.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/chosenBranching.do?method=assignBranch','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,NULL),(7,11,'Group Based Branching','Select between multiple sequence activities, with the branch chosen by an existing group.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/groupedBranching.do?method=viewBranching','monitoring/groupedBranching.do?method=assignBranch',NULL,NOW(),NULL,NULL),(8,12,'Tool Output Based Branching','Select between multiple sequence activities, with the branch chosen on results of another activity.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/toolBranching.do?method=viewBranching','monitoring/toolBranching.do?method=viewBranching',NULL,NOW(),NULL,NULL),(9,8,'Sequence','A sequence of activities','learning/SequenceActivity.do','learning/SequenceActivity.do','monitoring/complexProgress.do','monitoring/sequence/viewSequence.do','monitoring/sequence/viewSequence.do',NULL,NOW(),NULL,NULL),(10,14,'Condition Gate','Gate: Opens if conditions are met','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(11,15,'Floating Activities','A collection of floating activities',NULL,NULL,NULL,'monitoring/floating.do?method=viewFloating','monitoring/floating.do?method=viewFloating',NULL,NOW(),NULL,NULL),(12, 16, 'Password Gate', 'Gate: Opens if learner provides correct password','learning/gate/knockGate.do', 'learning/gate/knockGate.do', NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do', NULL, now(), NULL, NULL); UNLOCK TABLES; @@ -199,7 +199,7 @@ -- LOCK TABLES `lams_timezone` WRITE; -INSERT INTO `lams_timezone` VALUES (1,'Etc/GMT+14',0),(2,'Etc/GMT+13',0),(3,'Etc/GMT+12',0),(4,'Etc/GMT+11',0),(5,'Etc/GMT+10',0),(6,'Etc/GMT+9',0),(7,'Etc/GMT+8',0),(8,'Etc/GMT+7',0),(9,'Etc/GMT+6',0),(10,'Etc/GMT+5',0),(11,'Etc/GMT+4',0),(12,'Etc/GMT+3',0),(13,'Etc/GMT+2',0),(14,'Etc/GMT+1',0),(15,'Etc/GMT',0),(16,'Etc/GMT-1',0),(17,'Etc/GMT-2',0),(18,'Etc/GMT-3',0),(19,'Etc/GMT-4',0),(20,'Etc/GMT-5',0),(21,'Etc/GMT-6',0),(22,'Etc/GMT-7',0),(23,'Etc/GMT-8',0),(24,'Etc/GMT-9',0),(25,'Etc/GMT-10',0),(26,'Etc/GMT-11',0),(27,'Etc/GMT-12',0); +INSERT INTO `lams_timezone` VALUES (1,'Africa/Abidjan',0),(2,'Africa/Accra',0),(3,'Africa/Addis_Ababa',0),(4,'Africa/Algiers',0),(5,'Africa/Asmara',0),(6,'Africa/Asmera',0),(7,'Africa/Bamako',0),(8,'Africa/Bangui',0),(9,'Africa/Banjul',0),(10,'Africa/Bissau',0),(11,'Africa/Blantyre',0),(12,'Africa/Brazzaville',0),(13,'Africa/Bujumbura',0),(14,'Africa/Cairo',0),(15,'Africa/Casablanca',0),(16,'Africa/Ceuta',0),(17,'Africa/Conakry',0),(18,'Africa/Dakar',0),(19,'Africa/Dar_es_Salaam',0),(20,'Africa/Djibouti',0),(21,'Africa/Douala',0),(22,'Africa/El_Aaiun',0),(23,'Africa/Freetown',0),(24,'Africa/Gaborone',0),(25,'Africa/Harare',0),(26,'Africa/Johannesburg',0),(27,'Africa/Juba',0),(28,'Africa/Kampala',0),(29,'Africa/Khartoum',0),(30,'Africa/Kigali',0),(31,'Africa/Kinshasa',0),(32,'Africa/Lagos',0),(33,'Africa/Libreville',0),(34,'Africa/Lome',0),(35,'Africa/Luanda',0),(36,'Africa/Lubumbashi',0),(37,'Africa/Lusaka',0),(38,'Africa/Malabo',0),(39,'Africa/Maputo',0),(40,'Africa/Maseru',0),(41,'Africa/Mbabane',0),(42,'Africa/Mogadishu',0),(43,'Africa/Monrovia',0),(44,'Africa/Nairobi',0),(45,'Africa/Ndjamena',0),(46,'Africa/Niamey',0),(47,'Africa/Nouakchott',0),(48,'Africa/Ouagadougou',0),(49,'Africa/Porto-Novo',0),(50,'Africa/Sao_Tome',0),(51,'Africa/Timbuktu',0),(52,'Africa/Tripoli',0),(53,'Africa/Tunis',0),(54,'Africa/Windhoek',0),(55,'America/Adak',0),(56,'America/Anchorage',0),(57,'America/Anguilla',0),(58,'America/Antigua',0),(59,'America/Araguaina',0),(60,'America/Argentina/Buenos_Aires',0),(61,'America/Argentina/Catamarca',0),(62,'America/Argentina/ComodRivadavia',0),(63,'America/Argentina/Cordoba',0),(64,'America/Argentina/Jujuy',0),(65,'America/Argentina/La_Rioja',0),(66,'America/Argentina/Mendoza',0),(67,'America/Argentina/Rio_Gallegos',0),(68,'America/Argentina/Salta',0),(69,'America/Argentina/San_Juan',0),(70,'America/Argentina/San_Luis',0),(71,'America/Argentina/Tucuman',0),(72,'America/Argentina/Ushuaia',0),(73,'America/Aruba',0),(74,'America/Asuncion',0),(75,'America/Atikokan',0),(76,'America/Atka',0),(77,'America/Bahia',0),(78,'America/Bahia_Banderas',0),(79,'America/Barbados',0),(80,'America/Belem',0),(81,'America/Belize',0),(82,'America/Blanc-Sablon',0),(83,'America/Boa_Vista',0),(84,'America/Bogota',0),(85,'America/Boise',0),(86,'America/Buenos_Aires',0),(87,'America/Cambridge_Bay',0),(88,'America/Campo_Grande',0),(89,'America/Cancun',0),(90,'America/Caracas',0),(91,'America/Catamarca',0),(92,'America/Cayenne',0),(93,'America/Cayman',0),(94,'America/Chicago',0),(95,'America/Chihuahua',0),(96,'America/Coral_Harbour',0),(97,'America/Cordoba',0),(98,'America/Costa_Rica',0),(99,'America/Creston',0),(100,'America/Cuiaba',0),(101,'America/Curacao',0),(102,'America/Danmarkshavn',0),(103,'America/Dawson',0),(104,'America/Dawson_Creek',0),(105,'America/Denver',0),(106,'America/Detroit',0),(107,'America/Dominica',0),(108,'America/Edmonton',0),(109,'America/Eirunepe',0),(110,'America/El_Salvador',0),(111,'America/Ensenada',0),(112,'America/Fort_Nelson',0),(113,'America/Fort_Wayne',0),(114,'America/Fortaleza',0),(115,'America/Glace_Bay',0),(116,'America/Godthab',0),(117,'America/Goose_Bay',0),(118,'America/Grand_Turk',0),(119,'America/Grenada',0),(120,'America/Guadeloupe',0),(121,'America/Guatemala',0),(122,'America/Guayaquil',0),(123,'America/Guyana',0),(124,'America/Halifax',0),(125,'America/Havana',0),(126,'America/Hermosillo',0),(127,'America/Indiana/Indianapolis',0),(128,'America/Indiana/Knox',0),(129,'America/Indiana/Marengo',0),(130,'America/Indiana/Petersburg',0),(131,'America/Indiana/Tell_City',0),(132,'America/Indiana/Vevay',0),(133,'America/Indiana/Vincennes',0),(134,'America/Indiana/Winamac',0),(135,'America/Indianapolis',0),(136,'America/Inuvik',0),(137,'America/Iqaluit',0),(138,'America/Jamaica',0),(139,'America/Jujuy',0),(140,'America/Juneau',0),(141,'America/Kentucky/Louisville',0),(142,'America/Kentucky/Monticello',0),(143,'America/Knox_IN',0),(144,'America/Kralendijk',0),(145,'America/La_Paz',0),(146,'America/Lima',0),(147,'America/Los_Angeles',0),(148,'America/Louisville',0),(149,'America/Lower_Princes',0),(150,'America/Maceio',0),(151,'America/Managua',0),(152,'America/Manaus',0),(153,'America/Marigot',0),(154,'America/Martinique',0),(155,'America/Matamoros',0),(156,'America/Mazatlan',0),(157,'America/Mendoza',0),(158,'America/Menominee',0),(159,'America/Merida',0),(160,'America/Metlakatla',0),(161,'America/Mexico_City',0),(162,'America/Miquelon',0),(163,'America/Moncton',0),(164,'America/Monterrey',0),(165,'America/Montevideo',0),(166,'America/Montreal',0),(167,'America/Montserrat',0),(168,'America/Nassau',0),(169,'America/New_York',0),(170,'America/Nipigon',0),(171,'America/Nome',0),(172,'America/Noronha',0),(173,'America/North_Dakota/Beulah',0),(174,'America/North_Dakota/Center',0),(175,'America/North_Dakota/New_Salem',0),(176,'America/Nuuk',0),(177,'America/Ojinaga',0),(178,'America/Panama',0),(179,'America/Pangnirtung',0),(180,'America/Paramaribo',0),(181,'America/Phoenix',0),(182,'America/Port-au-Prince',0),(183,'America/Port_of_Spain',0),(184,'America/Porto_Acre',0),(185,'America/Porto_Velho',0),(186,'America/Puerto_Rico',0),(187,'America/Punta_Arenas',0),(188,'America/Rainy_River',0),(189,'America/Rankin_Inlet',0),(190,'America/Recife',0),(191,'America/Regina',0),(192,'America/Resolute',0),(193,'America/Rio_Branco',0),(194,'America/Rosario',0),(195,'America/Santa_Isabel',0),(196,'America/Santarem',0),(197,'America/Santiago',0),(198,'America/Santo_Domingo',0),(199,'America/Sao_Paulo',0),(200,'America/Scoresbysund',0),(201,'America/Shiprock',0),(202,'America/Sitka',0),(203,'America/St_Barthelemy',0),(204,'America/St_Johns',0),(205,'America/St_Kitts',0),(206,'America/St_Lucia',0),(207,'America/St_Thomas',0),(208,'America/St_Vincent',0),(209,'America/Swift_Current',0),(210,'America/Tegucigalpa',0),(211,'America/Thule',0),(212,'America/Thunder_Bay',0),(213,'America/Tijuana',0),(214,'America/Toronto',0),(215,'America/Tortola',0),(216,'America/Vancouver',0),(217,'America/Virgin',0),(218,'America/Whitehorse',0),(219,'America/Winnipeg',0),(220,'America/Yakutat',0),(221,'America/Yellowknife',0),(222,'Antarctica/Casey',0),(223,'Antarctica/Davis',0),(224,'Antarctica/DumontDUrville',0),(225,'Antarctica/Macquarie',0),(226,'Antarctica/Mawson',0),(227,'Antarctica/McMurdo',0),(228,'Antarctica/Palmer',0),(229,'Antarctica/Rothera',0),(230,'Antarctica/South_Pole',0),(231,'Antarctica/Syowa',0),(232,'Antarctica/Troll',0),(233,'Antarctica/Vostok',0),(234,'Arctic/Longyearbyen',0),(235,'Asia/Aden',0),(236,'Asia/Almaty',0),(237,'Asia/Amman',0),(238,'Asia/Anadyr',0),(239,'Asia/Aqtau',0),(240,'Asia/Aqtobe',0),(241,'Asia/Ashgabat',0),(242,'Asia/Ashkhabad',0),(243,'Asia/Atyrau',0),(244,'Asia/Baghdad',0),(245,'Asia/Bahrain',0),(246,'Asia/Baku',0),(247,'Asia/Bangkok',0),(248,'Asia/Barnaul',0),(249,'Asia/Beirut',0),(250,'Asia/Bishkek',0),(251,'Asia/Brunei',0),(252,'Asia/Calcutta',0),(253,'Asia/Chita',0),(254,'Asia/Choibalsan',0),(255,'Asia/Chongqing',0),(256,'Asia/Chungking',0),(257,'Asia/Colombo',0),(258,'Asia/Dacca',0),(259,'Asia/Damascus',0),(260,'Asia/Dhaka',0),(261,'Asia/Dili',0),(262,'Asia/Dubai',0),(263,'Asia/Dushanbe',0),(264,'Asia/Famagusta',0),(265,'Asia/Gaza',0),(266,'Asia/Harbin',0),(267,'Asia/Hebron',0),(268,'Asia/Ho_Chi_Minh',0),(269,'Asia/Hong_Kong',0),(270,'Asia/Hovd',0),(271,'Asia/Irkutsk',0),(272,'Asia/Istanbul',0),(273,'Asia/Jakarta',0),(274,'Asia/Jayapura',0),(275,'Asia/Jerusalem',0),(276,'Asia/Kabul',0),(277,'Asia/Kamchatka',0),(278,'Asia/Karachi',0),(279,'Asia/Kashgar',0),(280,'Asia/Kathmandu',0),(281,'Asia/Katmandu',0),(282,'Asia/Khandyga',0),(283,'Asia/Kolkata',0),(284,'Asia/Krasnoyarsk',0),(285,'Asia/Kuala_Lumpur',0),(286,'Asia/Kuching',0),(287,'Asia/Kuwait',0),(288,'Asia/Macao',0),(289,'Asia/Macau',0),(290,'Asia/Magadan',0),(291,'Asia/Makassar',0),(292,'Asia/Manila',0),(293,'Asia/Muscat',0),(294,'Asia/Nicosia',0),(295,'Asia/Novokuznetsk',0),(296,'Asia/Novosibirsk',0),(297,'Asia/Omsk',0),(298,'Asia/Oral',0),(299,'Asia/Phnom_Penh',0),(300,'Asia/Pontianak',0),(301,'Asia/Pyongyang',0),(302,'Asia/Qatar',0),(303,'Asia/Qostanay',0),(304,'Asia/Qyzylorda',0),(305,'Asia/Rangoon',0),(306,'Asia/Riyadh',0),(307,'Asia/Saigon',0),(308,'Asia/Sakhalin',0),(309,'Asia/Samarkand',0),(310,'Asia/Seoul',0),(311,'Asia/Shanghai',0),(312,'Asia/Singapore',0),(313,'Asia/Srednekolymsk',0),(314,'Asia/Taipei',0),(315,'Asia/Tashkent',0),(316,'Asia/Tbilisi',0),(317,'Asia/Tehran',0),(318,'Asia/Tel_Aviv',0),(319,'Asia/Thimbu',0),(320,'Asia/Thimphu',0),(321,'Asia/Tokyo',0),(322,'Asia/Tomsk',0),(323,'Asia/Ujung_Pandang',0),(324,'Asia/Ulaanbaatar',0),(325,'Asia/Ulan_Bator',0),(326,'Asia/Urumqi',0),(327,'Asia/Ust-Nera',0),(328,'Asia/Vientiane',0),(329,'Asia/Vladivostok',0),(330,'Asia/Yakutsk',0),(331,'Asia/Yangon',0),(332,'Asia/Yekaterinburg',0),(333,'Asia/Yerevan',0),(334,'Atlantic/Azores',0),(335,'Atlantic/Bermuda',0),(336,'Atlantic/Canary',0),(337,'Atlantic/Cape_Verde',0),(338,'Atlantic/Faeroe',0),(339,'Atlantic/Faroe',0),(340,'Atlantic/Jan_Mayen',0),(341,'Atlantic/Madeira',0),(342,'Atlantic/Reykjavik',0),(343,'Atlantic/South_Georgia',0),(344,'Atlantic/St_Helena',0),(345,'Atlantic/Stanley',0),(346,'Australia/ACT',0),(347,'Australia/Adelaide',0),(348,'Australia/Brisbane',0),(349,'Australia/Broken_Hill',0),(350,'Australia/Canberra',0),(351,'Australia/Currie',0),(352,'Australia/Darwin',0),(353,'Australia/Eucla',0),(354,'Australia/Hobart',0),(355,'Australia/LHI',0),(356,'Australia/Lindeman',0),(357,'Australia/Lord_Howe',0),(358,'Australia/Melbourne',0),(359,'Australia/NSW',0),(360,'Australia/North',0),(361,'Australia/Perth',0),(362,'Australia/Queensland',0),(363,'Australia/South',0),(364,'Australia/Sydney',0),(365,'Australia/Tasmania',0),(366,'Australia/Victoria',0),(367,'Australia/West',0),(368,'Australia/Yancowinna',0),(369,'Brazil/Acre',0),(370,'Brazil/DeNoronha',0),(371,'Brazil/East',0),(372,'Brazil/West',0),(373,'Canada/Atlantic',0),(374,'Canada/Central',0),(375,'Canada/Eastern',0),(376,'Canada/Mountain',0),(377,'Canada/Newfoundland',0),(378,'Canada/Pacific',0),(379,'Canada/Saskatchewan',0),(380,'Canada/Yukon',0),(381,'Chile/Continental',0),(382,'Chile/EasterIsland',0),(383,'Europe/Amsterdam',0),(384,'Europe/Andorra',0),(385,'Europe/Astrakhan',0),(386,'Europe/Athens',0),(387,'Europe/Belfast',0),(388,'Europe/Belgrade',0),(389,'Europe/Berlin',0),(390,'Europe/Bratislava',0),(391,'Europe/Brussels',0),(392,'Europe/Bucharest',0),(393,'Europe/Budapest',0),(394,'Europe/Busingen',0),(395,'Europe/Chisinau',0),(396,'Europe/Copenhagen',0),(397,'Europe/Dublin',0),(398,'Europe/Gibraltar',0),(399,'Europe/Guernsey',0),(400,'Europe/Helsinki',0),(401,'Europe/Isle_of_Man',0),(402,'Europe/Istanbul',0),(403,'Europe/Jersey',0),(404,'Europe/Kaliningrad',0),(405,'Europe/Kiev',0),(406,'Europe/Kirov',0),(407,'Europe/Lisbon',0),(408,'Europe/Ljubljana',0),(409,'Europe/London',0),(410,'Europe/Luxembourg',0),(411,'Europe/Madrid',0),(412,'Europe/Malta',0),(413,'Europe/Mariehamn',0),(414,'Europe/Minsk',0),(415,'Europe/Monaco',0),(416,'Europe/Moscow',0),(417,'Europe/Nicosia',0),(418,'Europe/Oslo',0),(419,'Europe/Paris',0),(420,'Europe/Podgorica',0),(421,'Europe/Prague',0),(422,'Europe/Riga',0),(423,'Europe/Rome',0),(424,'Europe/Samara',0),(425,'Europe/San_Marino',0),(426,'Europe/Sarajevo',0),(427,'Europe/Saratov',0),(428,'Europe/Simferopol',0),(429,'Europe/Skopje',0),(430,'Europe/Sofia',0),(431,'Europe/Stockholm',0),(432,'Europe/Tallinn',0),(433,'Europe/Tirane',0),(434,'Europe/Tiraspol',0),(435,'Europe/Ulyanovsk',0),(436,'Europe/Uzhgorod',0),(437,'Europe/Vaduz',0),(438,'Europe/Vatican',0),(439,'Europe/Vienna',0),(440,'Europe/Vilnius',0),(441,'Europe/Volgograd',0),(442,'Europe/Warsaw',0),(443,'Europe/Zagreb',0),(444,'Europe/Zaporozhye',0),(445,'Europe/Zurich',0),(446,'Indian/Antananarivo',0),(447,'Indian/Chagos',0),(448,'Indian/Christmas',0),(449,'Indian/Cocos',0),(450,'Indian/Comoro',0),(451,'Indian/Kerguelen',0),(452,'Indian/Mahe',0),(453,'Indian/Maldives',0),(454,'Indian/Mauritius',0),(455,'Indian/Mayotte',0),(456,'Indian/Reunion',0),(457,'Mexico/BajaNorte',0),(458,'Mexico/BajaSur',0),(459,'Mexico/General',0),(460,'Pacific/Apia',0),(461,'Pacific/Auckland',0),(462,'Pacific/Bougainville',0),(463,'Pacific/Chatham',0),(464,'Pacific/Chuuk',0),(465,'Pacific/Easter',0),(466,'Pacific/Efate',0),(467,'Pacific/Enderbury',0),(468,'Pacific/Fakaofo',0),(469,'Pacific/Fiji',0),(470,'Pacific/Funafuti',0),(471,'Pacific/Galapagos',0),(472,'Pacific/Gambier',0),(473,'Pacific/Guadalcanal',0),(474,'Pacific/Guam',0),(475,'Pacific/Honolulu',0),(476,'Pacific/Johnston',0),(477,'Pacific/Kiritimati',0),(478,'Pacific/Kosrae',0),(479,'Pacific/Kwajalein',0),(480,'Pacific/Majuro',0),(481,'Pacific/Marquesas',0),(482,'Pacific/Midway',0),(483,'Pacific/Nauru',0),(484,'Pacific/Niue',0),(485,'Pacific/Norfolk',0),(486,'Pacific/Noumea',0),(487,'Pacific/Pago_Pago',0),(488,'Pacific/Palau',0),(489,'Pacific/Pitcairn',0),(490,'Pacific/Pohnpei',0),(491,'Pacific/Ponape',0),(492,'Pacific/Port_Moresby',0),(493,'Pacific/Rarotonga',0),(494,'Pacific/Saipan',0),(495,'Pacific/Samoa',0),(496,'Pacific/Tahiti',0),(497,'Pacific/Tarawa',0),(498,'Pacific/Tongatapu',0),(499,'Pacific/Truk',0),(500,'Pacific/Wake',0),(501,'Pacific/Wallis',0),(502,'Pacific/Yap',0),(503,'US/Alaska',0),(504,'US/Aleutian',0),(505,'US/Arizona',0),(506,'US/Central',0),(507,'US/East-Indiana',0),(508,'US/Eastern',0),(509,'US/Hawaii',0),(510,'US/Indiana-Starke',0),(511,'US/Michigan',0),(512,'US/Mountain',0),(513,'US/Pacific',0),(514,'US/Samoa',0),(515,'UTC',0); UNLOCK TABLES; -- @@ -244,4 +244,4 @@ INSERT INTO `lams_qb_collection` VALUES (1, 'Public questions', NULL, false); UNLOCK TABLES; -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -0,0 +1,22 @@ +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time + +-- Take care about potential duplicates. For this move all entries to tmp table first. +CREATE TABLE tmp_table SELECT * FROM lams_gradebook_user_lesson; +TRUNCATE TABLE lams_gradebook_user_lesson; +-- Change key to unique +ALTER TABLE `lams_gradebook_user_lesson` + DROP FOREIGN KEY `FK_lams_gradebook_user_lesson_1`, + DROP INDEX `lesson_id`; +ALTER TABLE `lams_gradebook_user_lesson` + ADD UNIQUE INDEX `lesson_id` (`lesson_id`,`user_id`), + ADD CONSTRAINT `FK_lams_gradebook_user_lesson_1` FOREIGN KEY (`lesson_id`) REFERENCES `lams_lesson` (`lesson_id`); +-- Move entries back to lams_gradebook_user_lesson +INSERT IGNORE INTO lams_gradebook_user_lesson SELECT * from tmp_table; +DROP TABLE tmp_table; + +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision cf258bae4dd72eab7a6f5bc895b96966caafaf06) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -116,7 +116,6 @@ import org.lamsfoundation.lams.learningdesign.dto.ToolOutputGateActivityEntryDTO; import org.lamsfoundation.lams.learningdesign.dto.TransitionDTO; import org.lamsfoundation.lams.lesson.LessonClass; -import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityMetadata; import org.lamsfoundation.lams.qb.dao.IQbDAO; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.tool.SystemTool; @@ -487,6 +486,7 @@ exportedContentFolders.add(contentFolderID); } } + } // end all activities export // skipping unwanted elements; learning design DTO is altered @@ -521,7 +521,8 @@ } // zip file name with full path - targetZipFileName = ldDto.getTitle() + ExportToolContentService.EXPORT_TOOLCONTNET_ZIP_SUFFIX; + targetZipFileName = FileUtil.stripInvalidChars(ldDto.getTitle()) + + ExportToolContentService.EXPORT_TOOLCONTNET_ZIP_SUFFIX; log.debug("Create export content target zip file. File name is " + targetZipFileName); // create zip file and return zip full file name @@ -1283,7 +1284,7 @@ if (removedActMap.containsKey(actDto.getActivityID())) { continue; } - + Activity act = getActivity(actDto, groupingMapper, toolMapper, defaultActivityToParentActivityMapping); // so far, the activitiy ID is still old one, so setup the // mapping relation between old ID and new activity. @@ -1349,8 +1350,7 @@ activityEvaluation.setWeight(Integer.valueOf(eval.get(1))); } activityEvaluation.setActivity((ToolActivity) act); - ((ToolActivity) act).setEvaluation(activityEvaluation); - activityDAO.update(act); + activityDAO.insert(activityEvaluation); } } @@ -1454,12 +1454,10 @@ // Any transitions relating with this tool will be removed! Long fromId = transDto.getFromActivityID(); Long toId = transDto.getToActivityID(); - if ((fromId != null) && removedActMap.containsKey(fromId)) { + if (((fromId != null) && removedActMap.containsKey(fromId)) + || ((toId != null) && removedActMap.containsKey(toId))) { continue; } - if ((toId != null) && removedActMap.containsKey(toId)) { - continue; - } Transition trans = getTransition(transDto, activityMapper); transList.add(trans); @@ -1911,12 +1909,6 @@ ((ToolActivity) act).setToolContentId(content.getToolContentId()); ((ToolActivity) act).setToolSessions(null); } - if (actDto.getPlannerMetadataDTO() != null) { - PedagogicalPlannerActivityMetadata plannerMetadata = actDto.getPlannerMetadataDTO() - .toPlannerMetadata(); - plannerMetadata.setActivity(((ToolActivity) act)); - ((ToolActivity) act).setPlannerMetadata(plannerMetadata); - } act.setLearningLibrary(learningLibraryDAO.getLearningLibraryById(actDto.getLearningLibraryID())); break; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -r2a60aefd13ef4aac8e67f7e23ff837062aa837d9 -recc49cd6851b43f37ef02c2ddb85257096e2cf49 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 2a60aefd13ef4aac8e67f7e23ff837062aa837d9) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49) @@ -29,7 +29,6 @@ import java.util.Calendar; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -39,11 +38,12 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ComplexActivity; +import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.LearningLibrary; -import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup; import org.lamsfoundation.lams.learningdesign.ParallelActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.learningdesign.Transition; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; @@ -58,6 +58,7 @@ import org.lamsfoundation.lams.tool.dto.ToolDTO; import org.lamsfoundation.lams.tool.dto.ToolDTONameComparator; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.ILoadedMessageSourceService; import org.lamsfoundation.lams.util.MessageService; @@ -184,40 +185,6 @@ return learningDesignDAO.find(LearningLibrary.class, learningLibraryId); } - @Override - public List
';
+ var entryContent = '
' + (contributeActivity.title ? '' + contributeActivity.title + '
(' : ''); switch (this.contributionType) { case 3 : entryContent += LABELS.CONTRIBUTE_GATE; break; case 6 : entryContent += LABELS.CONTRIBUTE_GROUPING; break; @@ -80,11 +850,19 @@ case 11 : entryContent += LABELS.CONTRIBUTE_CONTENT_EDITED; break; case 12 : entryContent += LABELS.CONTRIBUTE_GATE_PASSWORD; break; } - entryContent += '
(' : ''); switch (this.contributionType) { case 3 : entryContent += LABELS.CONTRIBUTE_GATE; break; case 6 : entryContent += LABELS.CONTRIBUTE_GROUPING; break; @@ -80,11 +850,19 @@ case 11 : entryContent += LABELS.CONTRIBUTE_CONTENT_EDITED; break; case 12 : entryContent += LABELS.CONTRIBUTE_GATE_PASSWORD; break; } - entryContent += '
';
+ if (contributeActivity.title) {
+ entryContent += ')';
+ }
+ entryContent += '
';
switch (this.contributionType) {
case 3 :
case 12 : if (this.isComplete) {
- entryContent += '' + LABELS.CONTRIBUTE_OPENED_GATE + '';
+ entryContent += '';
} else {
entryContent += '
').attr({
+ 'type' : 'checkbox',
+ 'id' : checkboxId
+ }).addClass('form-check-input me-1')
+ .change(function(){
+ editEmailProgressDate($(this));
+ }),
+
+ dateString = $('').addClass('form-check-label').attr('for', checkboxId).text(dateObj.date),
+
+ dateDiv = $('').attr({
+ 'dateid' : dateObj.id,
+ 'datems' : dateObj.ms
+ })
+ .addClass('dialogListItem')
+ .append(dateString)
+ .prepend(checkbox)
+ .appendTo(list);
+
+ checkbox.prop('checked', checked);
+ return checkbox;
+}
+
+function sendProgressEmail() {
+ showConfirm(LABELS.PROGRESS_EMAIL_SEND_NOW_QUESTION, function() {
+ $.ajax({
+ dataType : 'json',
+ url : LAMS_URL + 'monitoring/emailProgress/sendLessonProgressEmail.do',
+ type: 'post',
+ cache : false,
+ data : {
+ 'lessonID' : lessonId
+ },
+ success : function(response) {
+ if ( response.error || ! response.sent > 0 )
+ showToast(LABELS.PROGRESS_EMAIL_SEND_FAILED+"\n"+(response.error ? response.error : ""));
+ else
+ showToast(LABELS.PROGRESS_EMAIL_SUCCESS.replace('[0]',response.sent));
+ }
+ });
+ });
+}
+
+function addEmailProgressDate() {
+ debugger;
+ var table = $('#emailProgressDialogTable', '#emailProgressDialog'),
+ list = $('.dialogList', table),
+ newDateMS = new tempusDominus.TempusDominus(document.getElementById('emaildatePicker')).viewDate;
+
+
+ if ( newDateMS != null ) {
+ if ( newDateMS.getTime() < Date.now() ) {
+ alert(LABELS.ERROR_DATE_IN_PAST);
+ } else {
+ var dateObj = { id: newDateMS.getTime(), date: getEmailDateString(newDateMS)},
+ checkbox = addCheckbox(dateObj, list, true);
+ editEmailProgressDate(checkbox); // update back end
+ addEmailProgressSeries(false, table);
+ }
+ } else {
+ alert(LABELS.PROGRESS_SELECT_DATE_FIRST);
+ }
+}
+
+
+
+function getEmailDateString(date) {
+ return date.toLocaleDateString('en', {year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric', hour12: false });
+}
+
+function addEmailProgressSeries(forceQuestion, table) {
+ if ( ! table ) {
+ table = $('#emailProgressDialogTable', '#emailProgressDialog');
+ }
+ var list = $('.dialogList', table),
+ items = $('.dialogListItem', list);
+
+ if ( forceQuestion && items.length < 2 ) {
+ alert(LABELS.PROGRESS_ENTER_TWO_DATES_FIRST);
+ } else if ( items.length == 2 || forceQuestion ) {
+ var numDates = prompt(LABELS.PROGRESS_EMAIL_GENERATE_ONE+"\n\n"+LABELS.PROGRESS_EMAIL_GENERATE_TWO);
+ if ( numDates > 0 ) {
+ var dates=[];
+ var maxDate = 0;
+ items.each( function() {
+ var nextDate = $(this).attr('dateid');
+ dates.push($(this).attr('dateid'));
+ if ( maxDate < nextDate )
+ maxDate = nextDate;
+ });
+ if ( dates[1] < dates[0] ) {
+ var swap = dates[1];
+ dates[1] = dates[0];
+ dates[0] = swap;
+ }
+ var diff = dates[1] - dates[0];
+ if ( diff > 0 ) {
+ var genDateMS = maxDate;
+ for (var i = 0; i < numDates; i++) {
+ genDateMS = +genDateMS + +diff;
+ var genDateObj = { id: genDateMS, date: getEmailDateString(new Date(genDateMS))};
+ var checkbox = addCheckbox(genDateObj, list, false);
+ }
+ }
+ }
+ }
+ colorDialogList(table);
+}
+
function openGateNow(activityId) {
var data = {
'activityId' : activityId
@@ -129,6 +1100,1564 @@
});
}
+function closeGate(activityId) {
+ var data = {
+ 'activityId' : activityId
+ };
+ data[csrfTokenName] = csrfTokenValue;
+ $.ajax({
+ 'type' : 'post',
+ 'url' : LAMS_URL + 'monitoring/gate/closeGate.do',
+ 'data' : data,
+ 'success' : function(){
+ updateLessonTab();
+ }
+ });
+}
+//********** SEQUENCE TAB FUNCTIONS **********
+
+/**
+ * Sets up the sequence tab.
+ */
+function initSequenceTab(){
+ var learnerGroupDialogContents = $('#learnerGroupDialogContents');
+ $('#learnerGroupDialogForceCompleteButton, #learnerGroupDialogForceCompleteAllButton', learnerGroupDialogContents).click(function() {
+ var dialog = $('#learnerGroupDialog'),
+ // are we moving selected learners or all of learners who are currently in the activity
+ moveAll = $(this).attr('id') == 'learnerGroupDialogForceCompleteAllButton',
+ selectedLearners = moveAll ? null : $('.dialogList div.dialogListItemSelected', dialog),
+ // go to "force complete" mode, similar to dragging user to an activity
+ activityId = dialog.data('ajaxProperties').data.activityID,
+ dropArea = sequenceCanvas.add('#completedLearnersContainer');
+ dropArea.css('cursor', 'pointer')
+ .one('click', function(event) {
+ dropArea.off('click').css('cursor', 'default');
+ if (moveAll) {
+ // setting learners as 'true' is a special switch meaning "move all"
+ forceComplete(activityId, true, event.pageX, event.pageY);
+ } else {
+ var learners = [];
+ selectedLearners.each(function(){
+ var learner = $(this);
+ learners.push({
+ 'id' : learner.attr('userId'),
+ 'name' : learner.text()
+ });
+ });
+ forceComplete(activityId, learners, event.pageX, event.pageY);
+ }
+ });
+ dialog.modal('hide');
+
+ if (moveAll) {
+ alert(LABELS.FORCE_COMPLETE_CLICK.replace('[0]', ''));
+ } else {
+ var learnerNames = '';
+ selectedLearners.each(function(){
+ learnerNames += $(this).text() + ', ';
+ });
+ learnerNames = learnerNames.slice(0, -2);
+ alert(LABELS.FORCE_COMPLETE_CLICK.replace('[0]', '"' + learnerNames + '"'));
+ }
+ });
+
+ $('#learnerGroupDialogViewButton', learnerGroupDialogContents).click(function() {
+ var dialog = $('#learnerGroupDialog'),
+ selectedLearner = $('.dialogList div.dialogListItemSelected', dialog);
+ if (selectedLearner.length == 1) {
+ // open pop up with user progress in the given activity
+ openPopUp(selectedLearner.attr('viewUrl'), "LearnActivity", popupHeight, popupWidth, true);
+ }
+ });
+
+ $('#learnerGroupDialogEmailButton', learnerGroupDialogContents).click(function() {
+ var dialog = $('#learnerGroupDialog'),
+ selectedLearner = $('.dialogList div.dialogListItemSelected', dialog);
+ if (selectedLearner.length == 1) {
+ showEmailDialog(selectedLearner.attr('userId'));
+ }
+ });
+
+ $('#learnerGroupDialogCloseButton', learnerGroupDialogContents).click(function(){
+ $('#learnerGroupDialog').modal('hide');
+ });
+
+ // initialise lesson dialog
+ var learnerGroupDialog = showDialog('learnerGroupDialog',{
+ 'autoOpen' : false,
+ 'width' : 450,
+ 'height' : 450,
+ 'resizable' : true,
+ 'open' : function(){
+ // until operator selects an user, buttons remain disabled
+ $('button.learnerGroupDialogSelectableButton').blur().prop('disabled', true);
+ }
+ }, false);
+
+ $('.modal-body', learnerGroupDialog).empty().append(learnerGroupDialogContents.show());
+
+ // search for users with the term the Monitor entered
+ $('.dialogSearchPhrase', learnerGroupDialog).autocomplete({
+ 'source' : LAMS_URL + "monitoring/monitoring/autocomplete.do?scope=lesson&lessonID=" + lessonId,
+ 'delay' : 700,
+ 'select' : function(event, ui){
+ var phraseField = $(this),
+ dialog = $('#learnerGroupDialog');
+ // learner's ID in ui.item.value is not used here
+ phraseField.val(ui.item.label);
+ $('.dialogSearchPhraseClear', dialog).css('visibility', 'visible');
+ // reset to page 1
+ dialog.data('ajaxProperties').data.pageNumber = 1;
+ showLearnerGroupDialog();
+ return false;
+ }
+ })
+ // run the real search when the Monitor presses Enter
+ .keypress(function(e){
+ if (e.which == 13) {
+ var phraseField = $(this),
+ dialog = $('#learnerGroupDialog');
+
+ phraseField.autocomplete("close");
+ if (phraseField.val()) {
+ $('.dialogSearchPhraseClear', dialog).css('visibility', 'visible');
+ }
+ // reset to page 1
+ dialog.data('ajaxProperties').data.pageNumber = 1;
+ showLearnerGroupDialog();
+ }
+ });
+
+ // search for users with the term the Monitor entered
+ $("#sequenceSearchPhrase").autocomplete( {
+ 'source' : LAMS_URL + "monitoring/monitoring/autocomplete.do?scope=lesson&lessonID=" + lessonId,
+ 'delay' : 700,
+ 'response' : function(event, ui) {
+ $.each(ui.content, function(){
+ // only add portrait if user has got one
+ let valueParts = this.value.split('_');
+ this.value = valueParts[0];
+ // portrait div will be added as text, then in open() function below we fix it
+ this.portrait = definePortrait(valueParts.length > 1 ? valueParts[1] : null, this.value, STYLE_SMALL, true, LAMS_URL);
+ this.rawLabel = this.label;
+ this.label += this.portrait;
+ });
+ },
+ 'open' : function(event, ui) {
+ $('.ui-menu-item-wrapper', $(this).autocomplete( "widget" )).each(function(){
+ let menuItem = $(this);
+ // portrait, if exists, was added as text; now we make it proper html
+ menuItem.html(menuItem.text());
+ let portrait = menuItem.children('div');
+ if (portrait.length == 0) {
+ // no portrait, nothing to do
+ return;
+ }
+ // rearrange item contents
+ portrait.detach();
+ let label = $('').text(menuItem.text());
+ // this extra class makes it a flex box
+ menuItem.empty().addClass('autocomplete-menu-item-with-portrait');
+ menuItem.append(label).append(portrait);
+ });
+ },
+ 'select' : function(event, ui){
+ // put the learner first name, last name and login into the box
+ $(this).val(ui.item.rawLabel);
+ // mark the learner's ID and make him highlighted after the refresh
+ sequenceSearchedLearner = ui.item.value;
+ refreshMonitor();
+ return false;
+ }
+ });
+
+ var forceBackwardsDialogContents = $('#forceBackwardsDialogContents');
+ showDialog('forceBackwardsDialog', {
+ 'autoOpen' : false,
+ 'modal' : true,
+ 'resizable' : true,
+ 'height' : 300,
+ 'width' : 400,
+ 'title' : LABELS.FORCE_COMPLETE_BUTTON
+ }, false);
+ // only need to do this once as then it updates the msg field directly.
+ $('.modal-body', '#forceBackwardsDialog').empty().append($('#forceBackwardsDialogContents').show());
+
+ $('#forceBackwardsRemoveContentNoButton', forceBackwardsDialogContents).click(function(){
+ var forceBackwardsDialog = $('#forceBackwardsDialog'),
+ learners = forceBackwardsDialog.data('learners'),
+ moveAll = learners === true;
+ forceCompleteExecute(moveAll ? null : learners,
+ moveAll ? forceBackwardsDialog.data('currentActivityId') : null,
+ forceBackwardsDialog.data('activityId'),
+ false);
+ forceBackwardsDialog.modal('hide');
+ });
+
+ $('#forceBackwardsRemoveContentYesButton', forceBackwardsDialogContents).click(function(){
+ var forceBackwardsDialog = $('#forceBackwardsDialog');
+ learners = forceBackwardsDialog.data('learners'),
+ moveAll = learners === true;
+ forceCompleteExecute(moveAll ? null : learners,
+ moveAll ? forceBackwardsDialog.data('currentActivityId') : null,
+ forceBackwardsDialog.data('activityId'),
+ true);
+ forceBackwardsDialog.modal('hide');
+ });
+
+ $('#forceBackwardsCloseButton', forceBackwardsDialogContents).click(function(){
+ $('#forceBackwardsDialog').modal('hide');
+ });
+
+ const learnerProgressUpdateSource = new EventSource(LAMS_URL + 'monitoring/monitoring/getLearnerProgressUpdateFlux.do?lessonId=' + lessonId);
+ learnerProgressUpdateSource.onmessage = function (event) {
+ if ("doRefresh" == event.data && $('#sequence-tab-content').length === 1){
+ updateSequenceTab();
+ }
+ }
+}
+
+function showIntroductionDialog(lessonId) {
+
+ showDialog('introductionDialog', {
+ 'height' : 450,
+ 'width' : Math.max(380, Math.min(800, $(window).width() - 60)),
+ 'resizable' : false,
+ 'title' : LABELS.LESSON_INTRODUCTION,
+ 'open' : function(){
+ $('iframe', this).attr('src', LAMS_URL + 'editLessonIntro/edit.do?lessonID='+lessonId);
+ $('iframe', this).css('height', '360px');
+ },
+ 'close' : function(){
+ closeIntroductionDialog()
+ }
+ }, false);
+}
+
+function closeIntroductionDialog() {
+ $('#introductionDialog').remove();
+}
+
+/**
+ * Updates learner progress in sequence tab according to respose sent to refreshMonitor()
+ */
+function updateSequenceTab() {
+ if (sequenceRefreshInProgress) {
+ return;
+ }
+ sequenceRefreshInProgress = true;
+
+ drawLessonCompletionChart();
+
+ sequenceCanvas = $('#sequenceCanvas');
+ sequenceCanvas.css('visibility', 'hidden');
+
+ if (originalSequenceCanvas) {
+ // put bottom layer, LD SVG
+ sequenceCanvas.html(originalSequenceCanvas);
+ } else {
+ var exit = loadLearningDesignSVG();
+ if (exit) {
+ // when SVG gets re-created, this update method will be run again
+ sequenceRefreshInProgress = false;
+ return;
+ }
+ }
+
+ // clear all learner icons
+ $('.learner-icon, .more-learner-icon', '#canvas-container').remove();
+
+ var sequenceTopButtonsContainer = $('#sequenceTopButtonsContainer');
+ if ($('img#sequenceCanvasLoading', sequenceTopButtonsContainer).length == 0){
+ $('#sequenceCanvasLoading')
+ .clone().appendTo(sequenceTopButtonsContainer)
+ .css('display', 'block');
+ }
+
+ $.ajax({
+ dataType : 'json',
+ url : LAMS_URL + 'monitoring/monitoring/getLessonProgress.do',
+ cache : false,
+ data : {
+ 'lessonID' : lessonId,
+ 'searchedLearnerId' : sequenceSearchedLearner
+ },
+ success : function(response) {
+ // activities have uiids but no ids, set it here
+ $.each(response.activities, function(){
+ $('g[uiid="' + this.uiid + '"]', sequenceCanvas).attr('id', this.id);
+ });
+
+ // remove the loading animation
+ $('img#sequenceCanvasLoading', sequenceTopButtonsContainer).remove();
+
+ var learnerCount = 0;
+ $.each(response.activities, function(index, activity){
+ var activityGroup = $('g[id="' + activity.id + '"]', sequenceCanvas),
+ isGate = [3,4,5,14].indexOf(activity.type) > -1;
+
+ learnerCount += activity.learnerCount;
+
+ if (isGate) {
+ var gateClosedIcon = activityGroup.find('.gateClosed');
+
+ if (activity.gateOpen && gateClosedIcon.length > 0) {
+ if (!gateOpenIconData) {
+ // if SVG is not cached, get it synchronously
+ $.ajax({
+ url : LAMS_URL + gateOpenIconPath,
+ async : false,
+ dataType : 'text',
+ success : function(response) {
+ gateOpenIconData = response;
+ }
+ });
+ }
+
+ $(gateOpenIconData).clone().attr({
+ x : gateClosedIcon.attr('x'),
+ y : gateClosedIcon.attr('y'),
+ width : gateClosedIcon.attr('width'),
+ height : gateClosedIcon.attr('height'),
+ }).appendTo(activityGroup)
+ .show();
+
+ gateClosedIcon.remove();
+ } else {
+ gateClosedIcon.show();
+ }
+ }
+
+ if (response.contributeActivities) {
+ $.each(response.contributeActivities, function(){
+ if (activity.id == this.activityID) {
+ activity.requiresAttention = true;
+ return false;
+ }
+ });
+ }
+
+ // put learner and attention icons on each activity shape
+ addActivityIcons(activity);
+ });
+
+ // modyfing SVG in DOM does not render changes, so we need to reload it
+ sequenceCanvas.html(sequenceCanvas.html());
+
+ // only now show SVG so there is no "jump" when resizing
+ sequenceCanvas.css('visibility', 'visible');
+
+ if (sequenceSearchedLearner != null && !response.searchedLearnerFound) {
+ // the learner has not started the lesson yet, display an info box
+ sequenceClearSearchPhrase();
+ showToast(LABELS.PROGRESS_NOT_STARTED);
+ }
+
+ var learnerTotalCount = learnerCount + response.completedLearnerCount;
+ // $('#learnersStartedPossibleCell').html(''+learnerTotalCount + ' / ' + response.numberPossibleLearners+'');
+ addCompletedLearnerIcons(response.completedLearners, response.completedLearnerCount, learnerTotalCount);
+
+ $.each(response.activities, function(activityIndex, activity){
+ addActivityIconsHandlers(activity);
+
+ if (activity.url) {
+ var activityGroup = $('g[id="' + activity.id + '"]');
+ activityGroup.css('cursor', 'pointer');
+ dblTap(activityGroup, function(){
+ // double click on activity shape to open Monitoring for this activity
+ openPopUp(LAMS_URL + activity.url, "MonitorActivity", popupHeight, popupWidth, true, true);
+ });
+ }
+ });
+
+ // remove any existing popovers
+ $('.popover[role="tooltip"]').remove();
+
+ initializePortraitPopover(LAMS_URL, 'large', 'right');
+
+ // update the cache global values so that the contributions & the Live Edit buttons will update
+ lockedForEdit = response.lockedForEdit;
+ lockedForEditUserId = response.lockedForEditUserId;
+ lockedForEditUsername = response.lockedForEditUsername;
+ updateLiveEdit();
+
+ sequenceRefreshInProgress = false;
+ }
+ });
+}
+
+function updateLiveEdit() {
+ if ( liveEditEnabled ) {
+ if ( lockedForEdit ) {
+ if ( userId == lockedForEditUserId ) {
+ $("#liveEditButton").removeClass('btn-default');
+ $("#liveEditButton").addClass('btn-primary');
+ $("#liveEditButton").show();
+ $("#liveEditWarning").hide();
+ $("#liveEditWarning").text("");
+ } else {
+ $("#liveEditButton").removeClass('btn-primary');
+ $("#liveEditButton").addClass('btn-default');
+ $("#liveEditButton").hide();
+ $("#liveEditWarning").text(LABELS.LIVE_EDIT_WARNING.replace("%0",lockedForEditUsername));
+ $("#liveEditWarning").show();
+ }
+ } else {
+ $("#liveEditButton").removeClass('btn-primary');
+ $("#liveEditButton").addClass('btn-default');
+ $("#liveEditButton").show();
+ $("#liveEditWarning").hide();
+ $("#liveEditWarning").text("");
+ }
+ } else {
+ $("#liveEditButton").hide();
+ $("#liveEditWarning").hide();
+ }
+}
+
+function loadLearningDesignSVG() {
+ var exit = false;
+ // fetch SVG just once, since it is immutable
+ $.ajax({
+ dataType : 'text',
+ url : LAMS_URL + 'home/getLearningDesignThumbnail.do?',
+ async : false,
+ cache : false,
+ data : {
+ 'ldId' : ldId
+ },
+ success : function(response) {
+ originalSequenceCanvas = response;
+ sequenceCanvas = $('#sequenceCanvas').html(originalSequenceCanvas);
+ },
+ error : function(error) {
+ exit = true;
+ // the LD SVG is missing, try to re-generate it; if it is an another error, fail
+ if (error.status != 404) {
+ return;
+ }
+
+ // iframe just to load Authoring for a single purpose, generate the SVG
+ var frame = $('').appendTo('body').css('visibility', 'hidden');
+ frame.on('load', function(){
+ // disable current onload handler as closing the dialog reloads the iframe
+ frame.off('load');
+
+ // call svgGenerator.jsp code to store LD SVG on the server
+ var win = frame[0].contentWindow || frame[0].contentDocument;
+ $(win.document).ready(function(){
+ // when LD opens, make a callback which save the thumbnail and displays it in current window
+ win.GeneralLib.openLearningDesign(ldId, function(){
+ result = win.GeneralLib.saveLearningDesignImage();
+ frame.remove();
+ if (result) {
+ // load the image again
+ updateSequenceTab();
+ }
+ });
+ });
+ });
+ // load svgGenerator.jsp to render LD SVG
+ frame.attr('src', LAMS_URL + 'authoring/generateSVG.do?selectable=false');
+ }
+ });
+
+ return exit;
+}
+
+
+/**
+ * Forces given learners to move to activity indicated on SVG by coordinated (drag-drop)
+ */
+function forceComplete(currentActivityId, learners, x, y) {
+ var foundActivities = [],
+ targetActivity = null,
+ // if "true", then we are moving all learners from the given activity
+ // otherwise it is a list of selected learners IDs
+ moveAll = learners === true;
+ // check all activities and "users who finished lesson" bar
+ $('g.svg-activity', sequenceCanvas).add('#completedLearnersContainer').each(function(){
+ // find which activity learner was dropped on
+ var act = $(this),
+ coord = {
+ 'x' : act.offset().left,
+ 'y' : act.offset().top
+ }
+ if (act.is('g')) {
+ var box = act[0].getBBox();
+ coord.width = box.width;
+ coord.height = box.height;
+ } else {
+ // end of lesson container
+ coord.width = act.width();
+ coord.height = act.height();
+ }
+
+ coord.x2 = coord.x + coord.width;
+ coord.y2 = coord.y + coord.height;
+
+ if (x >= coord.x && x <= coord.x2 && y >= coord.y && y <= coord.y2) {
+ foundActivities.push(act);
+ }
+ });
+
+ $.each(foundActivities, function(){
+ if (this.hasClass('svg-activity-floating')) {
+ // no force complete to support activities
+ targetActivity = null;
+ return false;
+ }
+ // the enveloping OptionalActivity has priority
+ if (targetActivity == null || this.hasClass('svg-activity-optional')) {
+ targetActivity = this;
+ }
+ });
+
+ if (!targetActivity) {
+ return;
+ }
+
+ var targetActivityId = null,
+ executeForceComplete = false,
+ isEndLesson = !targetActivity.is('g'),
+ learnerNames = '';
+
+ if (!moveAll) {
+ $.each(learners, function(){
+ learnerNames += this.name + ', ';
+ });
+ learnerNames = '"' + learnerNames.slice(0, -2) + '"';
+ }
+
+
+ if (isEndLesson) {
+ if (currentActivityId) {
+ showConfirm(LABELS.FORCE_COMPLETE_END_LESSON_CONFIRM.replace('[0]', learnerNames), function() {
+ forceCompleteExecute(moveAll ? null : learners, moveAll ? currentActivityId : null, targetActivityId, false);
+ });
+ }
+ return;
+ }
+
+ var targetActivityId = +targetActivity.attr('id');
+ if (currentActivityId != targetActivityId) {
+ var targetActivityName = targetActivity.hasClass('svg-activity-gate') ? "Gate" : targetActivity.find('.svg-activity-title-label').text(),
+ moveBackwards = currentActivityId == null;
+
+ // check if target activity is before current activity
+ if (currentActivityId) {
+ $.ajax({
+ dataType : 'text',
+ url : LAMS_URL + 'monitoring/monitoring/isActivityPreceding.do',
+ async : false,
+ cache : false,
+ data : {
+ 'activityA' : targetActivityId,
+ 'activityB' : currentActivityId
+ },
+ success : function(response) {
+ moveBackwards = response == 'true';
+ }
+ });
+ }
+
+ // check if the target activity was found or we are moving the learner from end of lesson
+ if (moveBackwards) {
+ // move the learner backwards
+ var msgString = LABELS.FORCE_COMPLETE_REMOVE_CONTENT
+ .replace('[0]', learnerNames).replace('[1]', targetActivityName);
+ $('#forceBackwardsMsg', '#forceBackwardsDialog').html(msgString);
+ $('#forceBackwardsDialog').data({
+ 'learners' : learners,
+ 'currentActivityId' : currentActivityId,
+ 'activityId': targetActivityId});
+ $('#forceBackwardsDialog').modal('show');
+ return;
+ }
+
+ // move the learner forward
+ showConfirm(LABELS.FORCE_COMPLETE_ACTIVITY_CONFIRM.replace('[0]', learnerNames).replace('[1]', targetActivityName), function() {
+ forceCompleteExecute(moveAll ? null : learners, moveAll ? currentActivityId : null, targetActivityId, false);
+ });
+ }
+}
+
+
+/**
+ * Tell server to force complete the learner.
+ */
+function forceCompleteExecute(learners, moveAllFromActivityId, activityId, removeContent) {
+ var learnerIds = '';
+ if (learners) {
+ $.each(learners, function() {
+ learnerIds += this.id + ',';
+ });
+ learnerIds = learnerIds.slice(0, -1);
+ }
+
+ var data={
+ 'lessonID' : lessonId,
+ // either we list selected learners to move
+ // or we move all learners from the given activity
+ 'learnerID' : learnerIds,
+ 'moveAllFromActivityID' : moveAllFromActivityId,
+ 'activityID' : activityId,
+ 'removeContent' : removeContent
+ };
+ data[csrfTokenName] = csrfTokenValue;
+
+ $.ajax({
+ url : LAMS_URL + 'monitoring/monitoring/forceComplete.do',
+ type : 'POST',
+ dataType : 'text',
+ cache : false,
+ data : data,
+ success : function(response) {
+ // inform user of result
+ showToast(response);
+
+ // progress changed, show it to monitor
+ refreshMonitor();
+ }
+ });
+}
+
+
+/**
+ * Draw user and attention icons on top of activities.
+ */
+function addActivityIcons(activity) {
+ if (activity.learnerCount == 0 && !activity.requiresAttention) {
+ return;
+ }
+
+ // fint the activity in SVG
+ var coord = getActivityCoordinates(activity);
+ if (!coord) {
+ return;
+ }
+
+ // add group of users icon
+ var learningDesignSvg = $('svg.svg-learning-design', sequenceCanvas),
+ isTool = activity.type == 1,
+ isGrouping = activity.type == 2,
+ // branching and gates require extra adjustments
+ isBranching = [10,11,12,13].indexOf(activity.type) > -1,
+ isGate = [3,4,5,14].indexOf(activity.type) > -1,
+ isContainer = [6,7].indexOf(activity.type) > -1,
+ activityGroup = $('g[id="' + activity.id + '"]', learningDesignSvg),
+ requiresAttentionIcon = activity.requiresAttention ?
+ $('![]()
')
+ .attr({
+ 'id' : 'act' + activity.id + 'attention',
+ 'src' : LAMS_URL + 'images/exclamation.svg',
+ 'title' : LABELS.CONTRIBUTE_ATTENTION
+ })
+ .addClass('activity-requires-attention')
+ : null,
+ allLearnersIcon = activity.learnerCount > 0 ?
+ $('')
+ .attr('id', 'act' + activity.id + 'learnerGroup')
+ .addClass('more-learner-icon')
+ : null;
+
+
+ if (isTool || isGrouping) {
+ if (activity.learnerCount > 0) {
+ // if learners reached the activity, make room for their icons: make activity icon and label smaller and move to top
+ $('svg', activityGroup).attr({
+ 'x' : coord.x + 20,
+ 'y' : coord.y + 3,
+ 'width' : '30px',
+ 'height': '30px'
+ });
+
+ // switch from wide banner to narrow one
+ $('.svg-tool-banner-narrow', activityGroup).show();
+ $('.svg-tool-banner-wide', activityGroup).hide();
+
+ $('.svg-activity-title-label', activityGroup).parent('foreignObject').remove();
+ $('').text(activity.title.length < 20 ? activity.title : activity.title.substring(0, 20) + '...')
+ .attr({
+ 'x' : coord.x + 55,
+ 'y' : coord.y + 20
+ })
+ .addClass('svg-activity-title-label svg-activity-title-label-small')
+ .appendTo(activityGroup);
+
+ var learnersContainer = $('').addClass('learner-icon-container');
+ $('![]()
').attr('src', LAMS_URL + iconURL).appendTo(icon);
+ }
+
+ if (typeof activity.mark !== 'undefined') {
+ markCell.text(activity.mark + (activity.maxMark ? ' / ' + activity.maxMark : ''));
+ } else {
+ markCell.closest('tr').remove();
+ }
+
+ if (activity.duration) {
+ durationCell.text(activity.duration);
+ } else {
+ durationCell.closest('tr').remove();
+ }
+ });
+
+ timelineContainer.show();
+}
+
+/**
+ * Clears previous run search for phrase, in Learners tab.
+ */
+function learnersClearSearchPhrase(){
+ $('#learnersSearchPhrase').val('').autocomplete("close");
+ loadLearnerProgressPage(1, '');
+ $('#learnersSearchPhraseClear').hide();
+}
+
+/**
+ * Clears previous run search for phrase, in Edit Class dialog.
+ */
+function classClearSearchPhrase(){
+ var dialog = $('#classDialog');
+ $('.dialogSearchPhrase', dialog).val('').autocomplete("close");
+ dialog.data('LearnerAjaxProperties').data.pageNumber = 1;
+ showClassDialog('Learner');
+ $('.dialogSearchPhraseClear', dialog).css('visibility', 'hidden');
+}
+
+
+/**
+ * Clears previous run search for phrase, in Learner Group dialogs.
+ */
+function learnerGroupClearSearchPhrase(){
+ var dialog = $('#learnerGroupDialog');
+ $('.dialogSearchPhrase', dialog).val('').autocomplete("close");
+ dialog.data('ajaxProperties').data.pageNumber = 1;
+ showLearnerGroupDialog();
+ $('.dialogSearchPhraseClear', dialog).css('visibility', 'hidden');
+}
+//********** GRADEBOOK TAB FUNCTIONS **********
+
+/**
+ * Inits Gradebook Tab.
+ */
+function initGradebookTab() {
+ /*
+ $.extend(true, $.jgrid.icons, {
+ fontAwesome6: $.extend(true, {}, $.jgrid.icons.fontAwesome, {
+ nav: { del: "fa-times" },
+ actions: { del: "fa-times" },
+ form: { del: "fa-times" }
+ })
+ $.extend(true, $.jgrid.icons.fontAwesome, {
+ common : "fa-solid"
+ });
+ });
+ */
+
+ $.extend(true, $.jgrid.guiStyles.bootstrap4, {
+ pager : {
+ pagerSelect : 'form-control-select'
+ },
+ searchToolbar : {
+ clearButton : 'btn btn-sm'
+ }
+ });
+
+ const gradebooksUpdateSource = new EventSource(LAMS_URL + 'monitoring/monitoring/getGradebookUpdateFlux.do?lessonId=' + lessonId);
+ gradebooksUpdateSource.onmessage = function (event) {
+ if ("doRefresh" == event.data && $('#gradebookDiv').length === 1){
+ let expandedGridIds = [],
+ userGrid = $('#userView'),
+ activityGrid = $('#activityView');
+ // do not update if grid is being edited by the teacher
+ if (userGrid.data('isCellEdited') === true || activityGrid.data('isCellEdited') === true) {
+ return;
+ }
+
+ $("tr:has(.sgexpanded)", userGrid).each(function () {
+ let num = $(this).attr('id');
+ expandedGridIds.push(num);
+ });
+ userGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid");
+
+ expandedGridIds = [];
+ $("tr:has(.sgexpanded)", activityGrid).each(function () {
+ let num = $(this).attr('id');
+ expandedGridIds.push(num);
+ });
+ activityGrid.data('expandedGridIds', expandedGridIds).trigger("reloadGrid");
+ }
+ };
+}
+
+/**
+ * Refreshes Gradebook Tab.
+ */
+function updateGradebookTab() {
+ $("#gradebookLoading").show();
+ $("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?isTab=true&lessonID=' + lessonId, function() {
+ $("#gradebookLoading").hide();
+ });
+}
+
+function fixPagerInCenter(pagername, numcolshift) {
+ $('#'+pagername+'_right').css('display','inline');
+ if ( numcolshift > 0 ) {
+ var marginshift = - numcolshift * 12;
+ $('#'+pagername+'_center table').css('margin-left', marginshift+'px');
+ }
+}
+
+
+var popupWidth = 1280,
+ popupHeight = 720;
+
+// launches a popup from the page
+function launchPopup(url,title) {
+ var wd = null;
+ if(wd && wd.open && !wd.closed){
+ wd.close();
+ }
+
+ var left = ((screen.width / 2) - (popupWidth / 2));
+ var top = ((screen.height / 2) - (popupHeight / 2));
+
+ wd = window.open(url,title,'resizable,width='+popupWidth+',height='+popupHeight
+ +',scrollbars'
+ + ",top=" + top + ",left=" + left);
+ wd.window.focus();
+}
+
+/* gradebook dialog windows on the ipad do not update the grid width properly using setGridWidth. Calling this is
+-- setting the grid to parentWidth-1 and the width of the parent to parentWidth+1, leading to growing width window
+-- that overflows the dialog window. Keep the main grids slightly smaller than their containers and all is well.
+*/
+
+function resizeJqgrid(jqgrids) {
+ jqgrids.each(function(index) {
+ var gridId = $(this).attr('id');
+ var parent = jQuery('#gbox_' + gridId).parent();
+ var gridParentWidth = parent.width();
+ if ( parent.hasClass('grid-holder') ) {
+ gridParentWidth = gridParentWidth - 2;
+ }
+ jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+ });
+}
+
+
+/* Based on jqgrid internal functions */
+function displayCellErrorMessage(table, iRow, iCol, errorLabel, errorMessage, buttonText ) {
+ setTimeout(function () {
+ try {
+ var frozenRows = table.grid.fbRows,
+ tr = table.rows[iRow];
+ tr = frozenRows != null && frozenRows[0].cells.length > iCol ? frozenRows[tr.rowIndex] : tr;
+ var td = tr != null && tr.cells != null ? $(tr.cells[iCol]) : $(),
+ rect = td[0].getBoundingClientRect();
+ $.jgrid.info_dialog.call(table, errorLabel, errorMessage, buttonText, {left:rect.left-200, top:rect.top});
+ } catch (e) {
+ alert(errorMessage);
+ }
+ }, 50);
+}
+
+function blockExportButton(areaToBlock, exportExcelUrl) {
+ var token = new Date().getTime(),
+ area = $('#' + areaToBlock).css('cursor', 'wait'),
+ buttons = $('.btn', area).prop('disabled', true),
+ form = $('');
+
+ fileDownloadCheckTimer = window.setInterval(function () {
+ var cookieValue = $.cookie('fileDownloadToken');
+ if (cookieValue == token) {
+ //unBlock export button
+ window.clearInterval(fileDownloadCheckTimer);
+ $.cookie('fileDownloadToken', null); //clears this cookie value
+
+ area.css('cursor', 'auto');
+ buttons.prop('disabled', false);
+ form.remove();
+ }
+ }, 1000);
+
+ //dynamically create a form and submit it
+ form.attr("method", "post");
+ form.attr("action", exportExcelUrl);
+
+ var hiddenField = $('');
+ hiddenField.attr("type", "hidden");
+ hiddenField.attr("name", "downloadTokenValue");
+ hiddenField.attr("value", token);
+ form.append(hiddenField);
+
+ // The form needs to be a part of the document in order to be submitted
+ $(document.body).append(form);
+ form.submit();
+
+ return false;
+}
+
+//********** COMMON FUNCTIONS **********
+
+
+// generic function for opening a pop up
function openPopUp(url, title, h, w, status, forceNewWindow) {
var width = screen.width;
@@ -146,4 +2675,379 @@
+ ",resizable=yes,scrollbars=yes,status=" + status
+ ",menubar=no, toolbar=no"
+ ",top=" + top + ",left=" + left);
-}
\ No newline at end of file
+}
+
+/**
+ * Updates all changeable elements of monitoring screen.
+ */
+function refreshMonitor(){
+ let tabName = 'sequence';
+ if ($('#learners-accordion').length === 1) {
+ tabName = 'learners';
+ } else if ($('#gradebookDiv').length === 1){
+ tabName = 'gradebook';
+ }
+
+ if (tabName == 'sequence'){
+ updateSequenceTab();
+ } else if (tabName == 'learners'){
+ updateLearnersTab();
+ } else if (tabName == 'gradebook'){
+ updateGradebookTab();
+ }
+}
+
+
+/**
+ * Tells parent document to close this Monitor dialog.
+ */
+function closeMonitorLessonDialog(refresh) {
+ //check method is available in order to avoid JS errors (as it's not available from integrations)
+ if (typeof window.parent.closeDialog === "function") {
+ window.parent.closeDialog('dialogMonitorLesson' + lessonId, refresh);
+ }
+}
+
+/**
+ * Show a dialog with user list and optional Force Complete and View Learner buttons.
+ */
+function showLearnerGroupDialog(ajaxProperties, dialogTitle, allowSearch, allowForceComplete, allowView, allowEmail) {
+ var learnerGroupDialog = $('#learnerGroupDialog'),
+ learnerGroupList = $('.dialogList', learnerGroupDialog).empty(),
+ // no parameters provided? just work on what we saved
+ isRefresh = ajaxProperties == null,
+ learners = null,
+ learnerCount = null;
+
+ if (isRefresh) {
+ // ajax and other properties were saved when the dialog was opened
+ ajaxProperties = learnerGroupDialog.data('ajaxProperties');
+ allowForceComplete = learnerGroupDialog.data('allowForceComplete');
+ allowView = learnerGroupDialog.data('allowView');
+ allowEmail = learnerGroupDialog.data('allowEmail');
+ allowSearch = $('#learnerGroupSearchRow', learnerGroupDialog).is(':visible');
+ } else {
+ // add few standard properties to ones provided by method calls
+ ajaxProperties = $.extend(true, ajaxProperties, {
+ dataType : 'json',
+ cache : false,
+ async : false,
+ data : {
+ 'pageNumber' : 1,
+ 'orderAscending' : true
+ }
+ });
+
+ $('#learnerGroupSearchRow', learnerGroupDialog).css('display', allowSearch ? 'table-row' : 'none');
+ }
+
+ var pageNumber = ajaxProperties.data.pageNumber;
+
+ // set values for current variable instances
+ ajaxProperties.success = function(response) {
+ learners = response.learners;
+ learnerCount = response.learnerCount;
+ };
+
+ var searchPhrase = allowSearch ? $('.dialogSearchPhrase', learnerGroupDialog).val().trim() : null;
+ ajaxProperties.data.searchPhrase = searchPhrase;
+
+ // make the call
+ $.ajax(ajaxProperties);
+
+ // did all users already drift away to an another activity or there was an error?
+ // close the dialog and refresh the main screen
+ if (!learnerCount && !searchPhrase) {
+ if (isRefresh) {
+ learnerGroupDialog.modal('hide');
+ }
+ updateSequenceTab();
+ return;
+ }
+
+ // did some users already drift away to an another activity?
+ // move back until you get a page with any users
+ var maxPageNumber = Math.ceil(learnerCount / 10);
+ if (maxPageNumber > 0 && pageNumber > maxPageNumber) {
+ shiftLearnerGroupList(-1);
+ return;
+ }
+
+ // hide unnecessary controls
+ togglePagingCells(learnerGroupDialog, pageNumber, maxPageNumber);
+
+ $.each(learners, function(learnerIndex, learner) {
+ var viewUrl = allowView ? LAMS_URL + 'monitoring/monitoring/getLearnerActivityURL.do?userID='
+ + learner.id + '&activityID=' + ajaxProperties.data.activityID + '&lessonID=' + lessonId
+ : null,
+ learnerDiv = $('').attr({
+ 'userId' : learner.id,
+ 'viewUrl' : viewUrl
+ })
+ .addClass('dialogListItem')
+ .appendTo(learnerGroupList),
+ portraitDiv = $('').attr({
+ 'id': 'user-'+learner.id,
+ })
+ .addClass('roffset5')
+ .appendTo(learnerDiv);
+ addPortrait( portraitDiv, learner.portraitId, learner.id, 'small', true, LAMS_URL );
+ $('').html(getLearnerDisplayName(learner))
+ .addClass('portrait-sm-lineheight')
+ .appendTo(learnerDiv);
+
+ if (allowForceComplete || allowView || allowEmail) {
+ learnerDiv.click(function(event){
+ // select the learner
+ var learnerDiv = $(this),
+ selectedSiblings = learnerDiv.siblings('div.dialogListItem.dialogListItemSelected');
+ // enable buttons
+ $('button.learnerGroupDialogSelectableButton', learnerGroupDialog).prop('disabled', false);
+
+ if (allowForceComplete && (event.metaKey || event.ctrlKey)) {
+ var isSelected = learnerDiv.hasClass('dialogListItemSelected');
+ if (isSelected) {
+ // do not un-select last learner
+ if (selectedSiblings.length > 0) {
+ learnerDiv.removeClass('dialogListItemSelected')
+ }
+ } else {
+ learnerDiv.addClass('dialogListItemSelected');
+ }
+ if (selectedSiblings.length + (isSelected ? 0 : 1) > 1) {
+ // disable view button - only one learner can be viewed and multiple are selected
+ $('button#learnerGroupDialogViewButton', learnerGroupDialog).prop('disabled', true);
+ }
+ } else {
+ learnerDiv.addClass('dialogListItemSelected');
+ // un-select other learners
+ selectedSiblings.removeClass('dialogListItemSelected');
+ }
+ });
+ if (allowView){
+ dblTap(learnerDiv, function(){
+ // same as clicking View Learner button
+ openPopUp(viewUrl, "LearnActivity", popupHeight, popupWidth, true);
+ });
+ }
+ }
+ });
+
+ colorDialogList(learnerGroupDialog);
+
+ if (!isRefresh) {
+ // show buttons and labels depending on parameters
+ $('span#learnerGroupMultiSelectLabel, button#learnerGroupDialogForceCompleteButton, button#learnerGroupDialogForceCompleteAllButton', learnerGroupDialog)
+ .css('display', allowForceComplete ? 'inline' : 'none');
+ $('button#learnerGroupDialogViewButton', learnerGroupDialog)
+ .css('display', allowView ? 'inline' : 'none');
+ $('button#learnerGroupDialogEmailButton', learnerGroupDialog)
+ .css('display', allowEmail ? 'inline' : 'none');
+
+ $('.modal-title', learnerGroupDialog).text(dialogTitle);
+ learnerGroupDialog.data({
+ // save properties for refresh
+ 'ajaxProperties' : ajaxProperties,
+ 'allowForceComplete' : allowForceComplete,
+ 'allowView' : allowView,
+ 'allowEmail' : allowEmail
+ })
+ .modal('show');
+ }
+}
+
+
+/**
+ * Formats learner name.
+ */
+function getLearnerDisplayName(learner, raw) {
+ return raw ? learner.lastName + ', ' + learner.firstName + ' (' + learner.login + ')' + (learner.group ? ' - ' + learner.group : '')
+ : escapeHtml(learner.lastName) + ', ' + escapeHtml(learner.firstName) + ' (' + escapeHtml(learner.login) + ')'
+ + (learner.group ? ' - ' + escapeHtml(learner.group) : '');
+}
+
+
+/**
+ * Escapes HTML tags to prevent XSS injection.
+ */
+function escapeHtml(unsafe) {
+ if (unsafe == undefined) {
+ return "";
+ }
+
+ return unsafe
+ .replace(/&/g, "&")
+ .replace(//g, ">")
+ .replace(/"/g, """)
+ .replace(/'/g, "'");
+}
+
+
+/**
+ * Change order of learner sorting in group dialog.
+ */
+function sortLearnerGroupList() {
+ var learnerGroupDialog = $('#learnerGroupDialog'),
+ sortIcon = $('td.sortCell span', learnerGroupDialog),
+ ajaxProperties = learnerGroupDialog.data('ajaxProperties'),
+ // reverse current order after click
+ orderAscending = !ajaxProperties.data.orderAscending;
+
+ if (orderAscending) {
+ sortIcon.removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-n');
+ } else {
+ sortIcon.removeClass('ui-icon-triangle-1-n').addClass('ui-icon-triangle-1-s');
+ }
+
+ ajaxProperties.data.orderAscending = orderAscending;
+ // refresh the list
+ showLearnerGroupDialog();
+ }
+
+/**
+ * Change order of learner sorting in Edit Class dialog.
+ */
+function sortClassList(role) {
+ var classDialog = $('#classDialog'),
+ table = $('#class' + role + 'Table', classDialog),
+ sortIcon = $('td.sortCell span', table),
+ ajaxProperties = classDialog.data(role + 'AjaxProperties'),
+ // reverse current order after click
+ orderAscending = !ajaxProperties.data.orderAscending;
+
+ if (orderAscending) {
+ sortIcon.removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-n');
+ } else {
+ sortIcon.removeClass('ui-icon-triangle-1-n').addClass('ui-icon-triangle-1-s');
+ }
+
+ ajaxProperties.data.orderAscending = orderAscending;
+ // refresh the list
+ showClassDialog(role);
+}
+
+/**
+ * Colours a list of users
+ */
+function colorDialogList(parent) {
+ $('.dialogList div.dialogListItem', parent).each(function(userIndex, userDiv){
+ // every odd learner has different background
+ $(userDiv).css('background-color', userIndex % 2 ? '#f5f5f5' : 'inherit');
+ });
+}
+
+/**
+* Change page in the group dialog.
+*/
+function shiftLearnerGroupList(shift) {
+ var learnerGroupDialog = $('#learnerGroupDialog'),
+ ajaxProperties = learnerGroupDialog.data('ajaxProperties'),
+ pageNumber = ajaxProperties.data.pageNumber + shift;
+ if (pageNumber < 0) {
+ pageNumber = 1;
+ }
+ ajaxProperties.data.pageNumber = pageNumber;
+ // refresh the dialog with new parameters
+ showLearnerGroupDialog();
+}
+
+/**
+* Change page in the Edit Class dialog.
+*/
+function shiftClassList(role, shift) {
+ var classDialog = $('#classDialog'),
+ ajaxProperties = classDialog.data(role + 'AjaxProperties'),
+ pageNumber = ajaxProperties.data.pageNumber + shift;
+ if (pageNumber < 0) {
+ pageNumber = 1;
+ }
+ ajaxProperties.data.pageNumber = pageNumber;
+ // refresh the dialog with new parameters
+ showClassDialog(role);
+}
+
+
+/**
+ * Hides/shows paging controls
+ */
+function togglePagingCells(parent, pageNumber, maxPageNumber) {
+ if (pageNumber + 10 <= maxPageNumber) {
+ $('td.pagePlus10Cell', parent).css('visibility', 'visible');
+ } else {
+ $('td.pagePlus10Cell', parent).css('visibility', 'hidden');
+ }
+ if (pageNumber - 10 < 1) {
+ $('td.pageMinus10Cell', parent).css('visibility', 'hidden');
+ } else {
+ $('td.pageMinus10Cell', parent).css('visibility', 'visible');
+ }
+ if (pageNumber + 1 <= maxPageNumber) {
+ $('td.pagePlus1Cell', parent).css('visibility', 'visible');
+ } else {
+ $('td.pagePlus1Cell', parent).css('visibility', 'hidden');
+ }
+ if (pageNumber - 1 < 1) {
+ $('td.pageMinus1Cell', parent).css('visibility', 'hidden');
+ } else {
+ $('td.pageMinus1Cell', parent).css('visibility', 'visible');
+ }
+ if (maxPageNumber < 2) {
+ $('td.pageCell', parent).css('visibility', 'hidden');
+ } else {
+ $('td.pageCell', parent).css('visibility', 'visible').text(pageNumber + ' / ' + maxPageNumber);
+ }
+}
+
+function showToast(text) {
+ let toast = $('#toast-template').clone().attr('id', null).appendTo('#toast-container');
+ toast.find('.toast-body', toast).text(text);
+ toast = new bootstrap.Toast(toast[0]);
+ toast.show();
+}
+
+function showConfirm(body, callback) {
+ let dialog = $('#confirmationDialog');
+ $('.modal-body', dialog).html(body);
+
+ $("#confirmationDialogConfirmButton").off('click').on("click", function(){
+ callback(true);
+ dialog.modal('hide');
+ });
+
+ $("#confirmationDialogCancelButton").off('click').on("click", function(){
+ dialog.modal('hide');
+ });
+
+ dialog.modal('show');
+}
+
+/**
+ * Works as dblclick for mobile devices.
+ */
+function dblTap(elem, dblClickFunction) {
+ // double tap detection on mobile devices; it works also for mouse clicks
+ // temporarly switched to click as jQuery mobile was removed for bootstrapping
+ elem.click(function(event) {
+ // was the second click quick enough after the first one?
+ var currentTime = new Date().getTime(),
+ tapLength = currentTime - lastTapTime;
+ lastTapTime = currentTime;
+
+ if (lastTapTarget && lastTapTarget.classList.contains('learner-icon') && tapLength < 10) {
+ // after clicking learner icon there is a propagation to activity, which must be ignored
+ // we can not stop propagation completetly as force complete stops working
+ return;
+ }
+
+ // is the second click on the same element as the first one?
+ if (event.currentTarget == lastTapTarget) {
+ if (tapLength < tapTimeout && tapLength > 0) {
+ event.preventDefault();
+ dblClickFunction(event);
+ }
+ }
+
+ lastTapTarget = event.currentTarget;
+ });
+}
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -r0f85998fe3695d15ad685d2564e0b12f331f5b7d -recc49cd6851b43f37ef02c2ddb85257096e2cf49
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision 0f85998fe3695d15ad685d2564e0b12f331f5b7d)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision ecc49cd6851b43f37ef02c2ddb85257096e2cf49)
@@ -12,12 +12,20 @@
+
@@ -177,12 +212,6 @@
-
-
-
- ${lesson.lessonName}
-
-
|
- |
+ |
- |
- |
-
+ |
+ ||
|---|---|---|---|---|---|---|
|
- font-weight-bold"
- data-portrait="${userDto.portraitUuid}" data-fullname="${userDto.lastName}, ${userDto.firstName}">
- ${userDto.lastName}, ${userDto.firstName}
-
- |
+ |
+ |
|
- - ${groupDto.traScore} - + + |
+ |
+
+
+ |
+
|
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -307,7 +650,7 @@
+
+
+
+
+
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
|---|---|---|
|
+ |
+
+
+ |
+
+
+
+ |
+
|
+ |
+
+
+ |
+