Index: lams_tool_nb/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/lams/ApplicationResources.properties,v diff -u -r1.21 -r1.22 --- lams_tool_nb/conf/language/lams/ApplicationResources.properties 29 Mar 2015 10:47:50 -0000 1.21 +++ lams_tool_nb/conf/language/lams/ApplicationResources.properties 15 Dec 2015 13:31:14 -0000 1.22 @@ -57,6 +57,7 @@ label.authoring.heading =Noticeboard Authoring button.submit =Finish message.no.reflection.available =No notebook entry has been added. +advanced.allow.comments=Allow learner comments +label.view.comments=View Comments - #======= End labels: Exported 51 labels for en AU ===== Index: lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.21 -r1.22 --- lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties 29 Mar 2015 10:47:50 -0000 1.21 +++ lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties 15 Dec 2015 13:31:14 -0000 1.22 @@ -57,6 +57,8 @@ label.authoring.heading =Noticeboard Authoring button.submit =Finish message.no.reflection.available =No notebook entry has been added. +advanced.allow.comments=Allow learner comments +label.view.comments=View Comments #======= End labels: Exported 51 labels for en AU ===== Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java,v diff -u -r1.27 -r1.28 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java 17 Jan 2014 22:10:33 -0000 1.27 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java 15 Dec 2015 13:31:14 -0000 1.28 @@ -62,7 +62,8 @@ public static final String MONITOR_PAGE = "monitorPage"; public static final String MONITOR_REFLECTION_PAGE ="monitorReflectionPage"; - + public static final String MONITOR_COMMENTS_PAGE ="monitorCommentsPage"; + // ------------------------------ // Action Names // ------------------------------ Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java,v diff -u -r1.21 -r1.22 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 3 Sep 2014 10:31:13 -0000 1.21 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 15 Dec 2015 13:31:14 -0000 1.22 @@ -73,6 +73,9 @@ /** nullable persistent field */ private Date dateUpdated; + + /** nullable persistent field */ + private boolean allowComments; /** persistent field */ private Set nbSessions = new HashSet(); @@ -83,8 +86,8 @@ /** full constructor */ public NoticeboardContent(Long nbContentId, String title, String content, boolean defineLater, - boolean reflectOnActivity, String reflectInstructions, boolean contentInUse, Long creatorUserId, - Date dateCreated, Date dateUpdated) { + boolean reflectOnActivity, String reflectInstructions, boolean contentInUse, Long creatorUserId, + Date dateCreated, Date dateUpdated, boolean allowComments) { this.nbContentId = nbContentId; this.title = title; this.content = content; @@ -95,6 +98,7 @@ this.creatorUserId = creatorUserId; this.dateCreated = dateCreated; this.dateUpdated = dateUpdated; + this.allowComments = allowComments; } /** @@ -113,6 +117,7 @@ this.creatorUserId = null; this.dateCreated = dateCreated; this.dateUpdated = null; + this.allowComments = false; } /** @@ -197,19 +202,19 @@ } /** - * @hibernate.property column="content_in_use" length="1" + * @hibernate.property column="allow_comments" length="1" */ - public boolean isContentInUse() { - return contentInUse; + public boolean isAllowComments() { + return allowComments; } /** - * @param contentInUse - * The contentInUse to set. + * @param allowComments + * The allowComments to set. */ - public void setContentInUse(boolean contentInUse) { - this.contentInUse = contentInUse; + public void setAllowComments(boolean allowComments) { + this.allowComments = allowComments; } /** @@ -263,6 +268,22 @@ } /** + * @hibernate.property column="content_in_use" length="1" + */ + + public boolean isContentInUse() { + return contentInUse; + } + + /** + * @param contentInUse + * The contentInUse to set. + */ + public void setContentInUse(boolean contentInUse) { + this.contentInUse = contentInUse; + } + + /** * Creates a new NoticeboardContent object from the supplied object. Assigns it the toContendId. * * @param nb @@ -277,7 +298,7 @@ RepositoryCheckedException { NoticeboardContent newContent = new NoticeboardContent(toContentId, nb.getTitle(), nb.getContent(), nb.isDefineLater(), nb.getReflectOnActivity(), nb.getReflectInstructions(), nb.isContentInUse(), - nb.getCreatorUserId(), nb.getDateCreated(), nb.getDateUpdated()); + nb.getCreatorUserId(), nb.getDateCreated(), nb.getDateUpdated(), nb.isAllowComments()); return newContent; } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151210.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151210.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151210.sql 15 Dec 2015 13:31:14 -0000 1.1 @@ -0,0 +1,16 @@ +-- 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-3631 Use simple commenting widget +ALTER TABLE tl_lanb11_content ADD COLUMN allow_comments TINYINT(1) DEFAULT 0; + +UPDATE lams_tool SET tool_version='20151210' WHERE tool_signature='lanb11'; + +----------------------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; \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java,v diff -u -r1.26 -r1.27 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 17 Jan 2014 22:10:34 -0000 1.26 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 15 Dec 2015 13:31:14 -0000 1.27 @@ -77,6 +77,7 @@ private String contentFolderID; private String defineLater; + private boolean allowComments; private boolean reflectOnActivity; private String reflectInstructions; @@ -95,6 +96,12 @@ this.defineLater = defineLater; } + public boolean isAllowComments() { + return allowComments; + } + public void setAllowComments(boolean allowComments) { + this.allowComments = allowComments; + } public boolean getReflectOnActivity() { return reflectOnActivity; } @@ -194,6 +201,7 @@ { setTitle(nbContent.getTitle()); setBasicContent(nbContent.getContent()); + setAllowComments(nbContent.isAllowComments()); setReflectOnActivity(nbContent.getReflectOnActivity()); setReflectInstructions(nbContent.getReflectInstructions()); } @@ -202,6 +210,7 @@ { nbContent.setTitle(getTitle()); nbContent.setContent(getBasicContent()); + nbContent.setAllowComments(isAllowComments()); if (defineLater == null || defineLater.length() == 0) { // ie. If defineLater is null or empty, this means we are in authoring nbContent.setReflectOnActivity(getReflectOnActivity()); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v diff -u -r1.29 -r1.30 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 17 Jan 2014 22:10:34 -0000 1.29 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 15 Dec 2015 13:31:14 -0000 1.30 @@ -186,6 +186,7 @@ } request.setAttribute("reflectInstructions", nbContent.getReflectInstructions()); request.setAttribute("reflectOnActivity", nbContent.getReflectOnActivity()); + request.setAttribute("allowComments", nbContent.isAllowComments()); Boolean userFinished = (nbUser!=null && NoticeboardUser.COMPLETED.equals(nbUser.getUserStatus())); request.setAttribute("userFinished", userFinished); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v diff -u -r1.32 -r1.33 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java 30 Mar 2014 13:58:27 -0000 1.32 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java 15 Dec 2015 13:31:14 -0000 1.33 @@ -71,6 +71,7 @@ * input=".monitoringContent" validate="false" parameter="method" * @struts:action-forward name="monitorPage" path="/monitoring/monitoring.jsp" * @struts:action-forward name="monitorReflectionPage" path="/monitoring/reflection.jsp" + * @struts:action-forward name="monitorCommentsPage" path="/monitoring/comments.jsp" * ----------------XDoclet Tags-------------------- */ public class NbMonitoringAction extends LamsDispatchAction { @@ -119,13 +120,15 @@ Set sessions = content.getNbSessions(); Iterator i = sessions.iterator(); - Map map = new HashMap(); + Map numUsersMap = new HashMap(); + Map sessionIdMap = new HashMap(); List reflections = new ArrayList(); while (i.hasNext()) { NoticeboardSession session = (NoticeboardSession) i.next(); int numUsersInSession = nbService.getNumberOfUsersInSession(session); - map.put(session.getNbSessionName(), new Integer(numUsersInSession)); + numUsersMap.put(session.getNbSessionName(), new Integer(numUsersInSession)); + sessionIdMap.put(session.getNbSessionName(), session.getNbSessionId()); // Get list of users that have made a reflection entry if (content.getReflectOnActivity()) { List sessionUsers = nbService.getUsersBySession(session.getNbSessionId()); @@ -143,16 +146,19 @@ } } } - monitorForm.setGroupStatsMap(map); + monitorForm.setGroupStatsMap(numUsersMap); + monitorForm.setSessionIdMap(sessionIdMap); boolean isGroupedActivity = nbService.isGroupedActivity(toolContentId); request.setAttribute("isGroupedActivity", isGroupedActivity); - + // Set reflection statistics, if reflection is set request.setAttribute("reflectOnActivity", content.getReflectOnActivity()); request.setAttribute("reflectInstructions", content.getReflectInstructions()); request.setAttribute("reflections", reflections); - + + request.setAttribute("allowComments", content.isAllowComments()); + String currentTab = WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true); monitorForm.setCurrentTab(currentTab != null? currentTab : SUMMARY_TABID); request.setAttribute(FORM, monitorForm); @@ -178,5 +184,15 @@ return mapping.findForward(NoticeboardConstants.MONITOR_REFLECTION_PAGE); } - + + public ActionForward viewComments ( + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws NbApplicationException + { + request.setAttribute(NoticeboardConstants.TOOL_SESSION_ID, request.getParameter(NoticeboardConstants.TOOL_SESSION_ID)); + return mapping.findForward(NoticeboardConstants.MONITOR_COMMENTS_PAGE); + } + } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java,v diff -u -r1.14 -r1.15 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java 17 Jan 2014 22:10:34 -0000 1.14 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java 15 Dec 2015 13:31:14 -0000 1.15 @@ -72,6 +72,7 @@ private String contentEditable; private Integer totalLearners; private Map groupStatsMap; + private Map sessionIdMap; /** * @return Returns the parametersToAppend. @@ -154,4 +155,10 @@ public void setTotalLearners(Integer totalLearners) { this.totalLearners = totalLearners; } + public Map getSessionIdMap() { + return sessionIdMap; + } + public void setSessionIdMap(Map sessionIdMap) { + this.sessionIdMap = sessionIdMap; + } } Index: lams_tool_nb/web/learnerContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/learnerContent.jsp,v diff -u -r1.31 -r1.32 --- lams_tool_nb/web/learnerContent.jsp 3 Apr 2014 18:32:19 -0000 1.31 +++ lams_tool_nb/web/learnerContent.jsp 15 Dec 2015 13:31:14 -0000 1.32 @@ -1,3 +1,4 @@ +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> <%@ include file="/includes/taglibs.jsp"%> @@ -65,6 +66,10 @@ + + + +
@@ -95,6 +100,7 @@
+ Index: lams_tool_nb/web/WEB-INF/urlrewrite.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/urlrewrite.xml,v diff -u -r1.1 -r1.2 --- lams_tool_nb/web/WEB-INF/urlrewrite.xml 29 Feb 2012 21:30:20 -0000 1.1 +++ lams_tool_nb/web/WEB-INF/urlrewrite.xml 15 Dec 2015 13:31:14 -0000 1.2 @@ -18,8 +18,8 @@ .*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i ^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i - ^/template/learnerTemplate.jsp$ - /template/mobileLearnerTemplate.jsp + ^/comments.jsp$ + /mobile/comments.jsp Index: lams_tool_nb/web/WEB-INF/tags/Comments.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Comments.tag,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_nb/web/WEB-INF/tags/Comments.tag 15 Dec 2015 13:31:14 -0000 1.1 @@ -0,0 +1,31 @@ +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-function" prefix="fn" %> + +<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%> +<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%> +<%@ attribute name="height" required="false" rtexprvalue="true"%> +<%@ attribute name="width" required="false" rtexprvalue="true"%> +<%@ attribute name="mode" required="false" rtexprvalue="true"%> + + + + + + + + + + + + &mode=${mode} + + + + + \ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:24 -0000 1.2 +++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 15 Dec 2015 13:31:14 -0000 1.3 @@ -481,5 +481,9 @@ head /WEB-INF/tags/Head.tag + + Comments + /WEB-INF/tags/Comments.tag + Index: lams_tool_nb/web/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/advance.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_nb/web/authoring/advance.jsp 20 Dec 2006 00:19:25 -0000 1.5 +++ lams_tool_nb/web/authoring/advance.jsp 15 Dec 2015 13:31:14 -0000 1.6 @@ -2,7 +2,15 @@ +

