+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r31f317875c94c8cd3db110322041de872579c3e8 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 31f317875c94c8cd3db110322041de872579c3e8)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -351,18 +351,19 @@
, default_tool_content_id BIGINT(20)
, valid_flag TINYINT(1) NOT NULL DEFAULT 1
, grouping_support_type_id INT(3) NOT NULL
- , supports_define_later_flag TINYINT(1) NOT NULL DEFAULT 0
, supports_run_offline_flag TINYINT(1) NOT NULL
- , supports_moderation_flag TINYINT(1) NOT NULL
- , supports_contribute_flag TINYINT(1) NOT NULL
, learner_url TEXT NOT NULL
+ , learner_preview_url TEXT
+ , learner_progress_url TEXT
, author_url TEXT NOT NULL
, define_later_url TEXT
- , export_portfolio_url TEXT NOT NULL
- , monitor_url TEXT NOT NULL
+ , export_pfolio_learner_url TEXT
+ , export_pfolio_class_url TEXT
+ , monitor_url TEXT
, contribute_url TEXT
, moderation_url TEXT
, create_date_time DATETIME NOT NULL
+ , language_file VARCHAR(255)
, UNIQUE UQ_lams_tool_sig (tool_signature)
, UNIQUE UQ_lams_tool_class_name (service_name)
, PRIMARY KEY (tool_id)
@@ -373,7 +374,11 @@
, CONSTRAINT FK_lams_tool_2 FOREIGN KEY (grouping_support_type_id)
REFERENCES lams_grouping_support_type (grouping_support_type_id)
)TYPE=InnoDB;
-
+ALTER TABLE lams_tool MODIFY COLUMN learner_preview_url TEXT
+ COMMENT 'Learner screen for preview a learning design. ';
+ALTER TABLE lams_tool MODIFY COLUMN learner_progress_url TEXT
+ COMMENT 'Teacher''s view of a learner''s screen.';
+
CREATE TABLE lams_learning_activity (
activity_id BIGINT(20) NOT NULL AUTO_INCREMENT
, activity_ui_id INT(11)
@@ -411,6 +416,7 @@
, create_grouping_id BIGINT(20)
, create_grouping_ui_id INT(11)
, library_activity_id BIGINT(20)
+ , language_file VARCHAR(255)
, PRIMARY KEY (activity_id)
, INDEX (learning_library_id)
, CONSTRAINT FK_lams_learning_activity_7 FOREIGN KEY (learning_library_id)
Fisheye: Tag 96364bdb8e7efa9b7e5f9e29fea3b223ea61914f refers to a dead (removed) revision in file `lams_common/db/sql/lams_11.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r067978bf0813698f2c65351e47328d99f67e0e4f -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 067978bf0813698f2c65351e47328d99f67e0e4f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -185,6 +185,10 @@
private Integer groupingSupportType;
+ /** Name of the file (including the package) that contains the text strings for
+ * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */
+ private String languageFile;
+
protected SimpleActivityStrategy simpleActivityStrategy;
//---------------------------------------------------------------------
@@ -214,7 +218,8 @@
Grouping grouping,
Integer activityTypeId,
Transition transitionTo,
- Transition transitionFrom) {
+ Transition transitionFrom,
+ String languageFile) {
this.activityId = activityId;
this.activityUIID = id;
this.description = description;
@@ -233,6 +238,7 @@
this.activityTypeId = activityTypeId;
this.transitionTo = transitionTo;
this.transitionFrom = transitionFrom;
+ this.languageFile = languageFile;
}
/** default constructor */
public Activity() {
@@ -614,6 +620,14 @@
{
this.activityCategoryID = activityCategoryID;
}
+
+ public String getLanguageFile() {
+ return languageFile;
+ }
+ public void setLanguageFile(String languageFile) {
+ this.languageFile = languageFile;
+ }
+
//---------------------------------------------------------------------
// Service Methods
//---------------------------------------------------------------------
@@ -815,6 +829,6 @@
public Vector validateActivity(MessageService messageService) {
return null;
}
+
-
}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
===================================================================
diff -u -recf8899873fe2472fe2aaab77d88110b2b006b22 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision ecf8899873fe2472fe2aaab77d88110b2b006b22)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -65,11 +65,12 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Set activities) {
super(activityId, id, description, title, xcoord, ycoord, orderId,
defineLater, createDateTime,
learningLibrary, parentActivity, libraryActivity,parentUIID,learningDesign, grouping,
- activityTypeId, transitionTo,transitionFrom);
+ activityTypeId, transitionTo,transitionFrom, languageFile);
this.activities = activities;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -74,6 +74,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Integer gateActivityLevelId,
Set waitingLearners)
{
@@ -94,7 +95,8 @@
grouping,
activityTypeId,
transitionTo,
- transitionFrom);
+ transitionFrom,
+ languageFile);
this.gateActivityLevelId = gateActivityLevelId;
this.waitingLearners = waitingLearners;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -63,7 +63,8 @@
Transition transitionFrom,
Grouping createGrouping,
Integer grouping_ui_id,
- Integer create_grouping_ui_id)
+ Integer create_grouping_ui_id,
+ String languageFile)
{
super(activityId,
id,
@@ -82,7 +83,8 @@
grouping,
activityTypeId,
transitionTo,
- transitionFrom);
+ transitionFrom,
+ languageFile);
this.createGrouping = createGrouping;
this.createGroupingUIID = create_grouping_ui_id;
super.simpleActivityStrategy = new GroupingActivityStrategy(this);
@@ -154,7 +156,8 @@
groupingActivity.setDefineLater(this.getDefineLater());
groupingActivity.setCreateDateTime(new Date());
groupingActivity.setRunOffline(this.getRunOffline());
- groupingActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+ groupingActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+ groupingActivity.setLanguageFile(this.getLanguageFile());
Grouping currentGrouping = this.getCreateGrouping();
Grouping newGrouping = currentGrouping.createCopy();
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java (.../OptionsActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java (.../OptionsActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -62,6 +62,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
java.util.Set activities,
Integer maxNumberOfOptions,
Integer minNumberOfOptions,
@@ -84,6 +85,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
activities);
this.maxNumberOfOptions = maxNumberOfOptions;
this.minNumberOfOptions = minNumberOfOptions;
@@ -150,6 +152,8 @@
newOptionsActivity.setRunOffline(this.getRunOffline());
newOptionsActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
newOptionsActivity.setLibraryActivity(this.getLibraryActivity());
+ newOptionsActivity.setLanguageFile(this.getLanguageFile());
+
return newOptionsActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -53,6 +53,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
java.util.Set activities) {
super(activityId,
id,
@@ -72,6 +73,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
activities);
super.activityStrategy = new ParallelActivityStrategy(this);
}
@@ -135,7 +137,8 @@
newParallelActivity.setRunOffline(this.getRunOffline());
newParallelActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
- newParallelActivity.setLibraryActivity(this.getLibraryActivity());
+ newParallelActivity.setLibraryActivity(this.getLibraryActivity());
+ newParallelActivity.setLanguageFile(this.getLanguageFile());
return newParallelActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -56,6 +56,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Integer gateActivityLevelId,
Set waitingLearners)
{
@@ -77,6 +78,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
gateActivityLevelId,
waitingLearners);
super.simpleActivityStrategy = new PermissionGateActivityStrategy(this);
@@ -145,7 +147,8 @@
newPermissionGateActivity.setCreateDateTime(new Date());
newPermissionGateActivity.setRunOffline(this.getRunOffline());
newPermissionGateActivity.setLibraryActivity(this.getLibraryActivity());
- newPermissionGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+ newPermissionGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+ newPermissionGateActivity.setLanguageFile(this.getLanguageFile());
return newPermissionGateActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
===================================================================
diff -u -r44df446bc6a02b35ba0bffc2bfa92ce78f80c763 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java (.../ScheduleGateActivity.java) (revision 44df446bc6a02b35ba0bffc2bfa92ce78f80c763)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java (.../ScheduleGateActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -104,6 +104,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Integer gateActivityLevelId,
Long gateStartTimeOffset,
Long gateEndTimeOffset,
@@ -126,6 +127,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
gateActivityLevelId,
waitingLearners);
//validate pre-condition.
@@ -213,7 +215,7 @@
newScheduleGateActivity.setRunOffline(this.getRunOffline());
newScheduleGateActivity.setLibraryActivity(this.getLibraryActivity());
newScheduleGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
-
+ newScheduleGateActivity.setLanguageFile(this.getLanguageFile());
return newScheduleGateActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -54,6 +54,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
java.util.Set activities) {
super(activityId,
id,
@@ -73,6 +74,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
activities);
super.activityStrategy = new SequenceActivityStrategy(this);
}
@@ -137,7 +139,7 @@
newSequenceActivity.setLibraryActivity(this.getLibraryActivity());
newSequenceActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
-
+ newSequenceActivity.setLanguageFile(this.getLanguageFile());
return newSequenceActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java (.../SimpleActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java (.../SimpleActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -57,7 +57,8 @@
LearningDesign learningDesign,
Grouping grouping,
Integer activityTypeId, Transition transitionTo,
- Transition transitionFrom){
+ Transition transitionFrom,
+ String languageFile){
super(activityId,
id,
description,
@@ -75,7 +76,8 @@
grouping,
activityTypeId,
transitionTo,
- transitionFrom);
+ transitionFrom,
+ languageFile);
}
/** default constructor */
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java (.../SynchGateActivity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java (.../SynchGateActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -55,6 +55,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Integer gateActivityLevelId,
Set waitingLearners) {
super(activityId,
@@ -75,6 +76,7 @@
activityTypeId,
transitionTo,
transitionFrom,
+ languageFile,
gateActivityLevelId,
waitingLearners);
super.simpleActivityStrategy = new SynchGateActivityStrategy(this);
@@ -144,6 +146,7 @@
newSynchGateActivity.setRunOffline(this.getRunOffline());
newSynchGateActivity.setLibraryActivity(this.getLibraryActivity());
newSynchGateActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
+ newSynchGateActivity.setLanguageFile(this.getLanguageFile());
return newSynchGateActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -r097386be99ea405bd2786be1fca936840b75d3ac -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 097386be99ea405bd2786be1fca936840b75d3ac)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -77,6 +77,7 @@
Integer activityTypeId,
Transition transitionTo,
Transition transitionFrom,
+ String languageFile,
Tool tool,
Long toolContentId)
{
@@ -97,7 +98,8 @@
grouping,
activityTypeId,
transitionTo,
- transitionFrom);
+ transitionFrom,
+ languageFile);
this.tool = tool;
this.toolContentId = toolContentId;
super.simpleActivityStrategy = new ToolActivityStrategy(this);
@@ -168,6 +170,8 @@
newToolActivity.setActivityCategoryID(this.getActivityCategoryID());
newToolActivity.setLibraryActivityUiImage(this.getLibraryActivityUiImage());
newToolActivity.setLibraryActivity(this.getLibraryActivity());
+ newToolActivity.setLanguageFile(this.getLanguageFile());
+
return newToolActivity;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -re914c457094df1826693bd4fcf1cb89bf49d98bc -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision e914c457094df1826693bd4fcf1cb89bf49d98bc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -132,6 +132,15 @@
/** The url of the tool's authoring screen. */
private String authoringURL;
+ /** The url of the tool's monitoring screen. */
+ private String monitoringURL;
+
+ /** The url of the tool's contribute screen. */
+ private String contributeURL;
+
+ /** The url of the tool's moderation screen. */
+ private String moderationURL;
+
/** The category of activity */
private Integer activityCategoryID;
@@ -174,6 +183,10 @@
* activity is this.*/
private Long libraryActivityID;
+ /** Name of the file (including the package) that contains the text strings for
+ * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */
+ private String languageFile;
+
/*****************************************************************************
* Constructors
*****************************************************************************/
@@ -183,6 +196,7 @@
Integer activityTypeId, Long groupingID, Integer groupingUIID,
Integer orderID, Boolean defineLater, Long learningDesignID,
Long learningLibraryID, Date createDateTime, Boolean runOffline,
+ String languageFile,
Integer maxOptions, Integer minOptions,
String optionsInstructions, Long toolID, Long toolContentID,
Integer activityCategoryID, Integer gateActivityLevelID,
@@ -211,6 +225,7 @@
this.learningLibraryID = learningLibraryID;
this.createDateTime = createDateTime;
this.runOffline = runOffline;
+ this.languageFile = languageFile;
this.maxOptions = maxOptions;
this.minOptions = minOptions;
this.optionsInstructions = optionsInstructions;
@@ -262,6 +277,7 @@
null;
this.createDateTime = activity.getCreateDateTime();
this.runOffline = activity.getRunOffline();
+ this.languageFile = activity.getLanguageFile();
this.activityCategoryID = activity.getActivityCategoryID();
this.libraryActivityUIImage = activity.getLibraryActivityUiImage();
this.libraryActivityID = activity.getLibraryActivity()!=null?
@@ -314,6 +330,9 @@
this.toolContentID = toolActivity.getToolContentId();
this.toolID = toolActivity.getTool().getToolId();
this.authoringURL = toolActivity.getTool().getAuthorUrl();
+ this.monitoringURL = toolActivity.getTool().getMonitorUrl();
+ this.contributeURL = toolActivity.getTool().getContributeUrl();
+ this.moderationURL = toolActivity.getTool().getModerationUrl();
this.toolDisplayName = toolActivity.getTool().getToolDisplayName();
}
private void addGateActivityAttributes(Object activity){
@@ -848,4 +867,34 @@
public void setToolDisplayName(String toolDisplayName) {
this.toolDisplayName = toolDisplayName;
}
+ /**
+ * Name of the file (including the package) that contains the text strings for
+ * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties.
+ */
+ public String getLanguageFile() {
+ return languageFile;
+ }
+ public void setLanguageFile(String languageFile) {
+ this.languageFile = languageFile;
+ }
+ /** Get the contribution url related to this tool */
+ public String getContributeURL() {
+ return contributeURL;
+ }
+ public void setContributeURL(String contributeURL) {
+ this.contributeURL = contributeURL;
+ }
+ /** Get the monitoring url related to this tool */
+ public String getMonitoringURL() {
+ return monitoringURL;
+ }
+ public void setMonitoringURL(String monitoringURL) {
+ this.monitoringURL = monitoringURL;
+ }
+ public String getModerationURL() {
+ return moderationURL;
+ }
+ public void setModerationURL(String moderationURL) {
+ this.moderationURL = moderationURL;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -41,33 +41,45 @@
private Long toolId;
/** persistent field */
+ private boolean supportsGrouping;
+
+ /** persistent field */
private String learnerUrl;
/** persistent field */
- private boolean supportsGrouping;
+ private String learnerPreviewUrl;
+ /** persistent field */
+ private String learnerProgressUrl;
+
/** nullable persistent field */
private String authorUrl;
+ /** nullable persistent field */
+ private String defineLaterUrl;
+
/** persistent field */
- private boolean supportsDefineLater;
+ private String exportPortfolioLearnerUrl;
/** persistent field */
- private boolean supportsModeration;
+ private String exportPortfolioClassUrl;
+
+ /** persistent field */
+ private String monitorUrl;
/** persistent field */
- private boolean supportsRunOffline;
+ private String contributeUrl;
/** persistent field */
- private boolean supportsContribute;
+ private String moderationUrl;
/** persistent field */
+ private boolean supportsRunOffline;
+
+ /** persistent field */
private boolean valid;
/** nullable persistent field */
- private String defineLaterUrl;
-
- /** nullable persistent field */
private long defaultToolContentId;
/** persistent field */
@@ -86,18 +98,6 @@
private Date createDateTime;
/** persistent field */
- private String exportPortfolioUrl;
-
- /** persistent field */
- private String monitorUrl;
-
- /** persistent field */
- private String contributeUrl;
-
- /** persistent field */
- private String moderationUrl;
-
- /** persistent field */
private Set activities;
/** persistent field */
@@ -109,54 +109,62 @@
/** persistent field */
private String toolVersion;
+ /** Name of the file (including the package) that contains the text strings for
+ * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */
+ private String languageFile;
+
+
/** full constructor */
public Tool(Long toolId,
String learnerUrl,
- boolean supportsGrouping,
+ String learnerPreviewUrl,
+ String learnerProgressUrl,
String authorUrl,
- boolean supportsDefineLater,
- boolean supportsModeration,
- boolean supportsRunOffline,
- boolean supportsContribute,
String defineLaterUrl,
+ String monitorUrl,
+ String contributeUrl,
+ String moderationUrl,
+ String exportPortfolioLearnerUrl,
+ String exportPortfolioClassUrl,
+ boolean supportsGrouping,
+ boolean supportsRunOffline,
long defaultToolContentId,
String toolSignature,
String toolDisplayName,
String description,
String className,
- String exportPortfolioUrl,
Set activities,
Integer groupingSupportTypeId,
Date createDateTime,
- String monitorUrl,
- String contributeUrl,
- String moderationUrl,
String toolIdentifier,
- String toolVersion)
+ String toolVersion,
+ String languageFile)
{
this.toolId = toolId;
this.learnerUrl = learnerUrl;
- this.supportsGrouping = supportsGrouping;
+ this.learnerPreviewUrl = learnerPreviewUrl;
+ this.learnerProgressUrl = learnerProgressUrl;
this.authorUrl = authorUrl;
- this.supportsDefineLater = supportsDefineLater;
- this.supportsModeration = supportsModeration;
- this.supportsContribute = supportsContribute;
- this.supportsRunOffline = supportsRunOffline;
this.defineLaterUrl = defineLaterUrl;
+ this.monitorUrl = monitorUrl;
+ this.contributeUrl = contributeUrl;
+ this.moderationUrl = moderationUrl;
+ this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl;
+ this.exportPortfolioClassUrl = exportPortfolioClassUrl;
+
+ this.supportsGrouping = supportsGrouping;
+ this.supportsRunOffline = supportsRunOffline;
this.defaultToolContentId = defaultToolContentId;
this.toolSignature = toolSignature;
this.toolDisplayName = toolDisplayName;
this.description = description;
this.serviceName = className;
- this.exportPortfolioUrl = exportPortfolioUrl;
this.activities = activities;
this.groupingSupportTypeId = groupingSupportTypeId;
this.createDateTime = createDateTime;
- this.monitorUrl = monitorUrl;
- this.contributeUrl = contributeUrl;
- this.moderationUrl = moderationUrl;
this.toolIdentifier = toolIdentifier;
this.toolVersion = toolVersion;
+ this.languageFile = languageFile;
}
/** default constructor */
@@ -166,39 +174,31 @@
/** minimal constructor */
public Tool(Long toolId,
String learnerUrl,
+ String authorUrl,
boolean supportsGrouping,
- boolean supportsDefineLater,
- boolean supportsModeration,
- boolean supportsContribute,
boolean supportsRunOffline,
long defaultToolContentId,
String toolSignature,
String toolDisplayName,
String className,
- String exportPortfolioUrl,
Set activities,
Integer groupingSupportTypeId,
Date createDateTime,
- String monitorUrl,
String toolIdentifier,
String toolVersion)
{
this.toolId = toolId;
this.learnerUrl = learnerUrl;
+ this.authorUrl = authorUrl;
this.supportsGrouping = supportsGrouping;
- this.supportsDefineLater = supportsDefineLater;
- this.supportsModeration = supportsModeration;
- this.supportsContribute = supportsContribute;
this.supportsRunOffline = supportsRunOffline;
this.defaultToolContentId = defaultToolContentId;
this.toolSignature = toolSignature;
this.toolDisplayName = toolDisplayName;
this.serviceName = className;
- this.exportPortfolioUrl = exportPortfolioUrl;
this.activities = activities;
this.groupingSupportTypeId = groupingSupportTypeId;
this.createDateTime = createDateTime;
- this.monitorUrl = monitorUrl;
this.toolIdentifier = toolIdentifier;
this.toolVersion = toolVersion;
}
@@ -216,7 +216,7 @@
}
/**
- * @hibernate.property column="learner_url"length="65535"
+ * @hibernate.property column="learner_url" length="65535"
* not-null="true"
*/
public String getLearnerUrl() {
@@ -227,25 +227,41 @@
this.learnerUrl = learnerUrl;
}
- /**
- * @hibernate.property column="supports_contribute_flag" length="1"
- * not-null="true"
- * @return Returns the supportsContribute.
+ /**
+ * @hibernate.property column="learner_preview_url" length="65535"
+ * not-null="false"
*/
- public boolean getSupportsContribute()
- {
- return supportsContribute;
+ public String getLearnerPreviewUrl() {
+ return this.learnerPreviewUrl;
}
+
+ public void setLearnerPreviewUrl(String learnerPreviewUrl) {
+ this.learnerPreviewUrl = learnerPreviewUrl;
+ }
+
+ /**
+ * @hibernate.property column="learner_progress_url" length="65535"
+ * not-null="false"
+ */
+ public String getLearnerProgressUrl() {
+ return this.learnerProgressUrl;
+ }
+
+ public void setLearnerProgressUrl(String learnerProgressUrl) {
+ this.learnerProgressUrl = learnerProgressUrl;
+ }
+
/**
- * @param supportsContribute The supportsContribute to set.
+ * Does this tool support contribute? Will be true if the contributeURL is not null/empty string.
*/
- public void setSupportsContribute(boolean supportsContribute)
+ public boolean getSupportsContribute()
{
- this.supportsContribute = supportsContribute;
+ String contributeURL = getContributeUrl();
+ return ( contributeURL != null && contributeURL.trim().length() > 0);
}
/**
- * @hibernate.property column="author_url" length="65535"
+ * @hibernate.property column="author_url" length="65535" not-null="true"
*/
public String getAuthorUrl() {
return this.authorUrl;
@@ -256,33 +272,21 @@
}
/**
- * @hibernate.property column="supports_define_later_flag" length="1"
- * not-null="true"
+ * Does this tool support define later? Will be true if the defineLaterURL is not null/empty string.
*/
public boolean getSupportsDefineLater() {
- return this.supportsDefineLater;
+ String url = getDefineLaterUrl();
+ return ( url != null && url.trim().length() > 0);
}
- public void setSupportsDefineLater(boolean supportsDefineLater) {
- this.supportsDefineLater = supportsDefineLater;
- }
-
/**
- * @hibernate.property column="supports_moderation_flag" length="1"
- * not-null="true"
- * @return Returns the supportsModeration.
+ * Does this tool support moderation? Will be true if the moderateURL is not null/empty string.
*/
public boolean getSupportsModeration()
{
- return supportsModeration;
+ String url = getModerationUrl();
+ return ( url != null && url.trim().length() > 0);
}
- /**
- * @param supportsModeration The supportsModeration to set.
- */
- public void setSupportsModeration(boolean supportsModeration)
- {
- this.supportsModeration = supportsModeration;
- }
/**
* @hibernate.property column="supports_run_offline_flag" length="1"
@@ -303,7 +307,7 @@
}
/**
- * @hibernate.property column="define_later_url" length="65535"
+ * @hibernate.property column="define_later_url" length="65535" not-null="false"
*/
public String getDefineLaterUrl() {
return this.defineLaterUrl;
@@ -373,18 +377,30 @@
}
/**
- * @hibernate.property column="export_portfolio_url" length="65535"
- * not-null="true"
+ * @hibernate.property column="export_pfolio_learner_url" length="65535"
+ * not-null="false"
*/
- public String getExportPortfolioUrl() {
- return this.exportPortfolioUrl;
+ public String getExportPortfolioLearnerUrl() {
+ return this.exportPortfolioLearnerUrl;
}
- public void setExportPortfolioUrl(String exportPortfolioUrl) {
- this.exportPortfolioUrl = exportPortfolioUrl;
+ public void setExportPortfolioLearnerUrl(String exportPortfolioLearnerUrl) {
+ this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl;
}
/**
+ * @hibernate.property column="export_pfolio_class_url" length="65535"
+ * not-null="false"
+ */
+ public String getExportPortfolioClassUrl() {
+ return this.exportPortfolioClassUrl;
+ }
+
+ public void setExportPortfolioClassUrl(String exportPortfolioClassUrl) {
+ this.exportPortfolioClassUrl = exportPortfolioClassUrl;
+ }
+
+ /**
* @hibernate.set lazy="true" inverse="true" cascade="none"
* @hibernate.collection-key column="tool_id"
* @hibernate.collection-one-to-many
@@ -449,7 +465,7 @@
/**
- * @hibernate.property column="contribute_url" length="65535"
+ * @hibernate.property column="contribute_url" length="65535" not-null="false"
* @return Returns the contributeUrl.
*/
public String getContributeUrl()
@@ -464,7 +480,7 @@
this.contributeUrl = contributeUrl;
}
/**
- * @hibernate.property column="moderation_url" length="65535"
+ * @hibernate.property column="moderation_url" length="65535" not-null="false"
* @return Returns the moderationUrl.
*/
public String getModerationUrl()
@@ -479,7 +495,7 @@
this.moderationUrl = moderationUrl;
}
/**
- * @hibernate.property column="monitor_url" length="65535"
+ * @hibernate.property column="monitor_url" length="65535" not-null="false"
* @return Returns the monitorUrl.
*/
public String getMonitorUrl()
@@ -517,6 +533,18 @@
this.toolVersion = toolVersion;
}
+
+ /**
+ * @hibernate.property column="language_file" length="255" not-null="false"
+ */
+ public String getLanguageFile() {
+ return languageFile;
+ }
+
+ public void setLanguageFile(String languageFile) {
+ this.languageFile = languageFile;
+ }
+
public String toString() {
return new ToStringBuilder(this)
.append("toolId", getToolId())
@@ -546,4 +574,5 @@
vo.setAuthorUrl(this.getAuthorUrl());
return vo;
}
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolAccessMode.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolAccessMode.java (.../ToolAccessMode.java) (revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolAccessMode.java (.../ToolAccessMode.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -17,6 +17,14 @@
* It resolves the performance and potential hard coding error problems of using
* interface to define enum type.
*
+ * This set of modes is a helper for tools. Some tools may want to use the same
+ * code for the three versions of the learner screen (ordinary, learner progress and
+ * preview) or for the two versions of export portfolio (leaner and teacher).
+ * If a tool wants to do this, they should include mode=author, mode=teacher
+ * and mode=learner in their url definitions, and use the helper methods
+ * WebUtil.readToolAccessModeParam() and WebUtil.getToolAccessMode() to access
+ * the modes.
+ *
* As a class, it can implement any interface as we want. For now, it implements
* serializable because we might need to set it into http session. To ensure
* serializable works properly, readResolve() must be overriden.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
===================================================================
diff -u -r86d71c1ef9ce4edd930b678d8c3942f837641a8b -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision 86d71c1ef9ce4edd930b678d8c3942f837641a8b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -146,17 +146,30 @@
public void updateToolSession(ToolSession toolSession);
/**
- * Return tool activity url for a learner according to the access mode.
- * For example, the monitor side sould passed in the teacher mode and
- * learning side sould pass in the learner mode.
+ * Return tool activity url for a learner. See also getToolPreviewURL, getToolLearnerProgressURL
* @param activity the requested activity.
* @param learner the current learner.
- * @param accessMode tool access mode.
* @return the tool access url with tool session id and access mode.
*/
- public String getLearnerToolURLByMode(ToolActivity activity, User learner, ToolAccessMode accessMode) throws LamsToolServiceException;
+ public String getToolLearnerURL(ToolActivity activity, User learner) throws LamsToolServiceException;
/**
+ * Return tool activity url for running a tool in preview mode. See also getToolLearnerURL, getToolLearnerProgressURL
+ * @param activity the requested activity.
+ * @param learner the current learner.
+ * @return the tool access url with tool session id and access mode.
+ */
+ public String getToolLearnerPreviewURL(ToolActivity activity, User learner) throws LamsToolServiceException;
+
+ /**
+ * Return tool activity url for running a tool in preview mode. See also getToolLearnerURL, getToolPreviewURL
+ * @param activity the requested activity.
+ * @param learner the current learner.
+ * @return the tool access url with tool session id and access mode.
+ */
+ public String getToolLearnerProgressURL(ToolActivity activity, User learner) throws LamsToolServiceException;
+
+ /**
* Get all the tool sessions for a lesson. The resulting list is not sorted.
* @return list of ToolSession objects
*/
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
diff -u -r86d71c1ef9ce4edd930b678d8c3942f837641a8b -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 86d71c1ef9ce4edd930b678d8c3942f837641a8b)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -269,36 +269,31 @@
/**
- * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getLearnerToolURLByMode(org.lamsfoundation.lams.learningdesign.ToolActivity, org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.tool.ToolAccessMode)
+ * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getToolLearnerURL(org.lamsfoundation.lams.learningdesign.ToolActivity, org.lamsfoundation.lams.usermanagement.User)
*/
- public String getLearnerToolURLByMode(ToolActivity activity,
- User learner,
- ToolAccessMode accessMode) throws LamsToolServiceException
+ public String getToolLearnerURL(ToolActivity activity,User learner) throws LamsToolServiceException
{
String toolURL = activity.getTool().getLearnerUrl();
-
- if(accessMode==ToolAccessMode.LEARNER) {
- toolURL = appendModeToURL(ToolAccessMode.LEARNER, toolURL);
- } else if(accessMode == ToolAccessMode.TEACHER) {
- toolURL = appendModeToURL(ToolAccessMode.TEACHER, toolURL);
- toolURL = appendUserIDToURL(learner, toolURL);
- } else if (accessMode == ToolAccessMode.AUTHOR) {
- toolURL = appendModeToURL(ToolAccessMode.AUTHOR, toolURL);
- } else {
- throw new LamsToolServiceException("Unknown tool access mode:"+accessMode.toString());
- }
return setupToolURLWithToolSession(activity, learner, toolURL);
}
+ /**
+ * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getToolLearnerPreviewURL(org.lamsfoundation.lams.learningdesign.ToolActivity, org.lamsfoundation.lams.usermanagement.User)
+ */
+ public String getToolLearnerPreviewURL(ToolActivity activity,User authorLearner) throws LamsToolServiceException
+ {
+ String toolURL = activity.getTool().getLearnerPreviewUrl();
+ return setupToolURLWithToolSession(activity, authorLearner, toolURL);
+ }
/**
- * Add the mode=TEACHER, mode=LEARNER or mode=AUTHOR to the supplied URL
+ * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getToolLearnerProgressURL(org.lamsfoundation.lams.learningdesign.ToolActivity, org.lamsfoundation.lams.usermanagement.User)
*/
- private String appendModeToURL(ToolAccessMode toolAccessMode,String toolURL)
+ public String getToolLearnerProgressURL(ToolActivity activity,User learner) throws LamsToolServiceException
{
- return WebUtil.appendParameterToURL(toolURL,
- AttributeNames.PARAM_MODE,
- toolAccessMode.toString());
+ String toolURL = activity.getTool().getLearnerProgressUrl();
+ toolURL = appendUserIDToURL(learner, toolURL);
+ return setupToolURLWithToolSession(activity, learner, toolURL);
}
/**
Index: lams_common/src/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml
===================================================================
diff -u -rc29fa38c77517dfbcc7765fb08836f22340090f2 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision c29fa38c77517dfbcc7765fb08836f22340090f2)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -48,7 +48,7 @@
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
PROPAGATION_REQUIRED
- PROPAGATION_REQUIRED,readOnly
+ PROPAGATION_REQUIRED
Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
diff -u -r3bdb4fcc6476c118fb240ede2739369e88aefa48 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision 3bdb4fcc6476c118fb240ede2739369e88aefa48)
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -320,7 +320,10 @@
}
/**
- * Retrieve the tool access mode from http request
+ * Retrieve the tool access mode from http request. This is a utility used by the tools that share an implementation for
+ * the learner screen. They use mode=learner, mode=author and mode=teacher for learning, preview and monitoring respectively.
+ * Only used if the tool programmer wants to have one call that supports all three ways of looking at a learner screen.
+ *
* @param request
* @param param_mode
* @return the ToolAccessMode object
@@ -340,7 +343,10 @@
}
/**
- * Retrieve the tool access mode from a string value, presumably from a Form
+ * Retrieve the tool access mode from a string value, presumably from a Form.
+ * This is a utility used by the tools that share an implementation for the learner screen.
+ * They use mode=learner, mode=author and mode=teacher for learning, preview and monitoring respectively.
+ * Only used if the tool programmer wants to have one call that supports all three ways of looking at a learner screen.
* @param request
* @param param_mode
* @return the ToolAccessMode object
Index: lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java
===================================================================
diff -u -ra47e0259ee44890918d7cf47ab4608fdef80144b -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java (.../TestLamsCoreToolService.java) (revision a47e0259ee44890918d7cf47ab4608fdef80144b)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/service/TestLamsCoreToolService.java (.../TestLamsCoreToolService.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -91,44 +91,40 @@
assertNotNull(tgroupedToolSession);
}
- public void testGetToolURLByLearnerMode() throws LamsToolServiceException
+ public void testGetToolLearnerURL() throws LamsToolServiceException
{
- String learnerUrl = toolService.getLearnerToolURLByMode(testNonGroupedActivity,testUser,ToolAccessMode.LEARNER);
-
+ String learnerUrl = toolService.getToolLearnerURL(testNonGroupedActivity,testUser);
assertNotNull(learnerUrl);
assertTrue(learnerUrl.indexOf("?")>0);
- assertTrue(learnerUrl.indexOf(ToolAccessMode.LEARNER.toString())>0);
- assertTrue(learnerUrl.indexOf(AttributeNames.PARAM_MODE)>0);
+ assertTrue(learnerUrl.indexOf(AttributeNames.PARAM_TOOL_SESSION_ID)>0);
log.info("learner url:"+learnerUrl);
}
- public void testGetToolURLByTeacherMode() throws LamsToolServiceException
+ public void testGetToolLearnerProgressURL() throws LamsToolServiceException
{
- String monitorUrl = toolService.getLearnerToolURLByMode(testNonGroupedActivity,testUser,ToolAccessMode.TEACHER);
+ String monitorUrl = toolService.getToolLearnerProgressURL(testNonGroupedActivity,testUser);
assertNotNull(monitorUrl);
log.info("monitor url:"+monitorUrl);
assertTrue(monitorUrl.indexOf("?")>0);
- assertTrue(monitorUrl.indexOf(ToolAccessMode.TEACHER.toString())>0);
- assertTrue(monitorUrl.indexOf(AttributeNames.PARAM_MODE)>0);
-
+ assertTrue(monitorUrl.indexOf(AttributeNames.PARAM_TOOL_SESSION_ID)>0);
+ assertTrue(monitorUrl.indexOf(AttributeNames.PARAM_USER_ID)>0);
}
- public void testGetToolURLByAuthorMode() throws LamsToolServiceException
+ public void testGetToolLearnerPreviewURL() throws LamsToolServiceException
{
- String authorUrl = toolService.getLearnerToolURLByMode(testNonGroupedActivity,testUser,ToolAccessMode.AUTHOR);
+ String authorUrl = toolService.getToolLearnerPreviewURL(testNonGroupedActivity,testUser);
assertNotNull(authorUrl);
log.info("author url:"+authorUrl);
assertTrue(authorUrl.indexOf("?")>0);
- assertTrue(authorUrl.indexOf(ToolAccessMode.AUTHOR.toString())>0);
- assertTrue(authorUrl.indexOf(AttributeNames.PARAM_MODE)>0);
+ assertTrue(authorUrl.indexOf(AttributeNames.PARAM_TOOL_SESSION_ID)>0);
}
- public void testGetToolURLByLearnerModeForGroupedTool() throws LamsToolServiceException
+ public void testGetToolLearnerURLForGroupedTool() throws LamsToolServiceException
{
- String learnerUrl = toolService.getLearnerToolURLByMode(testGroupedActivity,testUser,ToolAccessMode.LEARNER);
+ String learnerUrl = toolService.getToolLearnerURL(testGroupedActivity,testUser);
assertNotNull(learnerUrl);
log.info("Non grouped activity learner url:"+learnerUrl);
Index: lams_tool_forum/db/sql/activity_insert.sql
===================================================================
diff -u -rb4d8771b8cc8140886291733e3de0f9499a0e66b -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_forum/db/sql/activity_insert.sql (.../activity_insert.sql) (revision b4d8771b8cc8140886291733e3de0f9499a0e66b)
+++ lams_tool_forum/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -39,6 +39,7 @@
, create_grouping_id
, create_grouping_ui_id
, library_activity_id
+, language_file
)
VALUES
(
@@ -77,4 +78,5 @@
, NULL
, NULL
, NULL
+, 'org.lamsfoundation.lams.tool.forum.web.ApplicationResources'
)
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
diff -u -rb4d8771b8cc8140886291733e3de0f9499a0e66b -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision b4d8771b8cc8140886291733e3de0f9499a0e66b)
+++ lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -14,17 +14,18 @@
default_tool_content_id,
valid_flag,
grouping_support_type_id,
-supports_define_later_flag,
supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
learner_url,
+learner_preview_url,
+learner_progress_url,
author_url,
monitor_url,
define_later_url,
-export_portfolio_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
contribute_url,
moderation_url,
+language_file,
create_date_time
)
VALUES
@@ -40,15 +41,16 @@
0,
2,
1,
-1,
-1,
-0,
-'tool/lafrum11/learning/viewForum.do',
+'tool/lafrum11/learning/viewForum.do?mode=learner',
+'tool/lafrum11/learning/viewForum.do?mode=author',
+'tool/lafrum11/learning/viewForum.do?mode=teacher',
'tool/lafrum11/authoring/init.do',
'tool/lafrum11/monitoring/listContentUsers.do',
'tool/lafrum11/defineLater.do',
-'tool/lafrum11/exportPortfolio',
+'tool/lafrum11/exportPortfolio?mode=learner',
+'tool/lafrum11/exportPortfolio?mode=teacher',
'tool/lafrum11/contribute.do',
'tool/lafrum11/moderate.do',
+'org.lamsfoundation.lams.tool.forum.web.ApplicationResources',
NOW()
)
Index: lams_tool_lamc/db/sql/activity_insert.sql
===================================================================
diff -u -r1e2c58c34d6b4e5d44b54e100f742d22a1b514a0 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 1e2c58c34d6b4e5d44b54e100f742d22a1b514a0)
+++ lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -39,6 +39,7 @@
, create_grouping_id
, create_grouping_ui_id
, library_activity_id
+, language_file
)
VALUES
(
@@ -77,4 +78,5 @@
, NULL
, NULL
, NULL
+,'org.lamsfoundation.lams.tool.mc.McResources'
)
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
diff -u -r658fa2d9332965ecce4ad6d3961fa6f2ce8ad8ef -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 658fa2d9332965ecce4ad6d3961fa6f2ce8ad8ef)
+++ lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -14,17 +14,18 @@
default_tool_content_id,
valid_flag,
grouping_support_type_id,
-supports_define_later_flag,
supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
learner_url,
+learner_preview_url,
+learner_progress_url,
author_url,
-define_later_url,
-export_portfolio_url,
monitor_url,
+define_later_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
contribute_url,
moderation_url,
+language_file,
create_date_time
)
VALUES
@@ -40,15 +41,16 @@
0,
2,
1,
-1,
-1,
-0,
-'tool/lamc11/learningStarter.do',
+'tool/lamc11/learningStarter.do?mode=learner',
+'tool/lamc11/learningStarter.do?mode=author',
+'tool/lamc11/learningStarter.do?mode=teacher',
'tool/lamc11/authoringStarter.do',
+'tool/lamc11/monitoringStarter.do',
'tool/lamc11/defineLaterStarter.do',
-'tool/lamc11/portfolioExport',
+'tool/lamc11/portfolioExport?mode=learner',
+'tool/lamc11/portfolioExport?mode=teacher',
'tool/lamc11/monitoringStarter.do',
'tool/lamc11/monitoringStarter.do',
-'tool/lamc11/monitoringStarter.do',
+'org.lamsfoundation.lams.tool.mc.McResources',
NOW()
)
Index: lams_tool_laqa/db/sql/activity_insert.sql
===================================================================
diff -u -r5be03595a347709c737d01bdaec5cbc986c04040 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_laqa/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 5be03595a347709c737d01bdaec5cbc986c04040)
+++ lams_tool_laqa/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -39,6 +39,7 @@
, create_grouping_id
, create_grouping_ui_id
, library_activity_id
+, language_file
)
VALUES
(
@@ -77,4 +78,5 @@
, NULL
, NULL
, NULL
+, 'org.lamsfoundation.lams.tool.qa.QaResources'
)
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -rbe3dd87b1e0a6417681d6ba8e9c7cc432cedd2f7 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision be3dd87b1e0a6417681d6ba8e9c7cc432cedd2f7)
+++ lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -14,17 +14,18 @@
default_tool_content_id,
valid_flag,
grouping_support_type_id,
-supports_define_later_flag,
supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
learner_url,
+learner_preview_url,
+learner_progress_url,
author_url,
-define_later_url,
-export_portfolio_url,
monitor_url,
+define_later_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
contribute_url,
moderation_url,
+language_file,
create_date_time
)
VALUES
@@ -36,19 +37,20 @@
'qa',
'1.1',
NULL,
-10,
+NULL,
0,
2,
1,
-1,
-1,
-0,
-'tool/laqa11/learningStarter.do',
+'tool/laqa11/learningStarter.do?mode=learner',
+'tool/laqa11/learningStarter.do?mode=author',
+'tool/laqa11/learningStarter.do?mode=teacher',
'tool/laqa11/authoringStarter.do',
-'tool/laqa11/defineLaterStarter.do',
-'tool/laqa11/export.do',
'tool/laqa11/monitoringStarter.do',
+'tool/laqa11/defineLaterStarter.do',
+'tool/laqa11/export.do?mode=learner',
+'tool/laqa11/export.do?mode=teacher',
'tool/laqa11/monitoring.do',
'tool/laqa11/monitoring.do',
+'org.lamsfoundation.lams.tool.qa.QaResources',
NOW()
)
Index: lams_tool_nb/db/sql/activity_insert.sql
===================================================================
diff -u -r5be03595a347709c737d01bdaec5cbc986c04040 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_nb/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 5be03595a347709c737d01bdaec5cbc986c04040)
+++ lams_tool_nb/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -39,6 +39,7 @@
, create_grouping_id
, create_grouping_ui_id
, library_activity_id
+, language_file
)
VALUES
(
@@ -77,4 +78,5 @@
, NULL
, NULL
, NULL
+, 'org.lamsfoundation.lams.tool.noticeboard.ApplicationProperties'
)
Index: lams_tool_nb/db/sql/tool_insert.sql
===================================================================
diff -u -r5be03595a347709c737d01bdaec5cbc986c04040 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 5be03595a347709c737d01bdaec5cbc986c04040)
+++ lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -14,17 +14,18 @@
default_tool_content_id,
valid_flag,
grouping_support_type_id,
-supports_define_later_flag,
supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
learner_url,
+learner_preview_url,
+learner_progress_url,
author_url,
-define_later_url,
-export_portfolio_url,
monitor_url,
+define_later_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
contribute_url,
moderation_url,
+language_file,
create_date_time
)
VALUES
@@ -40,15 +41,16 @@
0,
2,
1,
-1,
-0,
-0,
-'tool/lanb11/starter/learner.do',
+'tool/lanb11/starter/learner.do?mode=learner',
+'tool/lanb11/starter/learner.do?mode=author',
+'tool/lanb11/starter/learner.do?mode=teacher',
'tool/lanb11/authoring.do',
-'tool/lanb11/authoring.do?defineLater=true',
-'tool/lanb11/portfolioExport',
'tool/lanb11/monitoring.do',
+'tool/lanb11/authoring.do?defineLater=true',
+'tool/lanb11/portfolioExport?mode=learner',
+'tool/lanb11/portfolioExport?mode=teacher',
NULL,
NULL,
+'org.lamsfoundation.lams.tool.noticeboard.ApplicationProperties',
NOW()
);
Index: lams_tool_sbmt/db/sql/activity_insert.sql
===================================================================
diff -u -r5be03595a347709c737d01bdaec5cbc986c04040 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_sbmt/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 5be03595a347709c737d01bdaec5cbc986c04040)
+++ lams_tool_sbmt/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -39,6 +39,7 @@
, create_grouping_id
, create_grouping_ui_id
, library_activity_id
+, language_file
)
VALUES
(
@@ -77,4 +78,5 @@
, NULL
, NULL
, NULL
+, 'org.lamsfoundation.tool.sbmt.SbmtResources'
)
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
diff -u -r5be03595a347709c737d01bdaec5cbc986c04040 -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759
--- lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 5be03595a347709c737d01bdaec5cbc986c04040)
+++ lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759)
@@ -14,17 +14,18 @@
default_tool_content_id,
valid_flag,
grouping_support_type_id,
-supports_define_later_flag,
supports_run_offline_flag,
-supports_moderation_flag,
-supports_contribute_flag,
learner_url,
+learner_preview_url,
+learner_progress_url,
author_url,
monitor_url,
-export_portfolio_url,
define_later_url,
+export_pfolio_learner_url,
+export_pfolio_class_url,
contribute_url,
moderation_url,
+language_file,
create_date_time
)
VALUES
@@ -40,16 +41,17 @@
0,
2,
1,
-1,
-1,
-0,
-'tool/lasbmt11/learner.do',
+'tool/lasbmt11/learner.do?mode=learner',
+'tool/lasbmt11/learner.do?mode=author',
+'tool/lasbmt11/learner.do?mode=teacher',
'tool/lasbmt11/authoring.do',
'tool/lasbmt11/monitoring.do',
-'tool/lasbmt11/exportPortfolio',
'tool/lasbmt11/definelater.do?method=editActivity&mode=definelater',
+'tool/lasbmt11/exportPortfolio?mode=learner',
+'tool/lasbmt11/exportPortfolio?mode=teacher',
'tool/lasbmt11/contribute.do',
'tool/lasbmt11/moderation.do',
+'org.lamsfoundation.lams.tool.smbt.web.SmbtResources',
NOW()
);