Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v diff -u -r1.49 -r1.50 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties 30 Aug 2012 14:53:05 -0000 1.49 +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties 8 Nov 2012 15:05:38 -0000 1.50 @@ -237,6 +237,10 @@ error.attachment.executable =Uploaded file is executable label.upload.info =Uploaded file must not be executable and not exceed size of {0} output.desc.all.users.answers.definition.forum =Each learner's posts sent in the Forum +label.rateLimits.forum.reminder = Rating limitation: Minimum {0} and Maximum {1} per thread. +label.rateLimits.forum.reminder.min = You must rate at least {0} postings. +label.rateLimits.forum.reminder.max = You can only rate up to {0} postings. +js.error.validate.number = There is an error with the minimum and/or maximum set for ratings. Please check and try again. #======= End labels: Exported 231 labels for en AU ===== Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20121109_updateTo241.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20121109_updateTo241.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20121109_updateTo241.sql 8 Nov 2012 14:58:41 -0000 1.1 @@ -0,0 +1,19 @@ + +-- SQL statements to update to LAMS 2.4.1 + +-- 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-2921 Set max and min rate per thread +ALTER TABLE tl_lafrum11_forum ADD COLUMN minimum_rate integer DEFAULT 0; +ALTER TABLE tl_lafrum11_forum ADD COLUMN maximum_rate integer DEFAULT 0; + +UPDATE lams_tool SET tool_version = "20121109" WHERE tool_signature = "lafrum11"; + +----------------------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_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java,v diff -u -r1.34 -r1.35 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java 13 May 2011 07:27:15 -0000 1.34 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java 8 Nov 2012 15:05:38 -0000 1.35 @@ -73,7 +73,11 @@ private int maximumReply; private int minimumReply; + + private int maximumRate; + private int minimumRate; + private boolean allowRichEditor; private String instructions; @@ -677,4 +681,28 @@ public void setSubmissionDeadline(Date submissionDeadline) { this.submissionDeadline = submissionDeadline; } + + /** + * @hibernate.property column="maximum_rate" + * @return + */ + public int getMaximumRate() { + return maximumRate; + } + + public void setMaximumRate(int maximumRate) { + this.maximumRate = maximumRate; + } + + /** + * @hibernate.property column="minimum_rate" + * @return + */ + public int getMinimumRate() { + return minimumRate; + } + + public void setMinimumRate(int minimumRate) { + this.minimumRate = minimumRate; + } } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.58 -r1.59 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 15 Feb 2012 19:15:24 -0000 1.58 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 8 Nov 2012 15:05:38 -0000 1.59 @@ -72,10 +72,14 @@ public static final String ATTR_ALLOW_UPLOAD = "allowUpload"; public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics"; - + public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor"; public static final String ATTR_ALLOW_RATE_MESSAGES = "allowRateMessages"; + + public static final String ATTR_MINIMUM_RATE = "minimumRate"; + + public static final String ATTR_MAXIMUM_RATE = "maximumRate"; public static final String ATTR_LIMITED_CHARS = "limitedChars"; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v diff -u -r1.75 -r1.76 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 22 Feb 2012 13:18:49 -0000 1.75 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 8 Nov 2012 15:05:38 -0000 1.76 @@ -221,6 +221,8 @@ sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit()); sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD, forum.isAllowUpload()); sessionMap.put(ForumConstants.ATTR_ALLOW_RATE_MESSAGES, forum.isAllowRateMessages()); + sessionMap.put(ForumConstants.ATTR_MINIMUM_RATE, forum.getMinimumRate()); + sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate()); sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS, forum.isAllowNewTopic()); sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR, allowRichEditor); sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS, new Integer(allowNumber)); Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v diff -u -r1.29 -r1.30 --- lams_tool_forum/web/jsps/authoring/advance.jsp 15 Aug 2012 10:59:14 -0000 1.29 +++ lams_tool_forum/web/jsps/authoring/advance.jsp 8 Nov 2012 15:05:38 -0000 1.30 @@ -26,13 +26,52 @@

+ styleId="allowRateMessages" onclick="checkRating()" >

+

+ + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + + + + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + +

+ +

@@ -218,8 +257,8 @@ var allowNew = document.getElementsByName("forum.allowNewTopic"); var min= document.getElementById("minimumReply"); var max= document.getElementById("maximumReply"); - - //disable reply limited drop list + + //enable if rate is on if(allowNew[0].checked){ min.disabled=true; max.disabled=true; @@ -231,7 +270,35 @@ } } allowNewTopic(); + + function checkRating(){ + var allowRate = document.getElementsByName("forum.allowRateMessages"); + var min= document.getElementById("minimumRate"); + var max= document.getElementById("maximumRate"); + + if(allowRate[0].checked){ + min.disabled=false; + max.disabled=false; + } else { + min.disabled=true; + max.disabled=true; + } + } + checkRating(); + + function validateRatings() { + var minRateDropDown = document.getElementById("minimumRate"); + var minRatings = minRateDropDown.options[minRateDropDown.selectedIndex].value; + var maxRateDropDown = document.getElementById("maximumRate"); + var maxRatings = maxRateDropDown.options[maxRateDropDown.selectedIndex].value; + + if((minRatings > maxRatings) && !(maxRatings == 0)){ + alert(''); + } + + } + function checkReflection(){ var ropt = document.getElementById("reflectOn"); var rins = document.getElementById("reflectInstructions"); Index: lams_tool_forum/web/jsps/learning/viewforum.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v diff -u -r1.34 -r1.35 --- lams_tool_forum/web/jsps/learning/viewforum.jsp 12 Feb 2012 14:09:16 -0000 1.34 +++ lams_tool_forum/web/jsps/learning/viewforum.jsp 8 Nov 2012 15:05:38 -0000 1.35 @@ -59,9 +59,39 @@ + + + +

+ + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + + + <%@ include file="/common/messages.jsp"%> <%@ include file="/jsps/learning/message/topiclist.jsp"%>