Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.23 -r1.24
--- lams_learning/conf/language/lams/ApplicationResources.properties 10 Jun 2008 02:19:59 -0000 1.23
+++ lams_learning/conf/language/lams/ApplicationResources.properties 16 Jul 2008 06:09:41 -0000 1.24
@@ -89,6 +89,6 @@
export.portfolio.generation.complete.message =Export Portfolio completed
label.synch.gate.message =You have stopped at a gate. You cannot continue until all of your group/class reach this point. You must have at least 2 learners waiting for the gate to open.
label.preview.definelater.branching.message =The next activity ({0}) is set to define in monitor. Normally a staff member would configure the branches in monitoring. For the purposes of preview, you will be able to select which branch to preview.
+label.optional.maxReached =Maximum number optional activities reached.
-
#======= End labels: Exported 83 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.22 -r1.23
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 10 Jun 2008 02:19:59 -0000 1.22
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 16 Jul 2008 06:09:41 -0000 1.23
@@ -89,6 +89,6 @@
export.portfolio.generation.complete.message =Export Portfolio completed
label.synch.gate.message =You have stopped at a gate. You cannot continue until all of your group/class reach this point. You must have at least 2 learners waiting for the gate to open.
label.preview.definelater.branching.message =The next activity ({0}) is set to define in monitor. Normally a staff member would configure the branches in monitoring. For the purposes of preview, you will be able to select which branch to preview.
+label.optional.maxReached =Maximum number optional activities reached.
-
#======= End labels: Exported 83 labels for en AU =====
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java,v
diff -u -r1.20 -r1.21
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java 27 Jul 2007 00:36:47 -0000 1.20
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java 16 Jul 2008 06:09:42 -0000 1.21
@@ -101,6 +101,12 @@
if ( optionsActivity.getMinNumberOfOptionsNotNull().intValue() <= completedCount ) {
form.setFinished(true);
}
+
+ if (completedCount >= optionsActivity.getMaxNumberOfOptionsNotNull().intValue() )
+ {
+ form.setMaxActivitiesReached(true);
+ }
+
form.setMinimum(optionsActivity.getMinNumberOfOptionsNotNull().intValue());
form.setMaximum(optionsActivity.getMaxNumberOfOptionsNotNull().intValue());
form.setDescription(optionsActivity.getDescription());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java,v
diff -u -r1.6 -r1.7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java 15 May 2007 23:39:53 -0000 1.6
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java 16 Jul 2008 06:09:41 -0000 1.7
@@ -38,6 +38,7 @@
private int maximum;
private boolean finished;
private Long progressID;
+ private boolean maxActivitiesReached;
public String getTitle() {
return title;
@@ -75,4 +76,10 @@
public void setProgressID(Long progressID) {
this.progressID = progressID;
}
+ public boolean isMaxActivitiesReached() {
+ return maxActivitiesReached;
+ }
+ public void setMaxActivitiesReached(boolean maxActivitiesReached) {
+ this.maxActivitiesReached = maxActivitiesReached;
+ }
}
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.31 -r1.32
--- lams_learning/web/optionsActivity.jsp 30 May 2008 02:36:38 -0000 1.31
+++ lams_learning/web/optionsActivity.jsp 16 Jul 2008 06:09:41 -0000 1.32
@@ -80,11 +80,18 @@
+