+ + +

+

Index: lams_tool_nb/web/learning/mobile/learnerContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/learning/mobile/learnerContent.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_nb/web/learning/mobile/learnerContent.jsp 9 Apr 2013 12:46:33 -0000 1.2 +++ lams_tool_nb/web/learning/mobile/learnerContent.jsp 15 Dec 2015 13:31:14 -0000 1.3 @@ -1,3 +1,4 @@ +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> <%@ include file="/includes/taglibs.jsp"%> @@ -64,6 +65,11 @@ + + + + +

Index: lams_tool_nb/web/monitoring/comments.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/comments.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_nb/web/monitoring/comments.jsp 15 Dec 2015 13:31:14 -0000 1.1 @@ -0,0 +1,27 @@ + + +<%@ include file="/includes/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> + + + + + + + + + + + + <fmt:message key="activity.title"/> + + + + +
+ +
+ + + Index: lams_tool_nb/web/monitoring/m_Statistics.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/m_Statistics.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_nb/web/monitoring/m_Statistics.jsp 11 Feb 2011 08:01:54 -0000 1.5 +++ lams_tool_nb/web/monitoring/m_Statistics.jsp 15 Dec 2015 13:31:14 -0000 1.6 @@ -5,17 +5,34 @@

- + + + + + + + + + - + + + + + + + + + +

Index: lams_tool_nb/web/monitoring/m_Summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/m_Summary.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_nb/web/monitoring/m_Summary.jsp 30 Mar 2014 14:19:56 -0000 1.9 +++ lams_tool_nb/web/monitoring/m_Summary.jsp 15 Dec 2015 13:31:14 -0000 1.10 @@ -51,6 +51,23 @@ + + + + + + + + + + + + + + + + +