Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml
===================================================================
diff -u -r3fa27c9bc10d0c90d602cc38201e6eb248ce348c -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml (.../SystemTool.hbm.xml) (revision 3fa27c9bc10d0c90d602cc38201e6eb248ce348c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/SystemTool.hbm.xml (.../SystemTool.hbm.xml) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -201,5 +201,21 @@
+
+
+ @hibernate.property
+ column="admin_url"
+ length="65535"
+ not-null="false"
+
+
+
+
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -357,6 +357,21 @@
+
+
+ @hibernate.property
+ column="admin_url"
+ length="65535"
+ not-null="false"
+
+
+
Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -ra94909694731838faabd950b35db3ec905f28529 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision a94909694731838faabd950b35db3ec905f28529)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -650,8 +650,8 @@
-
+
@@ -663,8 +663,8 @@
-
+
@@ -676,8 +676,8 @@
-
+
@@ -689,8 +689,8 @@
-
+
@@ -3204,6 +3204,12 @@
+
+
+
+
+
+
@@ -5011,6 +5017,12 @@
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -ra94909694731838faabd950b35db3ec905f28529 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision a94909694731838faabd950b35db3ec905f28529)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -419,6 +419,7 @@
, contribute_url TEXT
, help_url TEXT
, create_date_time DATETIME NOT NULL
+ , admin_url TEXT
, UNIQUE UQ_systool_activity_type (learning_activity_type_id)
, PRIMARY KEY (system_tool_id)
, INDEX (learning_activity_type_id)
@@ -459,6 +460,7 @@
, modified_date_time DATETIME
, classpath_addition VARCHAR(255)
, context_file VARCHAR(255)
+ , admin_url TEXT
, UNIQUE UQ_lams_tool_sig (tool_signature)
, UNIQUE UQ_lams_tool_class_name (service_name)
, PRIMARY KEY (tool_id)
Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
diff -u -ra94909694731838faabd950b35db3ec905f28529 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision a94909694731838faabd950b35db3ec905f28529)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -1,5 +1,5 @@
-- Script to be run for LAMS 2.1 release, on LAMS 2.0.3 tables.
--- Adds all the data needed for branching
+-- Adds all the data needed for branching, plus a small change to the tool table needed for tool admin screen.
ALTER TABLE lams_group
ADD COLUMN group_ui_id INT(11);
@@ -63,4 +63,8 @@
'learning/branchingExportPortfolio?mode=teacher&type=tool', 'monitoring/branching.do?method=assignBranch&type=tool',
'monitoring/branching.do?method=assignBranch&type=tool', now());
-
\ No newline at end of file
+
+-- support tools having an admin screen
+
+ALTER TABLE lams_tool ADD COLUMN admin_url TEXT;
+ALTER TABLE lams_system_tool ADD COLUMN admin_url TEXT;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -ra94909694731838faabd950b35db3ec905f28529 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision a94909694731838faabd950b35db3ec905f28529)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -153,6 +153,9 @@
/** The url of the tool's moderation screen. */
private String moderationURL;
+ /** The url of the tool's admin screen. */
+ private String adminURL;
+
/** The category of activity */
private Integer activityCategoryID;
@@ -360,6 +363,7 @@
this.createGroupingID = grouping.getGroupingId();
this.createGroupingUIID = grouping.getGroupingUIID();
//this.groupingType = grouping.getGroupingTypeId();
+ this.adminURL = groupingActivity.getSystemTool().getAdminUrl();
}
private void addOptionsActivityAttributes(OptionsActivity optionsActivity){
this.maxOptions = optionsActivity.getMaxNumberOfOptions();
@@ -387,6 +391,7 @@
this.contributeURL = toolActivity.getTool().getContributeUrl();
this.moderationURL = toolActivity.getTool().getModerationUrl();
this.helpURL = toolActivity.getTool().getHelpUrl();
+ this.adminURL = toolActivity.getTool().getAdminUrl();
this.toolDisplayName = toolActivity.getTool().getToolDisplayName();
this.toolVersion = toolActivity.getTool().getToolVersion();
}
@@ -402,6 +407,7 @@
GateActivity gateActivity = (GateActivity)activity ;
this.gateActivityLevelID = gateActivity.getGateActivityLevelId();
this.gateOpen = gateActivity.getGateOpen();
+ this.adminURL = gateActivity.getSystemTool().getAdminUrl();
}
private void addSynchGateActivityAttributes(SynchGateActivity activity){
@@ -1032,4 +1038,10 @@
if(!startYCoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG))
this.startYCoord = startYCoord;
}
+ public String getAdminURL() {
+ return adminURL;
+ }
+ public void setAdminURL(String adminURL) {
+ this.adminURL = adminURL;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rb484c15dc7951dbb5ec943fc72bcb6a047e3c517 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision b484c15dc7951dbb5ec943fc72bcb6a047e3c517)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -1333,7 +1333,7 @@
}else{
act.setParentActivity(parent);
//also add child as Complex activity: It is useless for persist data, but helpful for validate in learning design!
- if(isComplexActivity(parent)){
+ if(parent.isComplexActivity()){
Set set = ((ComplexActivity)parent).getActivities();
if(set == null){
set = new TreeSet(new ActivityOrderComparator());
@@ -1913,12 +1913,6 @@
public void setTransitionDAO(ITransitionDAO transitionDAO) {
this.transitionDAO = transitionDAO;
}
- private boolean isComplexActivity(Activity act)
- {
- return act.getActivityTypeId().intValue() == Activity.SEQUENCE_ACTIVITY_TYPE ||
- act.getActivityTypeId().intValue()== Activity.PARALLEL_ACTIVITY_TYPE ||
- act.getActivityTypeId().intValue()== Activity.OPTIONS_ACTIVITY_TYPE;
- }
public void setToolImportSupportDAO(IToolImportSupportDAO toolImportSupportDAO) {
this.toolImportSupportDAO = toolImportSupportDAO;
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java
===================================================================
diff -u -rfcdf3f7584d020b2aeb399a8cb0d0b55fb0e6be4 -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision fcdf3f7584d020b2aeb399a8cb0d0b55fb0e6be4)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/SystemTool.java (.../SystemTool.java) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -85,6 +85,9 @@
private String helpUrl;
/** persistent field */
+ private String adminUrl;
+
+ /** persistent field */
private Date createDateTime;
/**
@@ -238,6 +241,22 @@
}
/**
+ * @hibernate.property column="admin_url" length="65535" not-null="false"
+ * @return Returns the helpUrl.
+ */
+ public String getAdminUrl()
+ {
+ return adminUrl;
+ }
+ /**
+ * @param helpUrl The helpUrl to set.
+ */
+ public void setAdminUrl(String adminUrl)
+ {
+ this.adminUrl = adminUrl;
+ }
+
+ /**
* @hibernate.property column="create_date_time"
length="19" not-null="true"
* @return Returns the createDateTime.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r5c85f79ac6eb2d698a970dfc662f027e4f642141
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
@@ -78,6 +78,9 @@
private String helpUrl;
/** persistent field */
+ private String adminUrl;
+
+ /** persistent field */
private boolean supportsRunOffline;
/** persistent field */
@@ -536,6 +539,23 @@
}
+ /**
+ * @hibernate.property column="admin_url" length="65535" not-null="false"
+ * @return Returns the helpUrl.
+ */
+ public String getAdminUrl()
+ {
+ return adminUrl;
+ }
+ /**
+ * @param helpUrl The helpUrl to set.
+ */
+ public void setAdminUrl(String adminUrl)
+ {
+ this.adminUrl = adminUrl;
+ }
+
+
/**
* @hibernate.property column="tool_identifier" length="64"
*/