Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20210731.sql =================================================================== diff -u --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20210731.sql (revision 0) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20210731.sql (revision 604a8b98bc089c78d262394c77d68a0e52473f4c) @@ -0,0 +1,20 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +--LDEV-5225 Add Gallery Walk to Mindmap + +ALTER TABLE tl_lamind10_mindmap ADD COLUMN gallery_walk_enabled TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_read_only TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_started TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_finished TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_edit_enabled TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_instructions TEXT; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r604a8b98bc089c78d262394c77d68a0e52473f4c --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java (.../MindmapDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapDTO.java (.../MindmapDTO.java) (revision 604a8b98bc089c78d262394c77d68a0e52473f4c) @@ -21,8 +21,6 @@ * **************************************************************** */ - - package org.lamsfoundation.lams.tool.mindmap.dto; import java.util.Iterator; @@ -35,16 +33,20 @@ public class MindmapDTO { - private static Logger logger = Logger.getLogger(MindmapDTO.class); - public Long toolContentId; public String title; public String instructions; public boolean defineLater; public boolean contentInUse; public boolean lockOnFinish; public boolean multiUserMode; - public Set sessionDTOs = new TreeSet(); + public boolean galleryWalkEnabled; + public boolean galleryWalkReadOnly; + public boolean galleryWalkStarted; + public boolean galleryWalkFinished; + public boolean galleryWalkEditEnabled; + public String galleryWalkInstructions; + public Set sessionDTOs = new TreeSet<>(); public Long currentTab; // reflection public boolean reflectOnActivity; @@ -61,6 +63,12 @@ contentInUse = mindmap.isContentInUse(); lockOnFinish = mindmap.isLockOnFinished(); multiUserMode = mindmap.isMultiUserMode(); + galleryWalkEnabled = mindmap.isGalleryWalkEnabled(); + galleryWalkReadOnly = mindmap.isGalleryWalkReadOnly(); + galleryWalkStarted = mindmap.isGalleryWalkStarted(); + galleryWalkFinished = mindmap.isGalleryWalkFinished(); + galleryWalkEditEnabled = mindmap.isGalleryWalkEditEnabled(); + galleryWalkInstructions = mindmap.getGalleryWalkInstructions(); reflectOnActivity = mindmap.isReflectOnActivity(); reflectInstructions = mindmap.getReflectInstructions(); @@ -129,6 +137,54 @@ this.multiUserMode = multiUserMode; } + public boolean isGalleryWalkEnabled() { + return galleryWalkEnabled; + } + + public void setGalleryWalkEnabled(boolean galleryWalkEnabled) { + this.galleryWalkEnabled = galleryWalkEnabled; + } + + public boolean isGalleryWalkReadOnly() { + return galleryWalkReadOnly; + } + + public void setGalleryWalkReadOnly(boolean galleryWalkReadOnly) { + this.galleryWalkReadOnly = galleryWalkReadOnly; + } + + public boolean isGalleryWalkStarted() { + return galleryWalkStarted; + } + + public void setGalleryWalkStarted(boolean galleryWalkStarted) { + this.galleryWalkStarted = galleryWalkStarted; + } + + public boolean isGalleryWalkFinished() { + return galleryWalkFinished; + } + + public void setGalleryWalkFinished(boolean galleryWalkFinished) { + this.galleryWalkFinished = galleryWalkFinished; + } + + public boolean isGalleryWalkEditEnabled() { + return galleryWalkEditEnabled; + } + + public void setGalleryWalkEditEnabled(boolean galleryWalkEditEnabled) { + this.galleryWalkEditEnabled = galleryWalkEditEnabled; + } + + public String getGalleryWalkInstructions() { + return galleryWalkInstructions; + } + + public void setGalleryWalkInstructions(String galleryWalkInstructions) { + this.galleryWalkInstructions = galleryWalkInstructions; + } + public Long getCurrentTab() { return currentTab; } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -r604a8b98bc089c78d262394c77d68a0e52473f4c --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 604a8b98bc089c78d262394c77d68a0e52473f4c) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.mindmap.model; import java.util.Date; @@ -50,12 +49,11 @@ private static final long serialVersionUID = 579733009969321015L; static Logger log = Logger.getLogger(MindmapService.class.getName()); - // Fields @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - + @Column(name = "create_date") private Date createDate; @@ -98,9 +96,27 @@ @Column(name = "reflect_instructions") private String reflectInstructions; + @Column(name = "gallery_walk_enabled") + private boolean galleryWalkEnabled; + + @Column(name = "gallery_walk_read_only") + private boolean galleryWalkReadOnly; + + @Column(name = "gallery_walk_started") + private boolean galleryWalkStarted; + + @Column(name = "gallery_walk_finished") + private boolean galleryWalkFinished; + + @Column(name = "gallery_walk_edit_enabled") + private boolean galleryWalkEditEnabled; + + @Column(name = "gallery_walk_instructions") + private String galleryWalkInstructions; + @OneToMany(mappedBy = "mindmap") private Set mindmapSessions; - + // Constructors /** default constructor */ @@ -307,12 +323,54 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * - * - * - */ + public boolean isGalleryWalkEnabled() { + return galleryWalkEnabled; + } + + public void setGalleryWalkEnabled(boolean galleryWalkEnabled) { + this.galleryWalkEnabled = galleryWalkEnabled; + } + + public boolean isGalleryWalkReadOnly() { + return galleryWalkReadOnly; + } + + public void setGalleryWalkReadOnly(boolean galleryWalkReadOnly) { + this.galleryWalkReadOnly = galleryWalkReadOnly; + } + + public boolean isGalleryWalkStarted() { + return galleryWalkStarted; + } + + public void setGalleryWalkStarted(boolean galleryWalkStarted) { + this.galleryWalkStarted = galleryWalkStarted; + } + + public boolean isGalleryWalkFinished() { + return galleryWalkFinished; + } + + public void setGalleryWalkFinished(boolean galleryWalkFinished) { + this.galleryWalkFinished = galleryWalkFinished; + } + + public boolean isGalleryWalkEditEnabled() { + return galleryWalkEditEnabled; + } + + public void setGalleryWalkEditEnabled(boolean galleryWalkEditEnabled) { + this.galleryWalkEditEnabled = galleryWalkEditEnabled; + } + + public String getGalleryWalkInstructions() { + return galleryWalkInstructions; + } + + public void setGalleryWalkInstructions(String galleryWalkInstructions) { + this.galleryWalkInstructions = galleryWalkInstructions; + } + public Set getMindmapSessions() { return mindmapSessions; } @@ -321,11 +379,6 @@ this.mindmapSessions = mindmapSessions; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -380,7 +433,7 @@ mindmap.setUid(null); // create an empty set for the mindmapSession - mindmap.mindmapSessions = new HashSet(); + mindmap.mindmapSessions = new HashSet<>(); } catch (CloneNotSupportedException cnse) { Mindmap.log.error("Error cloning " + Mindmap.class);