Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r670004f992e5ed484da927cae0fa9f21802da40d -re67b31517d5a6991a5d88a3485bc23da8b6e65a0
--- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 670004f992e5ed484da927cae0fa9f21802da40d)
+++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e67b31517d5a6991a5d88a3485bc23da8b6e65a0)
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Jul 05 07:01:55 CST 2009
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 11 01:00:44 CST 2009
#=================== labels for LAMS Central =================#
@@ -273,5 +273,90 @@
label.lamscommunity.notRegistered.2 =However, you can download and import the sequences manually from the LAMS Community website:
label.lamscommunity.info =The LAMS Community is a global online community for all teachers, administrators and developers that use LAMS. Within the various sub-communities, you can access the latest news about LAMS, many different discussion forums, and a repository of shared LAMS sequences.
+# planner stuff
+index.planner =Planner
+planner.title =Pedagogical Planner
+label.description =Description
+planner.saved =All activities were saved successfully.
+planner.not.saved =There were errors in activities. Not all activities were saved.
+error.planner.title.blank =Sequence title must not be blank.
+label.planner.not.supported =This activity does not support the planner.
+button.planner.save =Save As Sequence
+label.planner.preview =Preview
+button.planner.view.full.author =View in Full Author
+label.planner.grouping.type=Group type
+label.planner.grouping.type.random=Random grouping
+label.planner.grouping.type.chosen=Choose in Monitor
+label.planner.grouping.type.learner.choice=Learner's choice
+label.planner.grouping.number.of.groups=Number of groups
+label.planner.grouping.number.of.learners=Number of learners
+error.planner.grouping.number.integer=Provided value must be a positive integer number.
+label.planner.grouping.equal.group.size=Equal group sizes
+msg.planner.not.saved =Are you sure you want to close? If you have not saved the design, changes you have made will be lost.
+label.planner.editing.advice=Editing advice
+label.planner.branch.empty =This branch is empty.
+label.planner.branch=Branch
+label.planner.branch.default=(default)
+label.planner.option=Option
+
+button.planner.editor.open=Open editor
+msg.planner.node.locked=This node is locked. You can not edit it.
+button.planner.save.node=Save node
+label.planner.create.subnode=Create subnode
+label.planner.edit.node=Edit node
+label.planner.root.node=Planner
+msg.planner.remove.node=Remove node
+label.planner.empty.subnode=There are no subnodes defined.
+label.planner.description.brief=Brief description (for parent node)
+label.planner.description.full=Full description (for self)
+label.planner.root.choose=Choose a planner from one of the following activity categories:
+msg.planner.remove.warning=Are you sure you want to remove this node and all of its subnodes?
+
+label.planner.node.type=This node:
+label.planner.node.type.subnodes=has subnodes
+label.planner.node.type.template=opens a template
+label.planner.remove.file=Remove file
+label.planner.change.file=Change file:
+label.planner.uploaded.template=Uploaded template file:
+msg.planner.move.node.up=Move node up
+msg.planner.move.node.down=Move node down
+label.planner.choose.file=Choose a template file:
+error.planner.node.title.blank=Node title must not be blank.
+error.planner.repository=There was a file respository error. Template file was not saved.
+error.planner.file.empty=You must upload a file.
+error.planner.file.bad.extension=Template file must have a ZIP or LAS extension.
+
+error.planner.tools=There were tool errors. Learning design could not be retrieved.
+error.planner.learning.design.retrieve=Learning design could not be retrieved.
+error.planner.file.open=There was an error while opening the template file.
+error.planner.editor=There was an error while opening the editor.
+error.planner.export=There was an error while exporting the node.
+error.planner.import=There was an error while importing the node.
+label.planner.export=Export node
+label.planner.import=Import node
+
+label.planner.import.instruction=Please select Pedagogical Planner node to import. The import file must be a .zip file exported from LAMS 2 or above.
+label.planner.grouping.view.students=View students before selection
+
+error.planner.filter.parse=There was an error when parsing the filter query.
+label.planner.filter.clear=Clear search results
+label.planner.filter=Search
+label.planner.filter.results.beginning=Search results for "
+label.planner.filter.results.ending=" in
+label.planner.locked=(locked)
+label.planner.filter.find.location=Found in:
+
+button.planner.template.close=Close editor
+msg.planner.editor.not.saved=Are you sure you want to close? If you have not saved the design, changes you have made will be lost and you will return to the previous node.
+
+label.planner.editor=Editor
+msg.planner.preview=Open the template in lesson preview.
+msg.planner.template.open=Open the template for editing.
+
+label.planner.export.sequence=Export sequence
+error.planner.export.template=There was an error while exporting the template.
+
+button.planner.back=Back
+
#======= End labels: Exported 266 labels for en AU =====
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -re67b31517d5a6991a5d88a3485bc23da8b6e65a0
--- lams_central/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_central/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision e67b31517d5a6991a5d88a3485bc23da8b6e65a0)
@@ -37,6 +37,7 @@
+
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -re67b31517d5a6991a5d88a3485bc23da8b6e65a0
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision e67b31517d5a6991a5d88a3485bc23da8b6e65a0)
@@ -333,11 +333,14 @@
}
}
// create DTO for the whole design
+ Long nodeUid = WebUtil.readLongParam(request, CentralConstants.PARAM_UID);
+
PedagogicalPlannerTemplateDTO planner = new PedagogicalPlannerTemplateDTO();
planner.setActivitySupportingPlannerCount(activitySupportingPlannerCount);
planner.setSequenceTitle(learningDesign.getTitle());
planner.setActivities(activities);
planner.setLearningDesignID(learningDesign.getLearningDesignId());
+ planner.setNodeUid(nodeUid);
// Some additional options for submitting activity forms; should be moved to configuration file in the future
planner.setSendInPortions(false);
@@ -577,9 +580,8 @@
getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath();
newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
- + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId()
- + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_MODE
- + PedagogicalPlannerAction.CHAR_EQUALS + "preview";
+ + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() + PedagogicalPlannerAction.CHAR_AMPERSAND
+ + AttributeNames.PARAM_MODE + PedagogicalPlannerAction.CHAR_EQUALS + "preview";
return new ActionForward(newPath, true);
}
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
diff -u -r56c565f6b6e596ec0de434127769de8986a090be -re67b31517d5a6991a5d88a3485bc23da8b6e65a0
--- lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision 56c565f6b6e596ec0de434127769de8986a090be)
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision e67b31517d5a6991a5d88a3485bc23da8b6e65a0)
@@ -168,7 +168,7 @@
}
}
- function leaveNodeEditor(text,url){
+ function leavePageAfterConfirm(text,url){
if (text==null || confirm(text)){
document.location.href=url;
}
Index: lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java
===================================================================
diff -u -r8f7975d272f91acc26c785848d82d26d6b5dd357 -re67b31517d5a6991a5d88a3485bc23da8b6e65a0
--- lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java (.../PedagogicalPlannerTemplateDTO.java) (revision 8f7975d272f91acc26c785848d82d26d6b5dd357)
+++ lams_common/src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java (.../PedagogicalPlannerTemplateDTO.java) (revision e67b31517d5a6991a5d88a3485bc23da8b6e65a0)
@@ -33,7 +33,16 @@
private List activities;
private Long learningDesignID;
private Integer activitySupportingPlannerCount = 0;
+ private Long nodeUid;
+ public Long getNodeUid() {
+ return nodeUid;
+ }
+
+ public void setNodeUid(Long nodeUid) {
+ this.nodeUid = nodeUid;
+ }
+
public String getSequenceTitle() {
return sequenceTitle;
}