Index: lams_tool_dimdim/.classpath =================================================================== diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/.classpath (.../.classpath) (revision 4c8de20e6e3ea73f98892f70662508e4011e96f6) +++ lams_tool_dimdim/.classpath (.../.classpath) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -2,11 +2,13 @@ - - - - + + + + + + Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -86,8 +86,7 @@ instructions.onlineInstructions =Online Instructions: label.authoring.basic.dimdimSettings = Dimdim Settings -label.authoring.basic.maxParticipants = Maximum Participants -label.authoring.basic.meetingDurationInHours = Meeting Duration in hours -label.authoring.basic.allowVideo = Allow Video -label.authoring.basic.attendeeMikes = Attendee Mikes +label.authoring.basic.topic = Topic +label.authoring.basic.meetingKey = Meeting Key +label.authoring.basic.maxAttendeeMikes = Attendee Mikes #======= End labels: Exported 78 labels for en AU ===== Index: lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql =================================================================== diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql (.../create_lams_tool_dimdim.sql) (revision 4c8de20e6e3ea73f98892f70662508e4011e96f6) +++ lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql (.../create_lams_tool_dimdim.sql) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -8,8 +8,8 @@ drop table if exists tl_laddim10_session; drop table if exists tl_laddim10_user; create table tl_laddim10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, dimdim_uid bigint, primary key (uid)); -create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_participants integer, meeting_duration_in_hours integer, allow_video bit, attendee_mikes integer, primary key (uid)); -create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, primary key (uid)); +create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, primary key (uid)); +create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, conf_key varchar(255), primary key (uid)); create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, entry_uid bigint, primary key (uid)); alter table tl_laddim10_attachment add index FK3525B03D7B14D4B (dimdim_uid), add constraint FK3525B03D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); alter table tl_laddim10_session add index FKC847CCB6D7B14D4B (dimdim_uid), add constraint FKC847CCB6D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); @@ -25,8 +25,8 @@ lock_on_finished, content_in_use, define_later, - allow_rich_editor, - allow_video ) + allow_rich_editor + ) VALUES( "Dimdim", "Instructions", @@ -37,7 +37,6 @@ 0, 0, 0, - 0, 0 ); Index: lams_tool_dimdim/db/sql/table-schema.sql =================================================================== diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/db/sql/table-schema.sql (.../table-schema.sql) (revision 4c8de20e6e3ea73f98892f70662508e4011e96f6) +++ lams_tool_dimdim/db/sql/table-schema.sql (.../table-schema.sql) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -6,8 +6,8 @@ drop table if exists tl_laddim10_session; drop table if exists tl_laddim10_user; create table tl_laddim10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, dimdim_uid bigint, primary key (uid)); -create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_participants integer, meeting_duration_in_hours integer, allow_video bit, attendee_mikes integer, primary key (uid)); -create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, primary key (uid)); +create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, primary key (uid)); +create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, conf_key varchar(255), primary key (uid)); create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, entry_uid bigint, primary key (uid)); alter table tl_laddim10_attachment add index FK3525B03D7B14D4B (dimdim_uid), add constraint FK3525B03D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); alter table tl_laddim10_session add index FKC847CCB6D7B14D4B (dimdim_uid), add constraint FKC847CCB6D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java (.../ContentDTO.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java (.../ContentDTO.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -64,14 +64,12 @@ public Long currentTab; - public Integer maxParticipants; + private String topic; + + private String meetingKey; - public Integer meetingDurationInHours; + private Integer maxAttendeeMikes; - public boolean allowVideo; - - public Integer attendeeMikes; - /* Constructors */ public ContentDTO() { } @@ -210,35 +208,28 @@ this.currentTab = currentTab; } - public Integer getMaxParticipants() { - return maxParticipants; + public String getTopic() { + return topic; } - public void setMaxParticipants(Integer maxParticipants) { - this.maxParticipants = maxParticipants; + public void setTopic(String topic) { + this.topic = topic; } - public Integer getMeetingDurationInHours() { - return meetingDurationInHours; + public String getMeetingKey() { + return meetingKey; } - public void setMeetingDurationInHours(Integer meetingDurationInHours) { - this.meetingDurationInHours = meetingDurationInHours; + public void setMeetingKey(String meetingKey) { + this.meetingKey = meetingKey; } - public boolean isAllowVideo() { - return allowVideo; + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; } - public void setAllowVideo(boolean allowVideo) { - this.allowVideo = allowVideo; + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { + this.maxAttendeeMikes = maxAttendeeMikes; } - public Integer getAttendeeMikes() { - return attendeeMikes; - } - - public void setAttendeeMikes(Integer attendeeMikes) { - this.attendeeMikes = attendeeMikes; - } } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java (.../Dimdim.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java (.../Dimdim.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -79,14 +79,12 @@ private Set dimdimSessions; - private Integer maxParticipants; + private String topic; + + private String meetingKey; - private Integer meetingDurationInHours; + private Integer maxAttendeeMikes; - private boolean allowVideo; - - private Integer attendeeMikes; - // Constructors /** default constructor */ @@ -329,56 +327,44 @@ public void setDimdimSessions(Set dimdimSessions) { this.dimdimSessions = dimdimSessions; } - + /** - * @hibernate.property column="max_participants" + * @hibernate.property column="topic" * @return */ - public Integer getMaxParticipants() { - return maxParticipants; + public String getTopic() { + return topic; } - public void setMaxParticipants(Integer maxParticipants) { - this.maxParticipants = maxParticipants; + public void setTopic(String topic) { + this.topic = topic; } /** - * @hibernate.property column="meeting_duration_in_hours" + * @hibernate.property column="meeting_key" * @return */ - public Integer getMeetingDurationInHours() { - return meetingDurationInHours; + public String getMeetingKey() { + return meetingKey; } - public void setMeetingDurationInHours(Integer meetingDurationInHours) { - this.meetingDurationInHours = meetingDurationInHours; + public void setMeetingKey(String meetingKey) { + this.meetingKey = meetingKey; } /** - * @hibernate.property column="allow_video" length="1" + * @hibernate.property column="max_attendee_mikes" * @return */ - public boolean isAllowVideo() { - return allowVideo; + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; } - public void setAllowVideo(boolean allowVideo) { - this.allowVideo = allowVideo; + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { + this.maxAttendeeMikes = maxAttendeeMikes; } /** - * @hibernate.property column="attendee_mikes" - * @return - */ - public Integer getAttendeeMikes() { - return attendeeMikes; - } - - public void setAttendeeMikes(Integer attendeeMikes) { - this.attendeeMikes = attendeeMikes; - } - - /** * toString * * @return String Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java (.../DimdimSession.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java (.../DimdimSession.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -60,7 +60,13 @@ private Dimdim dimdim; private Set dimdimUsers; + + private String topic; + private String meetingKey; + + private Integer maxAttendeeMikes; + // Constructors /** default constructor */ @@ -189,6 +195,58 @@ } /** + * @hibernate.property column="topic" + * @return + */ + public String getTopic() { + return topic; + } + + public void setTopic(String topic) { + this.topic = topic; + } + + /** + * @hibernate.property column="meeting_key" + * @return + */ + public String getMeetingKey() { + return meetingKey; + } + + public void setMeetingKey(String meetingKey) { + this.meetingKey = meetingKey; + } + + /** + * @hibernate.property column="max_attendee_mikes" + * @return + */ + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; + } + + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { + this.maxAttendeeMikes = maxAttendeeMikes; + } + + + /** + * @hibernate.property column="conf_key" + * @return + */ + public String getConfKey() { + return confKey; + } + + public void setConfKey(String confKey) { + this.confKey = confKey; + } + + private String confKey; + + + /** * toString * * @return String Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -407,7 +407,6 @@ } } - @SuppressWarnings("unchecked") public DimdimUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) { return dimdimUserDAO.getByUserIdAndSessionId(userId, toolSessionId); Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -373,11 +373,9 @@ dimdim.setAllowRichEditor(authForm.isAllowRichEditor()); // TODO check whether these fields should be in here - dimdim.setMaxParticipants(authForm.getMaxParticipants()); - dimdim.setMeetingDurationInHours(authForm - .getMeetingDurationInHours()); - dimdim.setAllowVideo(authForm.isAllowVideo()); - dimdim.setAttendeeMikes(authForm.getAttendeeMikes()); + dimdim.setTopic(authForm.getTopic()); + dimdim.setMeetingKey(authForm.getMeetingKey()); + dimdim.setMaxAttendeeMikes(authForm.getMaxAttendeeMikes()); } } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -24,6 +24,15 @@ package org.lamsfoundation.lams.tool.dimdim.web.actions; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,11 +44,14 @@ import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO; import org.lamsfoundation.lams.tool.dimdim.dto.UserDTO; import org.lamsfoundation.lams.tool.dimdim.model.Dimdim; +import org.lamsfoundation.lams.tool.dimdim.model.DimdimSession; import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser; import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy; import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService; import org.lamsfoundation.lams.tool.dimdim.util.Constants; +import org.lamsfoundation.lams.tool.dimdim.web.forms.MonitoringForm; import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; /** @@ -90,6 +102,14 @@ ContentDTO contentDT0 = new ContentDTO(dimdim); + MonitoringForm monitoringForm = (MonitoringForm) form; + // populate using authoring values + monitoringForm.setTopic(contentDT0.getTopic()); + monitoringForm.setMeetingKey((contentDT0.getMeetingKey())); + monitoringForm.setMaxAttendeeMikes((contentDT0.getMaxAttendeeMikes())); + + // TODO may need to populate using session values if they already exist + Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true); contentDT0.setCurrentTab(currentTab); @@ -113,4 +133,68 @@ return mapping.findForward("dimdim_display"); } + + public ActionForward startDimdim(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + + MonitoringForm monitoringForm = new MonitoringForm(); + + // get dimdim session + DimdimSession session = dimdimService + .getSessionBySessionId(monitoringForm.getToolSessionID()); + + // update dimdim meeting settings + session.setTopic(monitoringForm.getTopic()); + session.setMeetingKey(monitoringForm.getMeetingKey()); + session.setMaxAttendeeMikes(monitoringForm.getMaxAttendeeMikes()); + + // Get LAMS userDTO + org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager + .getSession().getAttribute(AttributeNames.USER); + + // get dimdim confkey + try { + URL url = new URL( + "http://172.20.100.217:8080/dimdim/StartNewConferenceCheck.action?" + + "email=" + + URLEncoder.encode(lamsUserDTO.getEmail(), "UTF8") + + "&displayName=" + + URLEncoder.encode(lamsUserDTO.getFirstName() + + lamsUserDTO.getLastName(), "UTF8") + + "&confName=" + + URLEncoder.encode(session.getTopic(), "UTF8") + + "&confKey=" + + URLEncoder + .encode(session.getMeetingKey(), "UTF8") + + "&lobby=false" + "&networkProfile=3" + + "&meetingHours=99" + "&maxAttendeeMikes=0" + + "&returnUrl=asdf" + "&presenterAV=av" + + "&privateChatEnabled=true" + + "&publicChatEnabled=true" + + "&screenShareEnabled=true" + + "&whiteboardEnabled=true"); + + URLConnection connection = url.openConnection(); + + BufferedReader in = new BufferedReader(new InputStreamReader( + connection.getInputStream())); + String inputLine; + + while ((inputLine = in.readLine()) != null) + System.out.println(inputLine); + in.close(); + + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnsupportedEncodingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return mapping.findForward("dimdim_conference"); + } } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -70,13 +70,11 @@ private SessionMap sessionMap; - private Integer maxParticipants; + private String topic; + + private String meetingKey; - private Integer meetingDurationInHours; - - private boolean allowVideo; - - private Integer attendeeMikes; + private Integer maxAttendeeMikes; @Override public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) { @@ -191,35 +189,28 @@ this.allowRichEditor = allowRichEditor; } - public Integer getMaxParticipants() { - return maxParticipants; + public String getTopic() { + return topic; } - public void setMaxParticipants(Integer maxParticipants) { - this.maxParticipants = maxParticipants; + public void setTopic(String topic) { + this.topic = topic; } - public Integer getMeetingDurationInHours() { - return meetingDurationInHours; + public String getMeetingKey() { + return meetingKey; } - public void setMeetingDurationInHours(Integer meetingDurationInHours) { - this.meetingDurationInHours = meetingDurationInHours; + public void setMeetingKey(String meetingKey) { + this.meetingKey = meetingKey; } - public boolean isAllowVideo() { - return allowVideo; + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; } - public void setAllowVideo(boolean allowVideo) { - this.allowVideo = allowVideo; + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { + this.maxAttendeeMikes = maxAttendeeMikes; } - public Integer getAttendeeMikes() { - return attendeeMikes; - } - - public void setAttendeeMikes(Integer attendeeMikes) { - this.attendeeMikes = attendeeMikes; - } } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -35,65 +35,54 @@ private static final long serialVersionUID = 9096908688391850595L; // Fields - + private String dispatch; - private boolean teacherVisible; - private Long toolSessionID; - // editing message page. - private Long messageUID; + private String topic; - private String messageBody; + private String meetingKey; - private boolean messageHidden; + private Integer maxAttendeeMikes; - public String getMessageBody() { - return messageBody; + public String getDispatch() { + return dispatch; } - public void setMessageBody(String messageBody) { - this.messageBody = messageBody; + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; } - public Long getMessageUID() { - return messageUID; + public String getMeetingKey() { + return meetingKey; } - public void setMessageUID(Long messageUID) { - this.messageUID = messageUID; + public Long getToolSessionID() { + return toolSessionID; } - public String getDispatch() { - return dispatch; + public String getTopic() { + return topic; } public void setDispatch(String dispatch) { this.dispatch = dispatch; } - public Long getToolSessionID() { - return toolSessionID; + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { + this.maxAttendeeMikes = maxAttendeeMikes; } + public void setMeetingKey(String meetingKey) { + this.meetingKey = meetingKey; + } + public void setToolSessionID(Long toolSessionID) { this.toolSessionID = toolSessionID; } - public boolean isTeacherVisible() { - return teacherVisible; + public void setTopic(String topic) { + this.topic = topic; } - - public void setTeacherVisible(boolean visible) { - this.teacherVisible = visible; - } - - public boolean isMessageHidden() { - return messageHidden; - } - - public void setMessageHidden(boolean messageHidden) { - this.messageHidden = messageHidden; - } } Index: lams_tool_dimdim/web/common/taglibs.jsp =================================================================== diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/web/common/taglibs.jsp (.../taglibs.jsp) (revision 4c8de20e6e3ea73f98892f70662508e4011e96f6) +++ lams_tool_dimdim/web/common/taglibs.jsp (.../taglibs.jsp) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -7,6 +7,6 @@ <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-function" prefix="fn" %> <%@ taglib uri="tags-lams" prefix="lams"%> -<%@ taglib uri="fck-editor" prefix="fck"%> - +<%@ taglib uri="fck-editor" prefix="fck"%> \ No newline at end of file Index: lams_tool_dimdim/web/pages/authoring/basic.jsp =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/web/pages/authoring/basic.jsp (.../basic.jsp) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/web/pages/authoring/basic.jsp (.../basic.jsp) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -36,51 +36,25 @@ - + : - - - - - - - - - - - + - + : - - - - - - - + - - - - - - - - + : - + Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp =================================================================== diff -u -rd5314b799a1d54d0a172c05468a6ec63efc6c514 -re317915cf5ff951ce28cc8ce3decd422b189ba8d --- lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d5314b799a1d54d0a172c05468a6ec63efc6c514) +++ lams_tool_dimdim/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision e317915cf5ff951ce28cc8ce3decd422b189ba8d) @@ -64,6 +64,48 @@ + + + + + + + + + + + + + + + +
+ + : + +
+
+ + : + +
+
+ + : + + + + + + + +
+ + + + + +