Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re317915cf5ff951ce28cc8ce3decd422b189ba8d -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d)
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
@@ -6,12 +6,12 @@
#=================== labels for Notebook =================#
-activity.helptext =Notebook for notes and reflections
-tool.display.name =Notebook
-tool.description =Notebook Tool
-activity.title =Dimdim
-activity.description =Notebook Tool
-pageTitle.authoring =Notebook Authoring
+activity.helptext = Notebook for notes and reflections
+tool.display.name = Dimdim
+tool.description = Dimdim Tool
+activity.title = Dimdim
+activity.description = Dimdim Tool
+pageTitle.authoring =Dimdim Authoring
button.basic =Basic
button.advanced =Advanced
button.upload =Upload
@@ -29,7 +29,7 @@
link.delete =Delete
message.updateSuccess =Changes saved
message.unsavedChanges =Page contains unsaved changes
-pageTitle.learning =Online Notebook
+pageTitle.learning =Online Dimdim
message.defineLaterSet =Please wait for the teacher to complete the contents of this activity
message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details.
pageTitle.monitoring =Notebook Monitoring
@@ -85,8 +85,22 @@
instructions.offlineInstructions =Offline Instructions:
instructions.onlineInstructions =Online Instructions:
+label.on =On
+label.off =Off
+monitor.summary.th.advancedSettings =Advanced Settings
+
label.authoring.basic.dimdimSettings = Dimdim Settings
label.authoring.basic.topic = Topic
label.authoring.basic.meetingKey = Meeting Key
label.authoring.basic.maxAttendeeMikes = Attendee Mikes
+
+admin.title = Dim Dim Administration
+admin.dimdimServerURL = Dim Dim Server URL
+
+monitor.summary.dimdimSettings = Dim Dim Settings
+label.monitoring.startConference = Start Conference
+
+label.learning.joinConference = Join Conference
+
+export.toolExportNotSupported = This tool does not support export portfolio.
#======= End labels: Exported 78 labels for en AU =====
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
===================================================================
diff -u -r2714c5d509bed30e460ccc453753e6504804d4a1 -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision 2714c5d509bed30e460ccc453753e6504804d4a1)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
@@ -46,9 +46,11 @@
public static final String ATTR_FINISHED_ACTIVITY = "finishedActivity";
public static final String ATTR_SESSION_MAP = "sessionMap";
public static final String ATTR_USER_DTO = "userDTO";
+ public static final String ATTR_CONFERENCE_URL = "conferenceURL";
+ public static final String ATTR_SAVE_SUCCESS = "saveSuccess";
// Parameter names
public static final String PARAM_USER_UID = "userUID";
- public static final String ATTR_CONFERENCE_URL = "conferenceURL";
+
}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java
===================================================================
diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
@@ -116,46 +116,6 @@
logger.debug("doExportLearner: toolContentID:" + toolSessionID);
- // check if toolContentID available
- if (toolSessionID == null) {
- String error = "Tool Session ID is missing. Unable to continue";
- logger.error(error);
- throw new DimdimException(error);
- }
-
- DimdimSession dimdimSession = dimdimService
- .getSessionBySessionId(toolSessionID);
-
- Dimdim dimdim = dimdimSession.getDimdim();
-
- // Get LAMS userDTO
- org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager
- .getSession().getAttribute(AttributeNames.USER);
-
- DimdimUser dimdimUser = dimdimService.getUserByUserIdAndSessionId(
- new Long(lamsUserDTO.getUserID()), toolSessionID);
-
- NotebookEntry dimdimEntry = dimdimService.getEntry(dimdimUser
- .getEntryUID());
-
- // construct dto's
- ContentDTO contentDTO = new ContentDTO();
- contentDTO.setTitle(dimdim.getTitle());
- contentDTO.setInstructions(dimdim.getInstructions());
-
- SessionDTO sessionDTO = new SessionDTO();
- sessionDTO.setSessionName(dimdimSession.getSessionName());
- sessionDTO.setSessionID(dimdimSession.getSessionId());
-
- // If the user hasn't put in their entry yet, dimdimEntry will be null;
- UserDTO userDTO = dimdimEntry != null ? new UserDTO(dimdimUser,
- dimdimEntry) : new UserDTO(dimdimUser);
-
- sessionDTO.getUserDTOs().add(userDTO);
- contentDTO.getSessionDTOs().add(sessionDTO);
-
- request.getSession().setAttribute(Constants.ATTR_CONTENT_DTO,
- contentDTO);
}
private void doTeacherExport(HttpServletRequest request,
@@ -164,32 +124,6 @@
logger.debug("doExportTeacher: toolContentID:" + toolContentID);
- // check if toolContentID available
- if (toolContentID == null) {
- String error = "Tool Content ID is missing. Unable to continue";
- logger.error(error);
- throw new DimdimException(error);
- }
-
- Dimdim dimdim = dimdimService.getDimdimByContentId(toolContentID);
-
- ContentDTO contentDTO = new ContentDTO(dimdim);
-
- // add the dimdimEntry for each user in each session
-
- for (SessionDTO sessionDTO : contentDTO.getSessionDTOs()) {
- for (UserDTO user : sessionDTO.getUserDTOs()) {
- NotebookEntry entry = dimdimService
- .getEntry(user.getEntryUID());
- if (entry != null) {
- NotebookEntryDTO entryDTO = new NotebookEntryDTO(entry);
- user.setEntryDTO(entryDTO);
- }
- }
- }
-
- request.getSession().setAttribute(Constants.ATTR_CONTENT_DTO,
- contentDTO);
}
private void setupService() {
Index: lams_tool_dimdim/web/pages/admin/admin.jsp
===================================================================
diff -u -r2714c5d509bed30e460ccc453753e6504804d4a1 -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9
--- lams_tool_dimdim/web/pages/admin/admin.jsp (.../admin.jsp) (revision 2714c5d509bed30e460ccc453753e6504804d4a1)
+++ lams_tool_dimdim/web/pages/admin/admin.jsp (.../admin.jsp) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
@@ -2,12 +2,20 @@
-
-
+
+
+
+
- :
-
-
+
+ :
+
+
+
+
+
+
+
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
- ${session.sessionName}
-
-
-
-
-
-
-
- |
- ${user.firstName} ${user.lastName }
- |
-
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
${contentDTO.instructions}
+
+
+
+
+
+
-
- Open Conference ///
-
-
-
@@ -67,8 +68,6 @@
-
-
Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2714c5d509bed30e460ccc453753e6504804d4a1 -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9
--- lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 2714c5d509bed30e460ccc453753e6504804d4a1)
+++ lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9)
@@ -64,8 +64,6 @@
-
-
@@ -74,33 +72,51 @@
+
+
+
+
-
-
-
- :
-
-
-
-
- :
-
-
-
-
- :
-
-
-
-
-
-
-
-
- Open Conference
+
+
+
+ |
+
+ :
+
+ |
+
+
+ |
+
+ :
+
+ |
+
+
+ |
+
+ :
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+