Index: lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml (.../ZoomUser.hbm.xml) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml (.../ZoomUser.hbm.xml) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -17,13 +17,7 @@ column="uid" type="java.lang.Long" > - - - + + + + + + + { - private static IZoomService zoomService; - Long sessionID; String sessionName; @@ -46,7 +43,7 @@ this.sessionName = session.getSessionName(); for (ZoomUser zoomUser : session.getZoomUsers()) { - ZoomUserDTO userDTO = zoomService.createUserDTO(zoomUser); + ZoomUserDTO userDTO = new ZoomUserDTO(zoomUser); userDTOs.add(userDTO); } @@ -96,8 +93,4 @@ public void setNumberOfLearners(int numberOfLearners) { this.numberOfLearners = numberOfLearners; } - - public static void setZoomService(IZoomService zoomService) { - SessionDTO.zoomService = zoomService; - } } \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ZoomUserDTO.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ZoomUserDTO.java (.../ZoomUserDTO.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ZoomUserDTO.java (.../ZoomUserDTO.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.zoom.dto; import org.lamsfoundation.lams.tool.zoom.model.ZoomUser; -import org.lamsfoundation.lams.usermanagement.User; public class ZoomUserDTO implements Comparable { private Long uid; @@ -43,12 +42,11 @@ private Long notebookEntryUID; - public ZoomUserDTO(ZoomUser zoomUser, User user) { + public ZoomUserDTO(ZoomUser zoomUser) { this.uid = zoomUser.getUid(); - this.loginName = user.getLogin(); - this.firstName = user.getFirstName(); - this.lastName = user.getLastName(); - this.email = user.getEmail(); + this.firstName = zoomUser.getFirstName(); + this.lastName = zoomUser.getLastName(); + this.email = zoomUser.getEmail(); this.finishedActivity = zoomUser.isFinishedActivity(); this.notebookEntryUID = zoomUser.getNotebookEntryUID(); } Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java (.../ZoomUser.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -23,8 +23,9 @@ package org.lamsfoundation.lams.tool.zoom.model; -public class ZoomUser implements java.io.Serializable { +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +public class ZoomUser implements java.io.Serializable { private static final long serialVersionUID = 8663555378960558429L; // Persistent Fields @@ -33,6 +34,12 @@ private Integer userId; + private String lastName; + + private String firstName; + + private String email; + private ZoomSession zoomSession; private boolean finishedActivity; @@ -44,20 +51,17 @@ // Constructors public ZoomUser() { - } - public ZoomUser(Integer userID, ZoomSession zoomSession) { - this.userId = userID; + public ZoomUser(UserDTO userDTO, ZoomSession zoomSession) { + this.userId = userDTO.getUserID(); + this.firstName = userDTO.getFirstName(); + this.lastName = userDTO.getLastName(); + this.email = userDTO.getEmail(); this.zoomSession = zoomSession; this.finishedActivity = false; } - // Property accessors - - /** - * - */ public Long getUid() { return this.uid; } @@ -78,9 +82,30 @@ this.userId = userId; } - /** - * - */ + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public boolean isFinishedActivity() { return finishedActivity; } @@ -89,11 +114,6 @@ this.finishedActivity = finishedActivity; } - /** - * - * - * - */ public ZoomSession getZoomSession() { return this.zoomSession; } Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java (.../IZoomService.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java (.../IZoomService.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -27,7 +27,6 @@ import org.apache.tomcat.util.json.JSONException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.tool.zoom.dto.ZoomUserDTO; import org.lamsfoundation.lams.tool.zoom.model.Zoom; import org.lamsfoundation.lams.tool.zoom.model.ZoomConfig; import org.lamsfoundation.lams.tool.zoom.model.ZoomSession; @@ -73,7 +72,7 @@ /** * Audit log the teacher has started editing activity in monitor. - * + * * @param toolContentID */ void auditLogStartEditingActivityInMonitor(long toolContentID); @@ -180,6 +179,4 @@ String createMeeting(Long zoomUid) throws IOException, JSONException; String registerUser(Long zoomUid, Long userUid, String sessionName) throws IOException, JSONException; - - ZoomUserDTO createUserDTO(ZoomUser zoomUser); } \ No newline at end of file Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java =================================================================== diff -u -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -489,12 +489,6 @@ } @Override - public ZoomUserDTO createUserDTO(ZoomUser zoomUser) { - User user = (User) zoomUserDAO.find(User.class, zoomUser.getUserId().intValue()); - return new ZoomUserDTO(zoomUser, user); - } - - @Override public void saveOrUpdateZoom(Zoom zoom) { zoomDAO.insertOrUpdate(zoom); } @@ -511,7 +505,7 @@ @Override public ZoomUser createZoomUser(UserDTO user, ZoomSession zoomSession) { - ZoomUser zoomUser = new ZoomUser(user.getUserID(), zoomSession); + ZoomUser zoomUser = new ZoomUser(user, zoomSession); saveOrUpdateZoomUser(zoomUser); return zoomUser; } @@ -701,7 +695,7 @@ if (user.getMeetingJoinUrl() != null) { return user.getMeetingJoinUrl(); } - ZoomUserDTO userDTO = createUserDTO(user); + ZoomUserDTO userDTO = new ZoomUserDTO(user); Zoom zoom = (Zoom) zoomDAO.find(Zoom.class, zoomUid); JSONObject bodyJSON = new JSONObject(); Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java =================================================================== diff -u -reeaae70bac24a36a5f05a5d56638df29c1a495c5 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java (.../LearningAction.java) (revision eeaae70bac24a36a5f05a5d56638df29c1a495c5) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java (.../LearningAction.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -247,7 +247,7 @@ // get any existing notebook entries and create userDTO NotebookEntry entry = zoomService.getNotebookEntry(user.getNotebookEntryUID()); - ZoomUserDTO userDTO = zoomService.createUserDTO(user); + ZoomUserDTO userDTO = new ZoomUserDTO(user); if (entry != null) { userDTO.setNotebookEntryDTO(new NotebookEntryDTO(entry)); } Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java =================================================================== diff -u -rfba5bdf4505b4dbe6d95809740ac8f3c14b07ef1 -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision fba5bdf4505b4dbe6d95809740ac8f3c14b07ef1) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) @@ -34,7 +34,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.zoom.dto.ContentDTO; import org.lamsfoundation.lams.tool.zoom.dto.NotebookEntryDTO;//import org.lamsfoundation.lams.tool.zoom.dto.UserDTO; -import org.lamsfoundation.lams.tool.zoom.dto.SessionDTO; import org.lamsfoundation.lams.tool.zoom.dto.ZoomUserDTO; import org.lamsfoundation.lams.tool.zoom.model.Zoom; import org.lamsfoundation.lams.tool.zoom.model.ZoomUser; @@ -74,7 +73,6 @@ logger.error("Unable to find tool content with id :" + toolContentID); } - SessionDTO.setZoomService(zoomService); ContentDTO contentDTO = new ContentDTO(zoom); Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true); @@ -94,7 +92,7 @@ ZoomUser user = zoomService.getUserByUID(uid); NotebookEntry entry = zoomService.getNotebookEntry(user.getNotebookEntryUID()); - ZoomUserDTO userDTO = zoomService.createUserDTO(user); + ZoomUserDTO userDTO = new ZoomUserDTO(user); userDTO.setNotebookEntryDTO(new NotebookEntryDTO(entry)); request.setAttribute(ZoomConstants.ATTR_USER_DTO, userDTO);