Index: lams_tool_kaltura/.gitignore =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/.gitignore (.../.gitignore) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_kaltura/.gitignore (.../.gitignore) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -1,3 +1,2 @@ /bin/ /build/ -/.sass-cache/ Index: lams_tool_kaltura/build.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/build.properties (.../build.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_kaltura/build.properties (.../build.properties) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -3,5 +3,5 @@ signature=lakalt11 tool.version=20170101 -tool.hide=true +tool.hide=false tool.short.name=kaltura Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaComment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaItemVisitLog.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaRating.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/hibernate/mappings/org/lamsfoundation/lams/tool/kaltura/model/KalturaUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_kaltura/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -1,12 +1,3 @@ -appName = notebook -#language code: en -#locale code: AU - - - -#=================== labels for Notebook =================# - - - - -#======= End labels: Exported 113 labels for en AU ===== +appName = notebook +tool.display.name =Kaltura +activity.title =Kaltura Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/conf/language/lams/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql (.../create_lams_tool_kaltura.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_kaltura/db/sql/create_lams_tool_kaltura.sql (.../create_lams_tool_kaltura.sql) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -1,149 +1,3 @@ +-- file must not be empty and it must contain update statements (not select) SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE tl_lakalt11_kaltura ( - uid BIGINT NOT NULL AUTO_INCREMENT, - create_date DATETIME, - update_date DATETIME, - create_by BIGINT, - title VARCHAR(255), - instructions TEXT, - lock_on_finished BIT, - allow_contribute_videos BIT, - allow_seeing_other_users_recordings BIT, - learner_contribution_limit integer DEFAULT -1, - allow_comments BIT, - allow_ratings BIT, - content_in_use BIT, - define_later BIT, - tool_content_id BIGINT, - submission_deadline DATETIME DEFAULT NULL, - reflect_on_activity BIT, - reflect_instructions TEXT, - PRIMARY KEY (uid) -); - -CREATE TABLE tl_lakalt11_session ( - uid BIGINT NOT NULL AUTO_INCREMENT, - session_end_date DATETIME, - session_start_date DATETIME, - status INTEGER, - session_id BIGINT, - session_name VARCHAR(250), - kaltura_uid BIGINT, - PRIMARY KEY (uid), - UNIQUE KEY session_id (session_id), - CONSTRAINT FK_NEW_1533935501_B7C198E2FC940906 FOREIGN KEY (kaltura_uid) - REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lakalt11_user ( - uid BIGINT NOT NULL AUTO_INCREMENT, - user_id BIGINT, - last_name VARCHAR(255), - login_name VARCHAR(255), - first_name VARCHAR(255), - finishedActivity BIT, - kaltura_session_uid BIGINT, - kaltura_uid BIGINT, - PRIMARY KEY (uid), - CONSTRAINT FK_tl_lakalt11_user_1 FOREIGN KEY (kaltura_session_uid) - REFERENCES tl_lakalt11_session (uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK_tl_lakalt11_user_2 FOREIGN KEY (kaltura_uid) - REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lakalt11_kaltura_item ( - uid bigint not null AUTO_INCREMENT, - entry_id VARCHAR(255), - title VARCHAR(255), - duration INTEGER, - create_by BIGINT, - create_date DATETIME, - create_by_author TINYINT(1), - sequence_id INTEGER, - is_hidden TINYINT(1), - kaltura_uid BIGINT, - mark BIGINT, - PRIMARY KEY (uid), - CONSTRAINT FK_tl_lakalt11_item_1 FOREIGN KEY (create_by) - REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT FK_tl_lakalt11_item_2 FOREIGN KEY (kaltura_uid) - REFERENCES tl_lakalt11_kaltura (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lakalt11_comment ( - uid BIGINT not null AUTO_INCREMENT, - comment TEXT, - kaltura_item_uid BIGINT, - create_by BIGINT, - create_date DATETIME, - is_hidden TINYINT(1), - PRIMARY KEY (uid), - CONSTRAINT FK_tl_lakalt11_comment_2 FOREIGN KEY (create_by) - REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE, - CONSTRAINT FK_tl_lakalt11_comment_3 FOREIGN KEY (kaltura_item_uid) - REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lakalt11_rating ( - uid BIGINT not null AUTO_INCREMENT, - rating FLOAT, - kaltura_item_uid BIGINT, - create_by BIGINT, - PRIMARY KEY (uid), - CONSTRAINT FK_tl_lakalt11_rating_2 FOREIGN KEY (create_by) - REFERENCES tl_lakalt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK_tl_lakalt11_rating_3 FOREIGN KEY (kaltura_item_uid) - REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - -CREATE TABLE tl_lakalt11_item_log ( - uid BIGINT not null AUTO_INCREMENT, - access_date DATETIME, - kaltura_item_uid BIGINT, - user_uid BIGINT, - complete TINYINT(1), - session_id BIGINT, - PRIMARY KEY (uid), - CONSTRAINT FK_tl_lakalt11_item_log_1 FOREIGN KEY (kaltura_item_uid) - REFERENCES tl_lakalt11_kaltura_item (uid) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT FK_tl_lakalt11_item_log_2 FOREIGN KEY (user_uid) - REFERENCES tl_lakalt11_user (uid) ON DELETE CASCADE ON UPDATE CASCADE -); - - -ALTER TABLE tl_lakalt11_kaltura ADD CONSTRAINT FK_NEW_174079131_89093BF758092FB FOREIGN KEY (create_by) - REFERENCES tl_lakalt11_user (uid) ON DELETE SET NULL ON UPDATE CASCADE; - - -INSERT INTO tl_lakalt11_kaltura ( - uid, - title, - instructions, - tool_content_id, - lock_on_finished, - allow_contribute_videos, - learner_contribution_limit, - content_in_use, - define_later, - allow_seeing_other_users_recordings, - allow_comments, - allow_ratings, - reflect_on_activity) -VALUES( - 1, - "Kaltura Video", - "Instructions", - ${default_content_id}, - 0, - 1, - -1, - 0, - 0, - 1, - 1, - 1, - 0 -); - SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_kaltura/db/sql/tool_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_kaltura/db/sql/tool_insert.sql (.../tool_insert.sql) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -13,7 +13,6 @@ learner_progress_url, author_url, monitor_url, -pedagogical_planner_url, help_url, language_file, create_date_time, @@ -35,8 +34,7 @@ 'tool/lakalt11/learning.do?mode=teacher', 'tool/lakalt11/authoring.do', 'tool/lakalt11/monitoring.do', -'tool/lakalt11/pedagogicalPlanner.do', -'http://wiki.lamsfoundation.org/display/lamsdocs/lakalt11', +'NULL', 'org.lamsfoundation.lams.tool.kaltura.ApplicationResources', NOW(), NOW(), Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaItemVisitDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/IKalturaUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaItemVisitDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaRatingDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dao/hibernate/KalturaUserDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20140102.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20150930.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20151217.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20170101.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20180425.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/AverageRatingDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/KalturaSessionDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/KalturaUserDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dto/NotebookEntryDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -4,107 +4,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - - - - - - - - org.lamsfoundation.lams.tool.kaltura.ApplicationResources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - PROPAGATION_REQUIRED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - kalturaworkspace - kaltura - lams-ex - - + + Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/Kaltura.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaComment.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaItem.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaItemVisitLog.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaRating.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/model/KalturaUser.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/IKalturaService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaOutputFactory.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -24,26 +24,11 @@ package org.lamsfoundation.lams.tool.kaltura.service; -import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; -import java.util.Set; import java.util.SortedMap; -import java.util.TreeSet; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; -import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; -import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -52,96 +37,22 @@ import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaCommentDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaItemDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaItemVisitDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaRatingDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaSessionDAO; -import org.lamsfoundation.lams.tool.kaltura.dao.IKalturaUserDAO; -import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO; -import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO; -import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaItemVisitLog; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaRating; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaException; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaImportContentVersionFilter; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator; -import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.MessageService; /** * An implementation of the IKalturaService interface. * * As a requirement, all LAMS tool's service bean must implement ToolContentManager and ToolSessionManager. */ +public class KalturaService implements ToolSessionManager, ToolContentManager { -public class KalturaService implements ToolSessionManager, ToolContentManager, IKalturaService { - - private static Logger logger = Logger.getLogger(KalturaService.class.getName()); - - private IKalturaDAO kalturaDao = null; - - private IKalturaItemDAO kalturaItemDao = null; - - private IKalturaItemVisitDAO kalturaItemVisitDao = null; - - private IKalturaCommentDAO kalturaCommentDao = null; - - private IKalturaRatingDAO kalturaRatingDao = null; - - private IKalturaSessionDAO kalturaSessionDao = null; - - private IKalturaUserDAO kalturaUserDao = null; - - private ILamsToolService toolService; - - private IUserManagementService userManagementService; - - private MessageService messageService; - - private IToolContentHandler kalturaToolContentHandler = null; - - private ILogEventService logEventService = null; - - private IExportToolContentService exportContentService; - - private ICoreNotebookService coreNotebookService; - - private KalturaOutputFactory kalturaOutputFactory; - - public KalturaService() { - super(); - } - - /* ************ Methods from ToolSessionManager ************* */ @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { - if (KalturaService.logger.isDebugEnabled()) { - KalturaService.logger.debug("entering method createToolSession:" + " toolSessionId = " + toolSessionId - + " toolSessionName = " + toolSessionName + " toolContentId = " + toolContentId); - } - - KalturaSession session = new KalturaSession(); - session.setSessionId(toolSessionId); - session.setSessionName(toolSessionName); - // learner starts - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - session.setKaltura(kaltura); - kalturaSessionDao.saveOrUpdate(session); } @Override public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { - return toolService.completeToolSession(toolSessionId, learnerId); + return null; } @Override @@ -158,617 +69,85 @@ @Override public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException { - kalturaSessionDao.deleteBySessionID(toolSessionId); } @Override public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { - return getKalturaOutputFactory().getToolOutput(names, this, toolSessionId, learnerId); + return null; } @Override public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { - return getKalturaOutputFactory().getToolOutput(name, this, toolSessionId, learnerId); + return null; } - + @Override public List getToolOutputs(String name, Long toolContentId) { return new ArrayList(); } - + @Override public List getConfidenceLevels(Long toolSessionId) { return null; } @Override public void forceCompleteUser(Long toolSessionId, User user) { - //no actions required } - /* ************ Methods from ToolContentManager ************************* */ - @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { - - if (KalturaService.logger.isDebugEnabled()) { - KalturaService.logger.debug("entering method copyToolContent:" + " fromContentId=" + fromContentId - + " toContentId=" + toContentId); - } - - if (toContentId == null) { - String error = "Failed to copy tool content: toContentID is null"; - throw new ToolException(error); - } - - Kaltura fromContent = null; - if (fromContentId != null) { - fromContent = kalturaDao.getByContentId(fromContentId); - } - if (fromContent == null) { - // create the fromContent using the default tool content - fromContent = getDefaultContent(); - } - Kaltura toContent = Kaltura.newInstance(fromContent, toContentId); - - Set items = toContent.getKalturaItems(); - if (items != null) { - Iterator iter = items.iterator(); - while (iter.hasNext()) { - KalturaItem item = (KalturaItem) iter.next(); - if (!item.isCreateByAuthor()) { - iter.remove(); - } - } - } - - kalturaDao.saveOrUpdate(toContent); - for (KalturaItem item : (Set) items) { - kalturaUserDao.saveOrUpdate(item.getCreatedBy()); - kalturaItemDao.insert(item); - } } @Override public void resetDefineLater(Long toolContentId) throws DataMissingException, ToolException { - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - if (kaltura == null) { - throw new ToolException("Could not find tool with toolContentID: " + toolContentId); - } - kaltura.setDefineLater(false); - kalturaDao.saveOrUpdate(kaltura); } - @SuppressWarnings("unchecked") @Override public void removeToolContent(Long toolContentId) throws ToolException { - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - if (kaltura == null) { - KalturaService.logger.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); - return; - } - - for (KalturaSession session : (Set) kaltura.getKalturaSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, KalturaConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - - kalturaDao.delete(kaltura); } @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (KalturaService.logger.isDebugEnabled()) { - KalturaService.logger.debug("This tool does not support learner content removing yet."); - } } @Override - public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - if (kaltura == null) { - kaltura = getDefaultContent(); - } - if (kaltura == null) { - throw new DataMissingException("Unable to find default content for the kaltura tool"); - } - - // set ResourceToolContentHandler as null to avoid copy file node in - // repository again. - kaltura = Kaltura.newInstance(kaltura, toolContentId); - kaltura.setKalturaSessions(null); - Set items = kaltura.getKalturaItems(); - for (KalturaItem item : items) { - item.setKalturaUid(null); - } - try { - exportContentService.exportToolContent(toolContentId, kaltura, kalturaToolContentHandler, rootPath); - } catch (ExportToolContentException e) { - throw new ToolException(e); - } + public void exportToolContent(Long toolContentId, String toPath) throws DataMissingException, ToolException { } @Override public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { - try { - // register version filter class - exportContentService.registerImportVersionFilterClass(KalturaImportContentVersionFilter.class); - - Object toolPOJO = exportContentService.importToolContent(toolContentPath, kalturaToolContentHandler, - fromVersion, toVersion); - if (!(toolPOJO instanceof Kaltura)) { - throw new ImportToolContentException( - "Import Kaltura tool content failed. Deserialized object is " + toolPOJO); - } - Kaltura kaltura = (Kaltura) toolPOJO; - - // reset it to new toolContentId - kaltura.setToolContentId(toolContentId); - KalturaUser user = kalturaUserDao.getByUserIdAndContentId(new Long(newUserUid.longValue()), toolContentId); - if (user == null) { - user = new KalturaUser(); - UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); - user.setFirstName(sysUser.getFirstName()); - user.setLastName(sysUser.getLastName()); - user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); - user.setKaltura(kaltura); - } - kaltura.setCreatedBy(user); - - // reset all assessmentquestion createBy user - Set items = kaltura.getKalturaItems(); - for (KalturaItem item : items) { - item.setCreatedBy(user); - } - - kalturaDao.saveOrUpdate(kaltura); - } catch (ImportToolContentException e) { - throw new ToolException(e); - } } @Override public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) throws ToolException { - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - if (kaltura == null) { - kaltura = getDefaultContent(); - } - return getKalturaOutputFactory().getToolOutputDefinitions(kaltura, definitionType); + return null; } @Override + public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { + return null; + } + + @Override public String getToolContentTitle(Long toolContentId) { - return getKalturaByContentId(toolContentId).getTitle(); + return null; } @Override public boolean isContentEdited(Long toolContentId) { - return getKalturaByContentId(toolContentId).isDefineLater(); + return false; } @Override public boolean isReadOnly(Long toolContentId) { - Kaltura kaltura = kalturaDao.getByContentId(toolContentId); - for (KalturaSession session : (Set) kaltura.getKalturaSessions()) { - if (session.getKalturaUsers().isEmpty()) { - return true; - } - } - return false; } - /* ********** IKalturaService Methods ********************************* */ @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer userId) { - List list = coreNotebookService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - KalturaConstants.TOOL_SIGNATURE, userId); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override - public List getReflectList(Kaltura kaltura) { - List reflectList = new LinkedList(); - - Set sessions = kaltura.getKalturaSessions(); - for (KalturaSession session : sessions) { - Long sessionId = session.getSessionId(); - // get all users in this session - Set users = session.getKalturaUsers(); - for (KalturaUser user : users) { - - NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue()); - if (entry != null) { - NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(entry); - notebookEntryDTO.setFullName(user.getFirstName() + " " + user.getLastName()); - notebookEntryDTO.setUserId(user.getUserId()); - Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified() - : entry.getCreateDate(); - notebookEntryDTO.setLastModified(postedDate); - reflectList.add(notebookEntryDTO); - } - - } - } - - return reflectList; - } - - @Override - public String finishToolSession(Long toolSessionId, Long userId) throws KalturaException { - KalturaUser user = kalturaUserDao.getByUserIdAndSessionId(userId, toolSessionId); - user.setFinishedActivity(true); - kalturaUserDao.saveOrUpdate(user); - - String nextUrl = null; - try { - nextUrl = this.leaveToolSession(toolSessionId, userId); - } catch (DataMissingException e) { - throw new KalturaException(e); - } catch (ToolException e) { - throw new KalturaException(e); - } - return nextUrl; - } - - @Override - public AverageRatingDTO rateMessage(Long itemUid, Long userId, Long toolSessionId, float rating) { - KalturaUser user = getUserByUserIdAndSessionId(userId, toolSessionId); - KalturaRating itemRating = kalturaRatingDao.getKalturaRatingByItemAndUser(itemUid, userId); - KalturaItem item = getKalturaItem(itemUid); - - //persist KalturaRating changes in DB - if (itemRating == null) { // add - itemRating = new KalturaRating(); - itemRating.setCreateBy(user); - itemRating.setKalturaItem(item); - } - itemRating.setRating(rating); - kalturaRatingDao.insertOrUpdate(itemRating); - - //to make available new changes be visible in jsp page - return kalturaRatingDao.getAverageRatingDtoByItem(itemUid, toolSessionId); - } - - @Override - public AverageRatingDTO getAverageRatingDto(Long itemUid, Long sessionId) { - return kalturaRatingDao.getAverageRatingDtoByItem(itemUid, sessionId); - } - - @Override - public void deleteKalturaItem(Long uid) { - kalturaItemDao.deleteById(KalturaItem.class, uid); - } - - @Override - public KalturaItem getKalturaItem(Long itemUid) { - return kalturaItemDao.getByUid(itemUid); - } - - @Override - public void saveKalturaItem(KalturaItem item) { - kalturaItemDao.insertOrUpdate(item); - } - - @Override - public Set getGroupItems(Long toolContentId, Long toolSessionId, Long useId, boolean isMonitoring) { - TreeSet groupItems = new TreeSet(new KalturaItemComparator()); - - Kaltura kaltura = getKalturaByContentId(toolContentId); - Set allItems = kaltura.getKalturaItems(); - - for (KalturaItem item : allItems) { - //hide hidden items from learner and ignore this parameter for teacher - boolean isHidden = isMonitoring || (!isMonitoring && !item.isHidden()); - - //remove hidden - if (isHidden && - //show authored items - (item.isCreateByAuthor() - //user should see his own items - || item.getCreatedBy().getUserId().equals(useId) - //filter items from other groups - || (item.getCreatedBy().getSession().getSessionId().equals(toolSessionId) - && (kaltura.isAllowSeeingOtherUsersRecordings() || isMonitoring)))) { - - groupItems.add(item); - } - } - - return groupItems; - } - - @Override - public void logItemWatched(Long itemUid, Long userId, Long toolSessionId) { - KalturaItemVisitLog log = kalturaItemVisitDao.getKalturaItemLog(itemUid, userId); - if (log == null) { - log = new KalturaItemVisitLog(); - KalturaItem item = kalturaItemDao.getByUid(itemUid); - log.setKalturaItem(item); - KalturaUser user = kalturaUserDao.getByUserIdAndSessionId(userId, toolSessionId); - log.setUser(user); - log.setComplete(false); - log.setSessionId(toolSessionId); - log.setAccessDate(new Timestamp(new Date().getTime())); - kalturaItemVisitDao.insert(log); - } - } - - @Override - public void markItem(Long itemUid, Long mark) { - KalturaItem item = kalturaItemDao.getByUid(itemUid); - item.setMark(mark); - kalturaItemDao.update(item); - } - - @Override - public void hideItem(Long itemUid, boolean isHiding) { - KalturaItem item = kalturaItemDao.getByUid(itemUid); - if (item != null) { - item.setHidden(isHiding); - kalturaItemDao.update(item); - } - } - - @Override - public void hideComment(Long commentUid, boolean isHiding) { - KalturaComment comment = kalturaCommentDao.getCommentByUid(commentUid); - if (comment != null) { - comment.setHidden(isHiding); - kalturaCommentDao.update(comment); - } - } - - @Override - public int getNumberViewedVideos(Long toolSessionId, Long userId) { - return kalturaItemVisitDao.getUserViewLogCount(toolSessionId, userId); - } - - @Override - public int getNumberUploadedVideos(Long toolSessionId, Long userId) { - return kalturaItemDao.getItemsCountByUser(toolSessionId, userId); - } - - @Override - public Long getDefaultContentIdBySignature(String toolSignature) { - Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); - if (toolContentId == null) { - String error = "Could not retrieve default content id for this tool"; - KalturaService.logger.error(error); - throw new KalturaException(error); - } - return toolContentId; - } - - @Override - public Kaltura getDefaultContent() { - Long defaultContentID = getDefaultContentIdBySignature(KalturaConstants.TOOL_SIGNATURE); - Kaltura defaultContent = getKalturaByContentId(defaultContentID); - if (defaultContent == null) { - String error = "Could not retrieve default content record for this tool"; - KalturaService.logger.error(error); - throw new KalturaException(error); - } - return defaultContent; - } - - @Override - public Kaltura copyDefaultContent(Long newContentID) { - - if (newContentID == null) { - String error = "Cannot copy the Kaltura tools default content: + " + "newContentID is null"; - KalturaService.logger.error(error); - throw new KalturaException(error); - } - - Kaltura defaultContent = getDefaultContent(); - // create new kaltura using the newContentID - Kaltura newContent = new Kaltura(); - newContent = Kaltura.newInstance(defaultContent, newContentID); - kalturaDao.saveOrUpdate(newContent); - return newContent; - } - - @Override - public Kaltura getKalturaByContentId(Long toolContentID) { - Kaltura kaltura = kalturaDao.getByContentId(toolContentID); - if (kaltura == null) { - KalturaService.logger.debug("Could not find the content with toolContentID:" + toolContentID); - } - return kaltura; - } - - @Override - public KalturaSession getSessionBySessionId(Long toolSessionId) { - KalturaSession kalturaSession = kalturaSessionDao.getBySessionId(toolSessionId); - if (kalturaSession == null) { - KalturaService.logger.debug("Could not find the kaltura session with toolSessionID:" + toolSessionId); - } - return kalturaSession; - } - - @Override - public KalturaUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) { - return kalturaUserDao.getByUserIdAndSessionId(userId, toolSessionId); - } - - @Override - public KalturaUser getUserByUid(Long uid) { - return kalturaUserDao.getByUid(uid); - } - - @Override - public KalturaUser getUserByUserIdAndContentId(Long userId, Long contentId) { - return kalturaUserDao.getByUserIdAndContentId(userId, contentId); - } - - @Override - public void saveOrUpdateKaltura(Kaltura kaltura) { - kalturaDao.saveOrUpdate(kaltura); - } - - @Override - public void saveOrUpdateKalturaSession(KalturaSession kalturaSession) { - kalturaSessionDao.saveOrUpdate(kalturaSession); - } - - @Override - public void saveOrUpdateKalturaUser(KalturaUser kalturaUser) { - kalturaUserDao.saveOrUpdate(kalturaUser); - } - - @Override - public KalturaUser createKalturaUser(UserDTO user, KalturaSession kalturaSession) { - KalturaUser kalturaUser = new KalturaUser(user, kalturaSession); - saveOrUpdateKalturaUser(kalturaUser); - return kalturaUser; - } - - public ILogEventService getLogEventService() { - return logEventService; - } - - public void setLogEventService(ILogEventService logEventService) { - this.logEventService = logEventService; - } - - @Override - public String getLocalisedMessage(String key, Object[] args) { - return messageService.getMessage(key, args); - } - - // ========================================================================================= - /* ********** Used by Spring to "inject" the linked objects ************* */ - - public void setKalturaDao(IKalturaDAO kalturaDAO) { - this.kalturaDao = kalturaDAO; - } - - public void setKalturaItemDao(IKalturaItemDAO kalturaItemDAO) { - this.kalturaItemDao = kalturaItemDAO; - } - - public void setKalturaItemVisitDao(IKalturaItemVisitDAO kalturaItemVisitDAO) { - this.kalturaItemVisitDao = kalturaItemVisitDAO; - } - - public void setKalturaCommentDao(IKalturaCommentDAO kalturaCommentDAO) { - this.kalturaCommentDao = kalturaCommentDAO; - } - - public void setKalturaRatingDao(IKalturaRatingDAO kalturaRatingDAO) { - this.kalturaRatingDao = kalturaRatingDAO; - } - - public void setKalturaToolContentHandler(IToolContentHandler kalturaToolContentHandler) { - this.kalturaToolContentHandler = kalturaToolContentHandler; - } - - public void setKalturaSessionDao(IKalturaSessionDAO sessionDAO) { - kalturaSessionDao = sessionDAO; - } - - public void setToolService(ILamsToolService toolService) { - this.toolService = toolService; - } - - public void setKalturaUserDao(IKalturaUserDAO userDAO) { - kalturaUserDao = userDAO; - } - - public IExportToolContentService getExportContentService() { - return exportContentService; - } - - public void setExportContentService(IExportToolContentService exportContentService) { - this.exportContentService = exportContentService; - } - - public void setUserManagementService(IUserManagementService userManagementService) { - this.userManagementService = userManagementService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - public KalturaOutputFactory getKalturaOutputFactory() { - return kalturaOutputFactory; - } - - public void setKalturaOutputFactory(KalturaOutputFactory kalturaOutputFactory) { - this.kalturaOutputFactory = kalturaOutputFactory; - } - - public void setMessageService(MessageService messageService) { - this.messageService = messageService; - } - - @Override - public boolean isGroupedActivity(long toolContentID) { - return toolService.isGroupedActivity(toolContentID); - } - - @Override - public void auditLogStartEditingActivityInMonitor(long toolContentID) { - toolService.auditLogStartEditingActivityInMonitor(toolContentID); - } - - @Override - public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { - return getKalturaOutputFactory().getSupportedDefinitionClasses(definitionType); - } - - @Override public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) { - KalturaUser learner = getUserByUserIdAndSessionId(learnerId, toolSessionId); - if (learner == null) { - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null); - } - - Kaltura kaltura = getSessionBySessionId(toolSessionId).getKaltura(); - Date startDate = null; - Date endDate = null; - Set allItems = kaltura.getKalturaItems(); - for (KalturaItem item : allItems) { - if (!item.isCreateByAuthor() && item.getCreatedBy().getUserId() == learnerId) { - Date newDate = item.getCreateDate(); - if (newDate != null) { - if (startDate == null || newDate.before(startDate)) - startDate = newDate; - if (endDate == null || newDate.after(endDate)) - endDate = newDate; - } - } - } - - if (learner.isFinishedActivity()) - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_COMPLETED, startDate, endDate); - else - return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_ATTEMPTED, startDate, null); + return null; } - -} +} \ No newline at end of file Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaServiceProxy.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaCommentComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaImportContentVersionFilter.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaItemComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaSessionDTOComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/AuthoringController.java (.../AuthoringController.java) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -23,371 +23,17 @@ package org.lamsfoundation.lams.tool.kaltura.web.controller; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser; -import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaException; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator; -import org.lamsfoundation.lams.tool.kaltura.web.forms.AuthoringForm; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.CommonConstants; -import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; /** * @author Andrey Balan */ @Controller @RequestMapping("/authoring") public class AuthoringController { - - private static Logger logger = Logger.getLogger(AuthoringController.class); - - @Autowired - private IKalturaService kalturaService; - - // Authoring SessionMap key names - private static final String KEY_TOOL_CONTENT_ID = "toolContentID"; - private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID"; - private static final String KEY_MODE = "mode"; - @RequestMapping("") - protected String unspecified(@ModelAttribute("authoringForm") AuthoringForm authoringForm, - HttpServletRequest request) { - - // Extract toolContentID from parameters. - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); - - String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - - ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); - - // retrieving Kaltura with given toolContentID - Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID); - if (kaltura == null) { - kaltura = kalturaService.copyDefaultContent(toolContentID); - kaltura.setCreateDate(new Date()); - kalturaService.saveOrUpdateKaltura(kaltura); - } - - if (mode.isTeacher()) { - // Set the defineLater flag so that learners cannot use content - // while we - // are editing. This flag is released when updateContent is called. - kaltura.setDefineLater(true); - kalturaService.saveOrUpdateKaltura(kaltura); - - //audit log the teacher has started editing activity in monitor - kalturaService.auditLogStartEditingActivityInMonitor(toolContentID); - } - - // Set up the authForm. - authoringForm.setTitle(kaltura.getTitle()); - authoringForm.setInstructions(kaltura.getInstructions()); - authoringForm.setLockOnFinished(kaltura.isLockOnFinished()); - authoringForm.setAllowContributeVideos(kaltura.isAllowContributeVideos()); - authoringForm.setAllowSeeingOtherUsersRecordings(kaltura.isAllowSeeingOtherUsersRecordings()); - authoringForm.setLearnerContributionLimit(kaltura.getLearnerContributionLimit()); - authoringForm.setAllowComments(kaltura.isAllowComments()); - authoringForm.setAllowRatings(kaltura.isAllowRatings()); - authoringForm.setReflectOnActivity(kaltura.isReflectOnActivity()); - authoringForm.setReflectInstructions(kaltura.getReflectInstructions()); - - // Set up sessionMap - SessionMap sessionMap = new SessionMap<>(); - request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP, sessionMap); - authoringForm.setSessionMapID(sessionMap.getSessionID()); - - sessionMap.put(AuthoringController.KEY_MODE, mode); - sessionMap.put(AuthoringController.KEY_CONTENT_FOLDER_ID, contentFolderID); - sessionMap.put(AuthoringController.KEY_TOOL_CONTENT_ID, toolContentID); - - Set items = kaltura.getKalturaItems(); - // init taskList item list - SortedSet taskListItemList = getItemList(sessionMap); - taskListItemList.clear(); - taskListItemList.addAll(items); - - return "pages/authoring/authoring"; + public String execute() throws Exception { + return "index"; } - - @RequestMapping(path = "/updateContent", method = RequestMethod.POST) - public String updateContent(@ModelAttribute("authoringForm") AuthoringForm authoringForm, - HttpServletRequest request) { - - // get authForm and session map. - SessionMap sessionMap = getSessionMap(request, authoringForm); - - // get kaltura content. - Long toolContentId = (Long) sessionMap.get(AuthoringController.KEY_TOOL_CONTENT_ID); - Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentId); - - // update kaltura content using form inputs - kaltura.setTitle(authoringForm.getTitle()); - kaltura.setInstructions(authoringForm.getInstructions()); - kaltura.setLockOnFinished(authoringForm.isLockOnFinished()); - kaltura.setAllowContributeVideos(authoringForm.isAllowContributeVideos()); - kaltura.setLearnerContributionLimit(authoringForm.getLearnerContributionLimit()); - kaltura.setAllowSeeingOtherUsersRecordings(authoringForm.isAllowSeeingOtherUsersRecordings()); - kaltura.setAllowComments(authoringForm.isAllowComments()); - kaltura.setAllowRatings(authoringForm.isAllowRatings()); - kaltura.setReflectOnActivity(authoringForm.isReflectOnActivity()); - kaltura.setReflectInstructions(authoringForm.getReflectInstructions()); - - // *******************************Handle user******************* - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - KalturaUser kalturaUser = kalturaService.getUserByUserIdAndContentId(new Long(user.getUserID().intValue()), - toolContentId); - if (kalturaUser == null) { - kalturaUser = new KalturaUser(user, kaltura); - } - - kaltura.setCreatedBy(kalturaUser); - - // ************************* Handle taskList items ******************* - Set itemList = new LinkedHashSet(); - SortedSet items = getItemList(sessionMap); - for (KalturaItem item : items) { - if (item != null) { - // This flushs user UID info to message if this user is a new user. - item.setCreatedBy(kalturaUser); - itemList.add(item); - } - } - kaltura.setKalturaItems(itemList); - - // delete KalturaItems from database. - for (KalturaItem item : getDeletedItemList(sessionMap)) { - if (item.getUid() != null) { - kalturaService.deleteKalturaItem(item.getUid()); - } - } - - // set the update date - kaltura.setUpdateDate(new Date()); - - // releasing defineLater flag so that learner can start using the tool. - kaltura.setDefineLater(false); - - kalturaService.saveOrUpdateKaltura(kaltura); - - request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE); - - // add the sessionMapID to form - authoringForm.setSessionMapID(sessionMap.getSessionID()); - - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP, sessionMap); - - return "pages/authoring/authoring"; - } - - /** - * Stores uploaded entryId(s). - */ - - @RequestMapping("/addItem") - public String addItem(HttpServletRequest request) throws IOException { - - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - // check whether it is "edit(old item)" or "add(new item)" - SortedSet itemList = getItemList(sessionMap); - KalturaItem item = new KalturaItem(); - item.setCreateDate(new Timestamp(new Date().getTime())); - int maxSeq = 1; - if (itemList != null && itemList.size() > 0) { - KalturaItem last = itemList.last(); - maxSeq = last.getSequenceId() + 1; - } - item.setSequenceId(maxSeq); - itemList.add(item); - - String title = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_TITLE, true); - if (StringUtils.isBlank(title)) { - String itemLocalized = kalturaService.getLocalisedMessage("label.authoring.item", null); - title = itemLocalized + " " + maxSeq; - } - item.setTitle(title); - - int duration = WebUtil.readIntParam(request, KalturaConstants.PARAM_ITEM_DURATION); - item.setDuration(duration); - - String entryId = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_ENTRY_ID); - if (StringUtils.isBlank(entryId)) { - String errorMsg = "Add item failed due to missing entityId (received from Kaltura server)."; - logger.error(errorMsg); - throw new KalturaException(errorMsg); - } - item.setEntryId(entryId); - - item.setCreateByAuthor(true); - item.setHidden(false); - - return "pages/authoring/itemlist"; - } - - /** - * Preview uploaded entryId. - */ - @RequestMapping("/preview") - public String preview(HttpServletRequest request) throws IOException { - - // get back sessionMAP - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - - int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1); - if (itemIdx != -1) { - SortedSet itemList = getItemList(sessionMap); - List rList = new ArrayList<>(itemList); - KalturaItem item = rList.get(itemIdx); - request.setAttribute(KalturaConstants.ATTR_ITEM, item); - } - - return "pages/authoring/preview"; - } - - /** - * Remove kaltura item from HttpSession list and update page display. As authoring rule, all persist only happen - * when user submit whole page. So this remove is just impact HttpSession values. - */ - @RequestMapping("/removeItem") - public String removeItem(HttpServletRequest request) { - - // get back sessionMAP - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1); - if (itemIdx != -1) { - SortedSet itemList = getItemList(sessionMap); - List rList = new ArrayList<>(itemList); - KalturaItem item = rList.remove(itemIdx); - itemList.clear(); - itemList.addAll(rList); - // add to delList - List delList = getDeletedItemList(sessionMap); - delList.add(item); - } - - return "pages/authoring/itemlist"; - } - - /** - * Move up current item. - */ - @RequestMapping("/upItem") - public String upItem(HttpServletRequest request) { - return switchItem(request, true); - } - - /** - * Move down current item. - */ - @RequestMapping("/downItem") - public String downItem(HttpServletRequest request) { - return switchItem(request, false); - } - - private String switchItem(HttpServletRequest request, boolean up) { - // get back sessionMAP - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID); - - int itemIdx = NumberUtils.stringToInt(request.getParameter(KalturaConstants.PARAM_ITEM_INDEX), -1); - if (itemIdx != -1) { - SortedSet kalturaList = getItemList(sessionMap); - List rList = new ArrayList<>(kalturaList); - // get current and the target item, and switch their sequnece - KalturaItem item = rList.get(itemIdx); - KalturaItem repItem; - if (up) { - repItem = rList.get(--itemIdx); - } else { - repItem = rList.get(++itemIdx); - } - int upSeqId = repItem.getSequenceId(); - repItem.setSequenceId(item.getSequenceId()); - item.setSequenceId(upSeqId); - - // put back list, it will be sorted again - kalturaList.clear(); - kalturaList.addAll(rList); - } - - return "pages/authoring/itemlist"; - } - - /** - * Retrieve the SessionMap from the HttpSession. - */ - private SessionMap getSessionMap(HttpServletRequest request, AuthoringForm authForm) { - return (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID()); - } - - /** - * List save current taskList items. - */ - private SortedSet getItemList(SessionMap sessionMap) { - SortedSet list = (SortedSet) sessionMap.get(KalturaConstants.ATTR_ITEM_LIST); - if (list == null) { - list = new TreeSet<>(new KalturaItemComparator()); - sessionMap.put(KalturaConstants.ATTR_ITEM_LIST, list); - } - return list; - } - - /** - * List save deleted taskList items, which could be persisted or non-persisted items. - */ - private List getDeletedItemList(SessionMap sessionMap) { - return getListFromSession(sessionMap, KalturaConstants.ATTR_DELETED_ITEM_LIST); - } - - /** - * Get java.util.List from HttpSession by given name. - */ - private List getListFromSession(SessionMap sessionMap, String name) { - List list = (List) sessionMap.get(name); - if (list == null) { - list = new ArrayList(); - sessionMap.put(name, list); - } - return list; - } -} +} \ No newline at end of file Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/ClearSessionController.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/LearningController.java (.../LearningController.java) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -23,580 +23,35 @@ package org.lamsfoundation.lams.tool.kaltura.web.controller; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.Date; -import java.util.Set; -import java.util.TimeZone; -import java.util.TreeSet; - -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.learningdesign.dto.ActivityPositionDTO; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.kaltura.dto.AverageRatingDTO; -import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaComment; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaItem; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaUser; -import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaCommentComparator; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaException; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaItemComparator; -import org.lamsfoundation.lams.tool.kaltura.web.forms.ReflectionForm; +import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.DateUtil; -import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; - /** * @author Andrey Balan */ @Controller @RequestMapping("/learning") public class LearningController { - private static Logger log = Logger.getLogger(LearningController.class); - @Autowired - private IKalturaService kalturaService; + private ILamsToolService lamsToolService; - @Autowired - private WebApplicationContext applicationContext; - - @Autowired - @Qualifier("kalturaMessageService") - private MessageService messageService; - @RequestMapping("") - public String unspecified(HttpServletRequest request) throws Exception { - - // initialize Session Map - SessionMap sessionMap = new SessionMap<>(); - String sessionMapId = sessionMap.getSessionID(); - request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapId); - - // 'toolSessionID' and 'mode' paramters are expected to be present. - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, false); - sessionMap.put(AttributeNames.PARAM_MODE, mode); - Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); - - // Retrieve the session and content. - KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId); - if (kalturaSession == null) { - throw new KalturaException("Cannot retrieve session with toolSessionID" + toolSessionId); - } - Kaltura kaltura = kalturaSession.getKaltura(); - //init getCreatedBy to avoid session close error in proxy object - if (kaltura.getCreatedBy() != null) { - kaltura.getCreatedBy().getLoginName(); - } - - //if this parameter true - this request is sent when Monitoring Group - boolean isGroupMonitoring = WebUtil.readBooleanParam(request, KalturaConstants.ATTR_IS_GROUP_MONITORING, false); - sessionMap.put(KalturaConstants.ATTR_IS_GROUP_MONITORING, isGroupMonitoring); - - KalturaUser user; - if (mode.equals(ToolAccessMode.TEACHER) && !isGroupMonitoring) { - Long userID = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false); - user = kalturaService.getUserByUserIdAndSessionId(userID, toolSessionId); - } else { - //in case of lerning and group monitoring create new user - user = getCurrentUser(toolSessionId); - } - - // check defineLater - if (kaltura.isDefineLater()) { - return "pages/learning/defineLater"; - } - - // Set the content in use flag. - if (!kaltura.isContentInUse()) { - kaltura.setContentInUse(new Boolean(true)); - kalturaService.saveOrUpdateKaltura(kaltura); - } - - ActivityPositionDTO activityPosition = WebUtil.putActivityPositionInRequestByToolSessionId(toolSessionId, - request, applicationContext.getServletContext()); - sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition); - - // reflection information - String entryText = new String(); - NotebookEntry notebookEntry = kalturaService.getEntry(toolSessionId, user.getUserId().intValue()); - if (notebookEntry != null) { - entryText = notebookEntry.getEntry(); - } - sessionMap.put(KalturaConstants.ATTR_REFLECTION_ON, kaltura.isReflectOnActivity()); - sessionMap.put(KalturaConstants.ATTR_REFLECTION_INSTRUCTION, kaltura.getReflectInstructions()); - sessionMap.put(KalturaConstants.ATTR_REFLECTION_ENTRY, entryText); - - // check whehter finish lock is on/off - boolean lockOnFinish = kaltura.isLockOnFinished() && user != null && user.isFinishedActivity(); - sessionMap.put(KalturaConstants.ATTR_FINISHED_LOCK, lockOnFinish); - sessionMap.put(KalturaConstants.ATTR_LOCK_ON_FINISH, kaltura.isLockOnFinished()); - sessionMap.put(KalturaConstants.ATTR_USER_FINISHED, user != null && user.isFinishedActivity()); - - // date and time restriction - Date submissionDeadline = kaltura.getSubmissionDeadline(); - if (submissionDeadline != null) { - // store submission deadline to sessionMap - sessionMap.put(KalturaConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline); - - HttpSession ss = SessionManager.getSession(); - UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); - TimeZone learnerTimeZone = learnerDto.getTimeZone(); - Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); - Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date()); - - // calculate whether deadline has passed, and if so forward to "submissionDeadline" - if (currentLearnerDate.after(tzSubmissionDeadline)) { - return "pages/learning/submissionDeadline"; - } - } - - sessionMap.put(KalturaConstants.ATTR_KALTURA, kaltura); - sessionMap.put(AttributeNames.USER, user); - - TreeSet items = getItems(mode, kaltura, toolSessionId, user.getUserId()); - //skip the next parameter if the tool doesn't contain videos - if (items.isEmpty()) { - KalturaItem item = new KalturaItem(); - item.setUid(new Long(-1)); - sessionMap.put(KalturaConstants.ATTR_ITEM, item); - sessionMap.put(KalturaConstants.ATTR_IS_ALLOW_UPLOADS, isAllowUpload(sessionMap, items)); - return "pages/learning/learning"; - } - - String redirectURL = "redirect:learning/viewItem.do?"; - redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapId); - redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.PARAM_ITEM_UID, - items.first().getUid().toString()); - return redirectURL; - } - - @RequestMapping("/viewItem") - public String viewItem(HttpServletRequest request) { - - // get back SessionMap - String sessionMapID = request.getParameter(KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER); - Long userId = user.getUserId(); - Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - Kaltura kaltura = (Kaltura) sessionMap.get(KalturaConstants.ATTR_KALTURA); - ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); - - //get back item - Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID); - KalturaItem item = kalturaService.getKalturaItem(itemUid); - if (mode.isLearner()) { - kalturaService.logItemWatched(item.getUid(), userId, toolSessionId); - } - - //items from DB - TreeSet items = getItems(mode, kaltura, toolSessionId, userId); - - //filter comments and store current item comments to sessionMap - if (kaltura.isAllowComments()) { - - //filter out comments from the other groups. We need this to display number of comments - for (KalturaItem dbItem : items) { - Set groupComments = getGroupComments(dbItem, toolSessionId, mode); - //set to groupComments to avoid session flushing changes to DB - dbItem.setGroupComments(groupComments); - } - } - - if (kaltura.isAllowRatings()) { - boolean isUserItemAuthor = (item.getCreatedBy() == null) && (kaltura.getCreatedBy() != null) - && kaltura.getCreatedBy().getUserId().equals(userId) - || (item.getCreatedBy() != null) && item.getCreatedBy().equals(user); - sessionMap.put(KalturaConstants.ATTR_IS_USER_ITEM_AUTHOR, isUserItemAuthor); - - for (KalturaItem dbItem : items) { - AverageRatingDTO averageRatingDto = kalturaService.getAverageRatingDto(dbItem.getUid(), toolSessionId); - dbItem.setAverageRatingDto(averageRatingDto); - } - } - - sessionMap.put(KalturaConstants.ATTR_IS_ALLOW_UPLOADS, isAllowUpload(sessionMap, items)); - - //refresh items - items.remove(item); - sessionMap.put(KalturaConstants.ATTR_ITEM, item); - sessionMap.put(KalturaConstants.ATTR_ITEMS, items); - - return "pages/learning/learning"; - } - - /** - * Stores uploaded entryId(s). - */ - @RequestMapping(path = "/saveNewItem", method = RequestMethod.POST) - @ResponseBody - public String saveNewItem(HttpServletRequest request, HttpServletResponse response) throws IOException { - - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER); - Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId); - Kaltura kaltura = kalturaSession.getKaltura(); - TreeSet allItems = new TreeSet<>(new KalturaItemComparator()); - allItems.addAll(kaltura.getKalturaItems()); - - // check user can upload item - boolean isAllowUpload = isAllowUpload(sessionMap, allItems); - if (!isAllowUpload) { - return null; - } - - KalturaItem item = new KalturaItem(); - item.setCreateDate(new Timestamp(new Date().getTime())); - int maxSeq = 1; - if (allItems != null && allItems.size() > 0) { - KalturaItem last = allItems.last(); - maxSeq = last.getSequenceId() + 1; - } - item.setSequenceId(maxSeq); - - String title = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_TITLE, true); - if (StringUtils.isBlank(title)) { - String itemLocalized = kalturaService.getLocalisedMessage("label.authoring.item", null); - title = itemLocalized + " " + maxSeq; - } - item.setTitle(title); - - int duration = WebUtil.readIntParam(request, KalturaConstants.PARAM_ITEM_DURATION); - item.setDuration(duration); - - String entryId = WebUtil.readStrParam(request, KalturaConstants.PARAM_ITEM_ENTRY_ID); - if (StringUtils.isBlank(entryId)) { - String errorMsg = "Add item failed due to missing entityId (received from Kaltura server)."; - log.error(errorMsg); - throw new KalturaException(errorMsg); - } - item.setEntryId(entryId); - - item.setCreatedBy(user); - item.setCreateByAuthor(false); - item.setHidden(false); - item.setKalturaUid(kaltura.getUid()); - kalturaService.saveKalturaItem(item); - - ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode(); - ObjectNode.put(KalturaConstants.PARAM_ITEM_UID, item.getUid()); - response.setContentType("application/json;charset=utf-8"); - return ObjectNode.toString(); - } - - /** - * Comment current item. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - @RequestMapping("/commentItem") - public String commentItem(HttpServletRequest request) { - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - request.setAttribute(KalturaConstants.ATTR_SESSION_MAP_ID, sessionMapID); - Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); - String commentMessage = WebUtil.readStrParam(request, KalturaConstants.ATTR_COMMENT, true); - - if (StringUtils.isBlank(commentMessage)) { - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap.add("GLOBAL", messageService.getMessage(KalturaConstants.ERROR_MSG_COMMENT_BLANK)); - request.setAttribute("errorMap", errorMap); - return "pages/learning/commentlist"; - } - - KalturaComment comment = new KalturaComment(); - comment.setComment(commentMessage); - UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - KalturaUser kalturaUser = kalturaService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), - toolSessionId); - comment.setCreateBy(kalturaUser); - comment.setCreateDate(new Timestamp(new Date().getTime())); - - // persist Kaltura changes in DB - Long currentItemUid = new Long(request.getParameter(KalturaConstants.PARAM_ITEM_UID)); - KalturaItem item = kalturaService.getKalturaItem(currentItemUid); - Set dbComments = item.getComments(); - dbComments.add(comment); - kalturaService.saveKalturaItem(item); - - //refresh comments in the sessisonMap - KalturaItem sessionMapItem = (KalturaItem) sessionMap.get(KalturaConstants.ATTR_ITEM); - Set groupComments = getGroupComments(item, toolSessionId, mode); - sessionMapItem.setGroupComments(groupComments); - - return "pages/learning/commentlist"; - } - - /** - * Rates items submitted by other learners. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws JSONException - * @throws IOException - * @throws ServletException - * @throws ToolException - */ - @RequestMapping("/rateItem") - @ResponseBody - public String rateItem(HttpServletRequest request, HttpServletResponse response) throws IOException { - - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER); - - float rating = Float.parseFloat(request.getParameter("rate")); - Long itemUid = WebUtil.readLongParam(request, "idBox"); - - AverageRatingDTO averageRatingDto = kalturaService.rateMessage(itemUid, user.getUserId(), toolSessionId, - rating); - - //refresh averageRatingDto in sessionMap - KalturaItem item = (KalturaItem) sessionMap.get(KalturaConstants.ATTR_ITEM); - item.setAverageRatingDto(averageRatingDto); - - ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode(); - ObjectNode.put("averageRating", averageRatingDto.getRating()); - ObjectNode.put("numberOfVotes", averageRatingDto.getNumberOfVotes()); - response.setContentType("application/json;charset=utf-8"); - return ObjectNode.toString(); - } - - /** - * Display empty reflection form. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - @RequestMapping("/newReflection") - public String newReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, HttpServletRequest request) { - - // get session value - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - + public String execute(HttpServletRequest request) { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - messageForm.setUserID(user.getUserID()); - messageForm.setSessionMapID(sessionMapID); - - SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID); - Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID); - NotebookEntry entry = kalturaService.getEntry(toolSessionID, user.getUserID()); - - if (entry != null) { - messageForm.setEntryText(entry.getEntry()); - } - - return "pages/learning/notebook"; + String finishURL = lamsToolService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return "redirect:" + finishURL; } - - /** - * Submit reflection form input database. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - */ - @RequestMapping(path = "/submitReflection", method = RequestMethod.POST) - public String submitReflection(@ModelAttribute("messageForm") ReflectionForm messageForm, - HttpServletRequest request) { - - Integer userId = messageForm.getUserID(); - - String sessionMapID = WebUtil.readStrParam(request, KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - // check for existing notebook entry - NotebookEntry entry = kalturaService.getEntry(sessionId, userId); - - if (entry == null) { - // create new entry - kalturaService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - KalturaConstants.TOOL_SIGNATURE, userId, messageForm.getEntryText()); - } else { - // update existing entry - entry.setEntry(messageForm.getEntryText()); - entry.setLastModified(new Date()); - kalturaService.updateEntry(entry); - } - - return finishActivity(messageForm, request); - } - - @RequestMapping("/finishActivity") - public String finishActivity(@ModelAttribute("messageForm") ReflectionForm messageForm, - HttpServletRequest request) { - - // get back SessionMap - String sessionMapID = request.getParameter(KalturaConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession() - .getAttribute(sessionMapID); - - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - // get sessionId from HttpServletRequest - String nextActivityUrl = null; - try { - HttpSession ss = SessionManager.getSession(); - UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(userDTO.getUserID().longValue()); - - nextActivityUrl = kalturaService.finishToolSession(sessionId, userID); - request.setAttribute(KalturaConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); - } catch (KalturaException e) { - LearningController.log.error("Failed get next activity url:" + e.getMessage()); - } - - return "pages/learning/finish"; - } - - // ************************************************************************************* - // Private methods - // ************************************************************************************* - - /** - * Gets items from the DB. IF the mode is learner filters them based on the group sessionId - */ - private TreeSet getItems(ToolAccessMode mode, Kaltura kaltura, Long toolSessionId, Long userId) { - - // Create set of images, along with this filtering out items added by users from other groups - TreeSet items = new TreeSet<>(new KalturaItemComparator()); - items.addAll(kalturaService.getGroupItems(kaltura.getToolContentId(), toolSessionId, userId, mode.isTeacher())); - - for (KalturaItem item : items) { - // initialize login name to avoid session close error in proxy object - if (item.getCreatedBy() != null) { - item.getCreatedBy().getLoginName(); - } - } - - return items; - } - - /** - * Checks whether further upload is allowed. - */ - private boolean isAllowUpload(SessionMap sessionMap, Set items) { - Kaltura kaltura = (Kaltura) sessionMap.get(KalturaConstants.ATTR_KALTURA); - ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); - KalturaUser user = (KalturaUser) sessionMap.get(AttributeNames.USER); - - boolean isAllowUpload = false; - if (kaltura.isAllowContributeVideos() && !mode.equals(ToolAccessMode.TEACHER)) { - int numberOfUploadedItems = 0; - for (KalturaItem item : items) { - if (item.getCreatedBy() != null && item.getCreatedBy().equals(user)) { - numberOfUploadedItems++; - } - } - int learnerContributionLimit = kaltura.getLearnerContributionLimit(); - isAllowUpload = (learnerContributionLimit == Kaltura.TYPE_LEARNER_CONTRIBUTION_LIMIT_UNLIMITED) - || (numberOfUploadedItems < kaltura.getLearnerContributionLimit()); - } - - return isAllowUpload; - } - - /** - * Returns all comments done by teacher and learners of the specified group. - */ - private Set getGroupComments(KalturaItem item, Long sessionId, ToolAccessMode mode) { - TreeSet comments = new TreeSet<>(new KalturaCommentComparator()); - Set itemComments = item.getComments(); - - //only authored items can be seen by different groups - if (item.isCreateByAuthor()) { - for (KalturaComment comment : itemComments) { - - //skip hidden comments - if (comment.isHidden() && mode.isLearner()) { - continue; - - // if made by teacher - add - } else if (comment.getCreateBy() == null) { - comments.add(comment); - - // if made by learner of the specified group - also add - } else if (comment.getCreateBy().getSession().getSessionId().equals(sessionId)) { - comments.add(comment); - } - } - - } else { - comments.addAll(itemComments); - } - - return comments; - } - - private KalturaUser getCurrentUser(Long toolSessionId) { - UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - - // attempt to retrieve user using userId and toolSessionId - KalturaUser kalturaUser = kalturaService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), - toolSessionId); - - if (kalturaUser == null) { - KalturaSession kalturaSession = kalturaService.getSessionBySessionId(toolSessionId); - kalturaUser = kalturaService.createKalturaUser(user, kalturaSession); - } - - return kalturaUser; - } -} +} \ No newline at end of file Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/MonitoringController.java (.../MonitoringController.java) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -24,171 +24,20 @@ package org.lamsfoundation.lams.tool.kaltura.web.controller; import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.Set; -import java.util.TimeZone; -import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import javax.servlet.ServletException; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.tool.kaltura.dto.KalturaSessionDTO; -import org.lamsfoundation.lams.tool.kaltura.dto.NotebookEntryDTO; -import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; -import org.lamsfoundation.lams.tool.kaltura.model.KalturaSession; -import org.lamsfoundation.lams.tool.kaltura.service.IKalturaService; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaConstants; -import org.lamsfoundation.lams.tool.kaltura.util.KalturaSessionDTOComparator; -import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.DateUtil; -import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.session.SessionManager; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; /** * @author Andrey Balan */ @Controller @RequestMapping("/monitoring") public class MonitoringController { - - private static Logger log = Logger.getLogger(MonitoringController.class); - - @Autowired - private IKalturaService kalturaService; - @RequestMapping("") - public String unspecified(HttpServletRequest request) { - - String dispatch = request.getParameter("dispatch"); - if ("markItem".equals(dispatch)) { - return markItem(request); - } - - request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true)); - Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - - Kaltura kaltura = kalturaService.getKalturaByContentId(toolContentID); - boolean isGroupedActivity = kalturaService.isGroupedActivity(toolContentID); - request.setAttribute(KalturaConstants.ATTR_KALTURA, kaltura); - request.setAttribute("contentFolderID", contentFolderID); - request.setAttribute("isGroupedActivity", isGroupedActivity); - - Set sessionDTOs = new TreeSet<>(new KalturaSessionDTOComparator()); - for (KalturaSession session : (Set) kaltura.getKalturaSessions()) { - KalturaSessionDTO sessionDTO = new KalturaSessionDTO(session); - sessionDTOs.add(sessionDTO); - } - request.setAttribute("sessionDTOs", sessionDTOs); - - // Create reflectList if reflection is enabled. - if (kaltura.isReflectOnActivity()) { - List reflectList = kalturaService.getReflectList(kaltura); - request.setAttribute(KalturaConstants.ATTR_REFLECT_LIST, reflectList); - } - - Date submissionDeadline = kaltura.getSubmissionDeadline(); - if (submissionDeadline != null) { - HttpSession ss = SessionManager.getSession(); - UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); - TimeZone teacherTimeZone = teacher.getTimeZone(); - Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); - request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); - // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed - request.setAttribute(KalturaConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, - DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); - } - - return "pages/monitoring/monitoring"; + public String execute() throws IOException, ServletException { + return "index"; } - - @RequestMapping("/showGroupLearning") - public String showGroupLearning(HttpServletRequest request) { - - String toolSessionID = WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - - String redirectURL = "redirect:/learning.do"; - //to distinguish from opening learning page from monitor's Learners tab pass this parameter - redirectURL = WebUtil.appendParameterToURL(redirectURL, KalturaConstants.ATTR_IS_GROUP_MONITORING, "true"); - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_MODE, "teacher"); - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID); - redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_USER_ID, - user.getUserID().toString()); - return redirectURL; - } - - /** - * Update item's mark. If it's not long then store 0. - */ - @RequestMapping("/markItem") - @ResponseBody - public String markItem(HttpServletRequest request) { - - String markStr = WebUtil.readStrParam(request, "content"); - try { - Long mark = Long.parseLong(markStr); - Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID); - kalturaService.markItem(itemUid, mark); - } catch (NumberFormatException e) { - log.debug(e.getMessage()); - } - return null; - } - - @RequestMapping("/setItemVisibility") - @ResponseBody - public void setItemVisibility(HttpServletRequest request) { - - Long itemUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_ITEM_UID); - boolean isHide = WebUtil.readBooleanParam(request, KalturaConstants.PARAM_IS_HIDING); - kalturaService.hideItem(itemUid, isHide); - - } - - @RequestMapping("/setCommentVisibility") - @ResponseBody - public void setCommentVisibility(HttpServletRequest request) { - Long commentUid = WebUtil.readLongParam(request, KalturaConstants.PARAM_COMMENT_UID); - boolean isHide = WebUtil.readBooleanParam(request, KalturaConstants.PARAM_IS_HIDING); - kalturaService.hideComment(commentUid, isHide); - } - - /** - * Set Submission Deadline - */ - @RequestMapping("/setSubmissionDeadline") - @ResponseBody - public void setSubmissionDeadline(HttpServletRequest request, HttpServletResponse response) throws IOException { - - Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - - Kaltura kaltura = kalturaService.getKalturaByContentId(contentID); - - Long dateParameter = WebUtil.readLongParam(request, KalturaConstants.ATTR_SUBMISSION_DEADLINE, true); - Date tzSubmissionDeadline = null; - String formattedDate = ""; - if (dateParameter != null) { - Date submissionDeadline = new Date(dateParameter); - HttpSession ss = SessionManager.getSession(); - org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss - .getAttribute(AttributeNames.USER); - TimeZone teacherTimeZone = teacher.getTimeZone(); - tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); - formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale()); - } - kaltura.setSubmissionDeadline(tzSubmissionDeadline); - kalturaService.saveOrUpdateKaltura(kaltura); - - response.setContentType("text/plain;charset=utf-8"); - response.getWriter().print(formattedDate); - } -} +} \ No newline at end of file Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/controller/PedagogicalPlannerController.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/AuthoringForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/ReflectionForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/403.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/404.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_tool_kaltura/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_tool_kaltura/web/WEB-INF/applicationContext.xml (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -0,0 +1,7 @@ + + + + \ No newline at end of file Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/AdvancedAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Arrow.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Comments.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Date.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/DefineLater.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Errors.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/FileUpload.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Head.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/ImgButtonWrapper.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/OutcomeAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Rating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/RestrictedUsageAccordian.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/SimplePanel.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TSTable.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Tab.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TabBody.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TabBodyArea.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TabBodys.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Tabs.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/TextSearch.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/WaitingSpinner.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/headItems.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/fn.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/jstl/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/WEB-INF/web.xml =================================================================== diff -u -r6b51fd5bd25deda44de52dbae109e0df96f885d2 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 --- lams_tool_kaltura/web/WEB-INF/web.xml (.../web.xml) (revision 6b51fd5bd25deda44de52dbae109e0df96f885d2) +++ lams_tool_kaltura/web/WEB-INF/web.xml (.../web.xml) (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -3,16 +3,13 @@ + + Kaltura + + Kaltura tool + + - javax.servlet.jsp.jstl.fmt.localizationContext - org.lamsfoundation.lams.tool.kaltura.ApplicationResources - - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/tool/kaltura/dbupdates/autopatchContext.xml - - locatorFactorySelector classpath:/org/lamsfoundation/lams/beanRefContext.xml @@ -27,35 +24,11 @@ org.lamsfoundation.lams.web.session.SystemSessionFilter - - hibernateFilter - - org.springframework.orm.hibernate5.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - coreSessionFactory - - - - LocaleFilter - - org.lamsfoundation.lams.web.filter.LocaleFilter - - SystemSessionFilter /* - - hibernateFilter - /* - - - LocaleFilter - /* - @@ -71,180 +44,19 @@ 1 - - - - Connector - net.fckeditor.connector.ConnectorServlet - - baseDir - /UserFiles/ - - - debug - false - - 1 - - - - - Attachment Download - download - org.lamsfoundation.lams.contentrepository.client.ToolDownload - - toolContentHandlerBeanName - kalturaToolContentHandler - - 3 - - - spring *.do - - - - Connector - /ckeditor/filemanager/browser/default/connectors/jsp/connector - - - - download - /download/* - - - - 500 - /error.jsp - - - 403 - /403.jsp - - - 404 - /404.jsp - - - - - - - - - tags-fmt - /WEB-INF/tlds/jstl/fmt.tld - - - tags-core - /WEB-INF/tlds/jstl/c.tld - - - tags-function - /WEB-INF/tlds/jstl/fn.tld - - - tags-xml - /WEB-INF/tlds/jstl/x.tld - - - - - - tags-permittedTaglibs - /WEB-INF/tlds/jstl/permittedTaglibs.tld - - - tags-scriptfree - /WEB-INF/tlds/jstl/scriptfree.tld - - - - - - tags-lams - /WEB-INF/tlds/lams/lams.tld - - - - - - Secure content + Public Content /* GET POST - - LEARNER - MONITOR - AUTHOR - SYSADMIN - - - - - Authoring content - /authoring/* - /pages/authoring/* - /authoring.do - GET - POST - - - AUTHOR - MONITOR - SYSADMIN - - - - - Staff content - /monitoring/* - /pages/monitoring/* - /monitoring.do - GET - POST - - - MONITOR - SYSADMIN - - - - - Student - LEARNER - - - - Authors Learning Designs - AUTHOR - - - - Member of Staff - MONITOR - - - - Group Manager - GROUP MANAGER - - - Group Administrator - GROUP ADMIN - - - LAMS System Adminstrator - SYSADMIN - - \ No newline at end of file + Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/common/taglibs.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/error.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/images/Camera-video.svg.7z =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 Binary files differ Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/images/icon_kaltura.ai'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/images/icon_kaltura_16.svg'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/includes/expressInstall.swf =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb1d90cebfaf11f221fd5f7c81008507b8f146842 Binary files differ Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/includes/javascript/authoring.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/includes/javascript/monitoring.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_kaltura/web/index.jsp =================================================================== diff -u --- lams_tool_kaltura/web/index.jsp (revision 0) +++ lams_tool_kaltura/web/index.jsp (revision b1d90cebfaf11f221fd5f7c81008507b8f146842) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/authoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/itemlist.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/pedagogicalPlannerForm.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/authoring/preview.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/commentlist.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/defineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/finish.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/learning.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/notebook.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/ratingStars.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/submissionDeadline.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/learning/uploaditem.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/advanceOptions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/daterestriction.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/editActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/headItems.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/monitoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/reflections.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b1d90cebfaf11f221fd5f7c81008507b8f146842 refers to a dead (removed) revision in file `lams_tool_kaltura/web/pages/monitoring/summary.jsp'. Fisheye: No comparison available. Pass `N' to diff?