Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e --- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) @@ -18,6 +18,7 @@ label.authoring.heading.advance.desc =Please input advance options for doKumaran label.authoring.basic.title =Title label.authoring.basic.instruction =Instruction +label.authoring.basic.description =Description label.authoring.advance.lock.on.finished =Lock when finished label.authoring.save.button =Save label.authoring.cancel.button =Cancel Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql =================================================================== diff -u --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql (revision 0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) @@ -0,0 +1,14 @@ +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- This patch contains files patch20170303.sql to patch20190103.sql +-- It should upgrade this tool to version 3.1 + +-- LDEV-4994 Add description field + +ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN description MEDIUMTEXT; + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) @@ -63,6 +63,9 @@ private String title; @Column + private String description; + + @Column private String instructions; // advance @@ -161,14 +164,15 @@ final Dokumaran genericEntity = (Dokumaran) o; return new EqualsBuilder().append(uid, genericEntity.uid).append(title, genericEntity.title) - .append(instructions, genericEntity.instructions).append(created, genericEntity.created) - .append(updated, genericEntity.updated).append(createdBy, genericEntity.createdBy).isEquals(); + .append(description, genericEntity.description).append(instructions, genericEntity.instructions) + .append(created, genericEntity.created).append(updated, genericEntity.updated) + .append(createdBy, genericEntity.createdBy).isEquals(); } @Override public int hashCode() { - return new HashCodeBuilder().append(uid).append(title).append(instructions).append(created).append(updated) - .append(createdBy).toHashCode(); + return new HashCodeBuilder().append(uid).append(title).append(description).append(instructions).append(created) + .append(updated).append(createdBy).toHashCode(); } /** @@ -261,6 +265,14 @@ this.title = title; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + /** * @return Returns the lockWhenFinish. */ Index: lams_tool_doku/web/pages/authoring/basic.jsp =================================================================== diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e --- lams_tool_doku/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 1cef918442124e8d987a285095a7504e3bc00461) +++ lams_tool_doku/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) @@ -9,6 +9,12 @@