DTO that holds monitoring flow properties + *
+ * DTO that holds monitoring flow properties *
* * @author Ozgur Demirtas */ -public class VoteGeneralMonitoringDTO implements Comparable -{ +public class VoteGeneralMonitoringDTO implements Comparable { protected String currentMonitoringTab; - protected String sbmtSuccess; protected String defineLaterInEditMode; protected String requestLearningReport; protected String userExceptionNoToolSessions; @@ -50,646 +47,588 @@ protected String activeModule; protected String currentTab; - protected String activityTitle; - protected String activityInstructions; - protected String defaultOptionContent; - protected String countAllUsers; - protected String countSessionComplete; - protected String isPortfolioExport; - protected String groupName; - protected String currentMonitoredToolSession; - protected Long selectionCase; - protected String existsOpenVotes; - protected String isToolSessionChanged; - protected String responseId; - protected String currentUid; - - protected String toolContentID; - protected Map mapOptionsContent; - protected Map summaryToolSessions; - protected Map summaryToolSessionsId; - protected List listMonitoredAnswersContainerDto; - protected List listUserEntries; - protected String selectedToolSessionId; - - protected String showOpenVotesSection; - - protected List listVoteAllSessionsDTO; + protected String activityTitle; + protected String activityInstructions; + protected String defaultOptionContent; + protected String countAllUsers; + protected String countSessionComplete; + protected String isPortfolioExport; + protected String existsOpenVotes; + protected String responseId; + protected String currentUid; + + protected String toolContentID; + protected Map mapOptionsContent; + protected List listMonitoredAnswersContainerDto; + protected List listUserEntries; + + protected ListDTO that holds question/candidate answers data as well as user attempts data for jsp purposes
+ *+ * DTO that holds question/candidate answers data as well as user attempts data for jsp purposes + *
* * @author Ozgur Demirtas */ -public class VoteMonitoredAnswersDTO implements Comparable -{ - protected String questionUid; - - private String question; - - private String attemptUid; - - private List candidateAnswers; - - private Map questionAttempts; - - - private String sessionId; - +public class VoteMonitoredAnswersDTO implements Comparable { + protected String questionUid; + + private String question; + + private String attemptUid; + + private List candidateAnswers; + + private Map questionAttempts; + + private String sessionId; + private String sessionName; - + /** * @return Returns the sessionId. */ public String getSessionId() { - return sessionId; + return sessionId; } + /** - * @param sessionId The sessionId to set. + * @param sessionId + * The sessionId to set. */ public void setSessionId(String sessionId) { - this.sessionId = sessionId; + this.sessionId = sessionId; } + /** * @return Returns the sessionName. */ public String getSessionName() { - return sessionName; + return sessionName; } + /** - * @param sessionName The sessionName to set. + * @param sessionName + * The sessionName to set. */ public void setSessionName(String sessionName) { - this.sessionName = sessionName; + this.sessionName = sessionName; } - /** - * @return Returns the candidateAnswers. - */ - public List getCandidateAnswers() { - return candidateAnswers; - } - /** - * @param candidateAnswers The candidateAnswers to set. - */ - public void setCandidateAnswers(List candidateAnswers) { - this.candidateAnswers = candidateAnswers; - } - /** - * @return Returns the question. - */ - public String getQuestion() { - return question; - } - /** - * @param question The question to set. - */ - public void setQuestion(String question) { - this.question = question; - } - /** - * @return Returns the questionUid. - */ - public String getQuestionUid() { - return questionUid; - } - /** - * @param questionUid The questionUid to set. - */ - public void setQuestionUid(String questionUid) { - this.questionUid = questionUid; - } - - /** - * @return Returns the questionAttempts. - */ - public Map getQuestionAttempts() { - return questionAttempts; - } - /** - * @param questionAttempts The questionAttempts to set. - */ - public void setQuestionAttempts(Map questionAttempts) { - this.questionAttempts = questionAttempts; - } - - public String toString() { - return new ToStringBuilder(this) - .append("question", getQuestion()) - .toString(); + + /** + * @return Returns the candidateAnswers. + */ + public List getCandidateAnswers() { + return candidateAnswers; } - - public int compareTo(Object o) - { - VoteMonitoredAnswersDTO voteMonitoredAnswersDTO = (VoteMonitoredAnswersDTO) o; - - if (voteMonitoredAnswersDTO == null) - return 1; - else - return (int) (new Long(questionUid).longValue() - new Long(voteMonitoredAnswersDTO.questionUid).longValue()); + + /** + * @param candidateAnswers + * The candidateAnswers to set. + */ + public void setCandidateAnswers(List candidateAnswers) { + this.candidateAnswers = candidateAnswers; } - + /** + * @return Returns the question. + */ + public String getQuestion() { + return question; + } + + /** + * @param question + * The question to set. + */ + public void setQuestion(String question) { + this.question = question; + } + + /** + * @return Returns the questionUid. + */ + public String getQuestionUid() { + return questionUid; + } + + /** + * @param questionUid + * The questionUid to set. + */ + public void setQuestionUid(String questionUid) { + this.questionUid = questionUid; + } + + /** + * @return Returns the questionAttempts. + */ + public Map getQuestionAttempts() { + return questionAttempts; + } + + /** + * @param questionAttempts + * The questionAttempts to set. + */ + public void setQuestionAttempts(Map questionAttempts) { + this.questionAttempts = questionAttempts; + } + + public String toString() { + return new ToStringBuilder(this).append("question", getQuestion()).toString(); + } + + public int compareTo(Object o) { + VoteMonitoredAnswersDTO voteMonitoredAnswersDTO = (VoteMonitoredAnswersDTO) o; + + if (voteMonitoredAnswersDTO == null) + return 1; + else + return (int) (new Long(questionUid).longValue() - new Long(voteMonitoredAnswersDTO.questionUid).longValue()); + } + + /** * @return Returns the attemptUid. */ public String getAttemptUid() { - return attemptUid; + return attemptUid; } + /** - * @param attemptUid The attemptUid to set. + * @param attemptUid + * The attemptUid to set. */ public void setAttemptUid(String attemptUid) { - this.attemptUid = attemptUid; + this.attemptUid = attemptUid; } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v diff -u -r1.33 -r1.34 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 17 Jan 2014 22:18:24 -0000 1.33 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 23 Jan 2014 23:53:14 -0000 1.34 @@ -288,31 +288,6 @@ } /** - * builds a String based map from a list convertToMap(List sessionsList) - * - * @param sessionsList - * @return Map - */ - public static Map convertToStringMap(List sessionsList, String listType) { - Map map = new TreeMap(new VoteComparator()); - - Iterator listIterator = sessionsList.iterator(); - Long mapIndex = new Long(1); - - while (listIterator.hasNext()) { - if (listType.equals("String")) { - String text = (String) listIterator.next(); - map.put(mapIndex.toString(), text); - } else if (listType.equals("Long")) { - Long LongValue = (Long) listIterator.next(); - map.put(mapIndex.toString(), LongValue.toString()); - } - mapIndex = new Long(mapIndex.longValue() + 1); - } - return map; - } - - /** * find out if the content is in use or not. If it is in use, the author can not modify it. The idea of content * being in use is, once any one learner starts using a particular content that content should become unmodifiable. * Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java,v diff -u -r1.6 -r1.7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java 2 Jan 2014 23:12:51 -0000 1.6 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java 23 Jan 2014 23:53:16 -0000 1.7 @@ -58,7 +58,7 @@ void addVoteUsers(Long voteSessionId, VoteQueUsr user); - List getSessionsFromContent(VoteContent voteContent); + ListInterface that defines the contract for VoteQueUsr access
+ *+ * Interface that defines the contract for VoteQueUsr access + *
*/ public interface IVoteUserDAO { public VoteQueUsr getVoteUserByUID(Long uid); - - public VoteQueUsr findVoteUserById(Long userId); - - public List getVoteUserBySessionOnly(final VoteSession voteSession); - - public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId); - - public int getCompletedVoteUserBySessionUid(final Long voteSessionUid); - - public List getVoteUserBySessionUid(final Long voteSessionUid); - - public VoteQueUsr getVoteQueUsrById(long voteQueUsrId); - - public void saveVoteUser(VoteQueUsr voteUser); - + + public VoteQueUsr findVoteUserById(Long userId); + + public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId); + + public int getCompletedVoteUserBySessionUid(final Long voteSessionUid); + + public List getVoteUserBySessionUid(final Long voteSessionUid); + + public VoteQueUsr getVoteQueUsrById(long voteQueUsrId); + + public void saveVoteUser(VoteQueUsr voteUser); + public void updateVoteUser(VoteQueUsr voteUser); - - public List getUserBySessionOnly(final VoteSession voteSession); + public ListHibernate implementation for database access to Voting users (learners) for the voting tool.
+ *+ * Hibernate implementation for database access to Voting users (learners) for the voting tool. + *
*/ public class VoteUserDAO extends HibernateDaoSupport implements IVoteUserDAO { - - private static final String FIND_VOTE_USR_CONTENT = "from " + VoteQueUsr.class.getName() + " as voteu where que_usr_id=?"; - - private static final String COUNT_USERS_IN_SESSION = "select voteu.queUsrId from VoteQueUsr voteu where voteu.voteSession= :voteSession"; - - private static final String LOAD_USER_FOR_SESSION = "from voteQueUsr in class VoteQueUsr where voteQueUsr.voteSessionId= :voteSessionId"; - - - public VoteQueUsr getVoteUserByUID(Long uid) - { - String query = "from VoteQueUsr user where user.uid=?"; - - List list = getSession().createQuery(query) - .setLong(0,uid.longValue()) - .list(); - - if(list != null && list.size() > 0){ - VoteQueUsr voteu = (VoteQueUsr) list.get(0); - return voteu; - } - return null; + + private static final String FIND_VOTE_USR_CONTENT = "from " + VoteQueUsr.class.getName() + + " as voteu where que_usr_id=?"; + + private static final String COUNT_USERS_IN_SESSION = "select voteu.queUsrId from VoteQueUsr voteu where voteu.voteSession= :voteSession"; + + private static final String LOAD_USER_FOR_SESSION = "from voteQueUsr in class VoteQueUsr where voteQueUsr.voteSessionId= :voteSessionId"; + + public VoteQueUsr getVoteUserByUID(Long uid) { + String query = "from VoteQueUsr user where user.uid=?"; + + List list = getSession().createQuery(query).setLong(0, uid.longValue()).list(); + + if (list != null && list.size() > 0) { + VoteQueUsr voteu = (VoteQueUsr) list.get(0); + return voteu; } - - - public VoteQueUsr findVoteUserById(Long userId) - { - String query = "from VoteQueUsr user where user.queUsrId=?"; - - List list = getSession().createQuery(query) - .setLong(0,userId.longValue()) - .list(); - - if(list != null && list.size() > 0){ - VoteQueUsr voteu = (VoteQueUsr) list.get(0); - return voteu; - } - return null; + return null; + } + + public VoteQueUsr findVoteUserById(Long userId) { + String query = "from VoteQueUsr user where user.queUsrId=?"; + + List list = getSession().createQuery(query).setLong(0, userId.longValue()).list(); + + if (list != null && list.size() > 0) { + VoteQueUsr voteu = (VoteQueUsr) list.get(0); + return voteu; } - - - public List getVoteUserBySessionOnly(final VoteSession voteSession) - { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("voteSessionId", voteSession.getUid().longValue()) - .list(); - return list; + return null; } - public List getVoteUserBySessionUid(final Long voteSessionUid) - { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("voteSessionId", voteSessionUid.longValue()) - .list(); - return list; + public List getVoteUserBySessionUid(final Long voteSessionUid) { + List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + .setLong("voteSessionId", voteSessionUid.longValue()).list(); + return list; } - public int getCompletedVoteUserBySessionUid(final Long voteSessionUid) - { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("voteSessionId", voteSessionUid.longValue()) - .list(); - - int completedSessionUserCount=0; - if(list != null && list.size() > 0){ - Iterator listIterator=list.iterator(); - while (listIterator.hasNext()) - { - VoteQueUsr user=(VoteQueUsr)listIterator.next(); - logger.debug("user: " + user); - if (user.getVoteSession().getSessionStatus().equals("COMPLETED")) - { - ++completedSessionUserCount; - } - } + public int getCompletedVoteUserBySessionUid(final Long voteSessionUid) { + List list = getSession().createQuery(LOAD_USER_FOR_SESSION) + .setLong("voteSessionId", voteSessionUid.longValue()).list(); + + int completedSessionUserCount = 0; + if (list != null && list.size() > 0) { + Iterator listIterator = list.iterator(); + while (listIterator.hasNext()) { + VoteQueUsr user = (VoteQueUsr) listIterator.next(); + logger.debug("user: " + user); + if (user.getVoteSession().getSessionStatus().equals("COMPLETED")) { + ++completedSessionUserCount; } + } + } - return completedSessionUserCount; + return completedSessionUserCount; } - - public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId) - { - - String strGetUser = "from voteQueUsr in class VoteQueUsr where voteQueUsr.queUsrId=:queUsrId and voteQueUsr.voteSessionId=:voteSessionId"; - List list = getSession().createQuery(strGetUser) - .setLong("queUsrId", queUsrId.longValue()) - .setLong("voteSessionId", voteSessionId.longValue()) - .list(); - - if(list != null && list.size() > 0){ - VoteQueUsr usr = (VoteQueUsr) list.get(0); - return usr; - } - return null; + public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId) { + + String strGetUser = "from voteQueUsr in class VoteQueUsr where voteQueUsr.queUsrId=:queUsrId and voteQueUsr.voteSessionId=:voteSessionId"; + List list = getSession().createQuery(strGetUser).setLong("queUsrId", queUsrId.longValue()) + .setLong("voteSessionId", voteSessionId.longValue()).list(); + + if (list != null && list.size() > 0) { + VoteQueUsr usr = (VoteQueUsr) list.get(0); + return usr; } + return null; + } - - public VoteQueUsr getVoteQueUsrById(long voteQueUsrId) - { - String query = "from VoteQueUsr user where user.queUsrId=?"; - - List list = getSession().createQuery(query) - .setLong(0,voteQueUsrId) - .list(); - - if(list != null && list.size() > 0){ - VoteQueUsr qu = (VoteQueUsr) list.get(0); - return qu; - } - return null; + public VoteQueUsr getVoteQueUsrById(long voteQueUsrId) { + String query = "from VoteQueUsr user where user.queUsrId=?"; + + List list = getSession().createQuery(query).setLong(0, voteQueUsrId).list(); + + if (list != null && list.size() > 0) { + VoteQueUsr qu = (VoteQueUsr) list.get(0); + return qu; } + return null; + } - - - public void saveVoteUser(VoteQueUsr voteUser) - { - this.getHibernateTemplate().save(voteUser); + public void saveVoteUser(VoteQueUsr voteUser) { + this.getHibernateTemplate().save(voteUser); } - - public void updateVoteUser(VoteQueUsr voteUser) - { - this.getHibernateTemplate().update(voteUser); + public void updateVoteUser(VoteQueUsr voteUser) { + this.getHibernateTemplate().update(voteUser); } - - public void removeVoteUserById(Long userId) - { - HibernateTemplate templ = this.getHibernateTemplate(); - if ( userId != null) { - List list = getSession().createQuery(FIND_VOTE_USR_CONTENT) - .setLong(0,userId.longValue()) - .list(); - - if(list != null && list.size() > 0){ - VoteQueUsr voteu = (VoteQueUsr) list.get(0); - this.getSession().setFlushMode(FlushMode.AUTO); - templ.delete(voteu); - templ.flush(); - } - } - + public void removeVoteUserById(Long userId) { + HibernateTemplate templ = this.getHibernateTemplate(); + if (userId != null) { + List list = getSession().createQuery(FIND_VOTE_USR_CONTENT).setLong(0, userId.longValue()).list(); + + if (list != null && list.size() > 0) { + VoteQueUsr voteu = (VoteQueUsr) list.get(0); + this.getSession().setFlushMode(FlushMode.AUTO); + templ.delete(voteu); + templ.flush(); + } + } + } - - public List getUserBySessionOnly(final VoteSession voteSession) - { - List list = getSession().createQuery(LOAD_USER_FOR_SESSION) - .setLong("voteSessionId", voteSession.getUid().longValue()) - .list(); - return list; + + public ListActionForm for the Monitoring environment
+ *+ * ActionForm for the Monitoring environment + *
* * @author Ozgur Demirtas */ public class VoteMonitoringForm extends VoteAuthoringForm implements VoteAppConstants { - // controls which method is called by the Lookup map */ - - protected String method; - - protected String selectedToolSessionId; - - protected String isToolSessionChanged; - - protected String sessionUserCount; - - protected String completedSessionUserCount; - - protected String completedSessionUserPercent; - - protected String viewOpenVotes; - - protected String showOpenVotesSection; - - protected String closeOpenVotes; - - protected String hideOpenVote; - - protected String showOpenVote; - - protected String currentUid; - - protected String existsOpenVotes; - - protected String toolContentID; - - protected String defineLaterInEditMode; - - + // controls which method is called by the Lookup map */ + + protected String method; + + protected String sessionUserCount; + + protected String completedSessionUserCount; + + protected String hideOpenVote; + + protected String showOpenVote; + + protected String currentUid; + + protected String existsOpenVotes; + + protected String toolContentID; + + protected String defineLaterInEditMode; + /** * @return Returns the toolContentID. */ public String getToolContentID() { - return toolContentID; + return toolContentID; } + /** - * @param toolContentID The toolContentID to set. + * @param toolContentID + * The toolContentID to set. */ public void setToolContentID(String toolContentID) { - this.toolContentID = toolContentID; + this.toolContentID = toolContentID; } + /** * @return Returns the currentUid. */ public String getCurrentUid() { - return currentUid; + return currentUid; } + /** - * @param currentUid The currentUid to set. + * @param currentUid + * The currentUid to set. */ public void setCurrentUid(String currentUid) { - this.currentUid = currentUid; + this.currentUid = currentUid; } + /** * @return Returns the hideOpenVote. */ public String getHideOpenVote() { - return hideOpenVote; + return hideOpenVote; } + /** - * @param hideOpenVote The hideOpenVote to set. + * @param hideOpenVote + * The hideOpenVote to set. */ public void setHideOpenVote(String hideOpenVote) { - this.hideOpenVote = hideOpenVote; + this.hideOpenVote = hideOpenVote; } + /** - * @return Returns the closeOpenVotes. + * @return Returns the method. */ - public String getCloseOpenVotes() { - return closeOpenVotes; + public String getMethod() { + return method; } + /** - * @param closeOpenVotes The closeOpenVotes to set. + * @param method + * The method to set. */ - public void setCloseOpenVotes(String closeOpenVotes) { - this.closeOpenVotes = closeOpenVotes; + public void setMethod(String method) { + this.method = method; } - /** - * @return Returns the viewOpenVotes. - */ - public String getViewOpenVotes() { - return viewOpenVotes; - } - /** - * @param viewOpenVotes The viewOpenVotes to set. - */ - public void setViewOpenVotes(String viewOpenVotes) { - this.viewOpenVotes = viewOpenVotes; - } - /** - * @return Returns the isToolSessionChanged. - */ - public String getIsToolSessionChanged() { - return isToolSessionChanged; - } - /** - * @param isToolSessionChanged The isToolSessionChanged to set. - */ - public void setIsToolSessionChanged(String isToolSessionChanged) { - this.isToolSessionChanged = isToolSessionChanged; - } - /** - * @return Returns the selectedToolSessionId. - */ - public String getSelectedToolSessionId() { - return selectedToolSessionId; - } - /** - * @param selectedToolSessionId The selectedToolSessionId to set. - */ - public void setSelectedToolSessionId(String selectedToolSessionId) { - this.selectedToolSessionId = selectedToolSessionId; - } - - /** - * @return Returns the method. - */ - public String getMethod() { - return method; - } - /** - * @param method The method to set. - */ - public void setMethod(String method) { - this.method = method; - } /** * @return Returns the completedSessionUserCount. */ public String getCompletedSessionUserCount() { - return completedSessionUserCount; + return completedSessionUserCount; } + /** - * @param completedSessionUserCount The completedSessionUserCount to set. + * @param completedSessionUserCount + * The completedSessionUserCount to set. */ public void setCompletedSessionUserCount(String completedSessionUserCount) { - this.completedSessionUserCount = completedSessionUserCount; + this.completedSessionUserCount = completedSessionUserCount; } + /** * @return Returns the sessionUserCount. */ public String getSessionUserCount() { - return sessionUserCount; + return sessionUserCount; } + /** - * @param sessionUserCount The sessionUserCount to set. + * @param sessionUserCount + * The sessionUserCount to set. */ public void setSessionUserCount(String sessionUserCount) { - this.sessionUserCount = sessionUserCount; + this.sessionUserCount = sessionUserCount; } + /** - * @return Returns the showOpenVotesSection. - */ - public String getShowOpenVotesSection() { - return showOpenVotesSection; - } - /** - * @param showOpenVotesSection The showOpenVotesSection to set. - */ - public void setShowOpenVotesSection(String showOpenVotesSection) { - this.showOpenVotesSection = showOpenVotesSection; - } - /** * @return Returns the showOpenVote. */ public String getShowOpenVote() { - return showOpenVote; + return showOpenVote; } + /** - * @param showOpenVote The showOpenVote to set. + * @param showOpenVote + * The showOpenVote to set. */ public void setShowOpenVote(String showOpenVote) { - this.showOpenVote = showOpenVote; + this.showOpenVote = showOpenVote; } + /** - * @return Returns the completedSessionUserPercent. - */ - public String getCompletedSessionUserPercent() { - return completedSessionUserPercent; - } - /** - * @param completedSessionUserPercent The completedSessionUserPercent to set. - */ - public void setCompletedSessionUserPercent( - String completedSessionUserPercent) { - this.completedSessionUserPercent = completedSessionUserPercent; - } - /** * @return Returns the existsOpenVotes. */ public String getExistsOpenVotes() { - return existsOpenVotes; + return existsOpenVotes; } + /** - * @param existsOpenVotes The existsOpenVotes to set. + * @param existsOpenVotes + * The existsOpenVotes to set. */ public void setExistsOpenVotes(String existsOpenVotes) { - this.existsOpenVotes = existsOpenVotes; + this.existsOpenVotes = existsOpenVotes; } + /** * @return Returns the defineLaterInEditMode. */ public String getDefineLaterInEditMode() { - return defineLaterInEditMode; + return defineLaterInEditMode; } + /** - * @param defineLaterInEditMode The defineLaterInEditMode to set. + * @param defineLaterInEditMode + * The defineLaterInEditMode to set. */ public void setDefineLaterInEditMode(String defineLaterInEditMode) { - this.defineLaterInEditMode = defineLaterInEditMode; + this.defineLaterInEditMode = defineLaterInEditMode; } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java,v diff -u -r1.40 -r1.41 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 17 Jan 2014 22:18:25 -0000 1.40 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 23 Jan 2014 23:53:16 -0000 1.41 @@ -27,6 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; import javax.servlet.ServletException; @@ -42,6 +43,7 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.vote.EditActivityDTO; +import org.lamsfoundation.lams.tool.vote.SessionDTO; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; import org.lamsfoundation.lams.tool.vote.VoteComparator; @@ -51,284 +53,560 @@ import org.lamsfoundation.lams.tool.vote.VoteUtils; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; import org.lamsfoundation.lams.tool.vote.service.IVoteService; import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; - /** * - *Starts up the monitoring module
+ *+ * Starts up the monitoring module + *
* * @author Ozgur Demirtas */ public class VoteMonitoringStarterAction extends Action implements VoteAppConstants { - static Logger logger = Logger.getLogger(VoteMonitoringStarterAction.class.getName()); + static Logger logger = Logger.getLogger(VoteMonitoringStarterAction.class.getName()); - public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException, VoteApplicationException - { - VoteUtils.cleanUpSessionAbsolute(request); + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException, VoteApplicationException { + VoteUtils.cleanUpSessionAbsolute(request); - IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); - - MessageService messageService = VoteServiceProxy.getMessageService(getServlet().getServletContext()); - - VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; - - VoteGeneralAuthoringDTO voteGeneralAuthoringDTO= new VoteGeneralAuthoringDTO(); - VoteGeneralMonitoringDTO voteGeneralMonitoringDTO=new VoteGeneralMonitoringDTO(); - - ActionForward validateParameters=validateParameters(request, mapping, voteMonitoringForm); - - if (validateParameters != null) - { - return validateParameters; - } + IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); - boolean initData=initialiseMonitoringData(mapping, form, request, response, - voteService, voteGeneralMonitoringDTO); - if (initData == false) - return (mapping.findForward(ERROR_LIST)); - - voteMonitoringForm.setCurrentTab("1"); - voteGeneralMonitoringDTO.setCurrentTab("1"); - - String toolContentID=voteMonitoringForm.getToolContentID(); - - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); - //Come back to fix here - voteGeneralMonitoringDTO.setCountAllUsers(new Integer(0).toString()); - voteGeneralMonitoringDTO.setCountSessionComplete(new Integer(0).toString()); - - VoteMonitoringAction voteMonitoringAction= new VoteMonitoringAction(); - - voteMonitoringAction.initSummaryContent(toolContentID , request, voteService, voteGeneralMonitoringDTO); - voteMonitoringAction.initStatsContent(toolContentID, request, voteService, voteGeneralMonitoringDTO); - - VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID)); - - /*true means there is at least 1 response*/ - if (voteService.studentActivityOccurredStandardAndOpen(voteContent)) - { - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); - } - else - { - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); - } + MessageService messageService = VoteServiceProxy.getMessageService(getServlet().getServletContext()); - voteMonitoringForm.setActiveModule(MONITORING); - voteGeneralMonitoringDTO.setActiveModule(MONITORING); - - voteMonitoringForm.setSelectedToolSessionId("All"); - voteGeneralMonitoringDTO.setSelectedToolSessionId("All"); - - voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString()); - voteGeneralMonitoringDTO.setSbmtSuccess(new Boolean(false).toString()); - - voteGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString()); - voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString()); - voteGeneralMonitoringDTO.setIsPortfolioExport(new Boolean(false).toString()); - - request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); - - /*this section is needed for Edit Activity screen, from here... */ - voteGeneralAuthoringDTO.setActivityTitle(voteGeneralMonitoringDTO.getActivityTitle()); - voteGeneralAuthoringDTO.setActivityInstructions(voteGeneralMonitoringDTO.getActivityInstructions()); - voteGeneralAuthoringDTO.setDefaultOptionContent(voteGeneralMonitoringDTO.getDefaultOptionContent()); - voteGeneralAuthoringDTO.setMapOptionsContent(voteGeneralMonitoringDTO.getMapOptionsContent()); - voteGeneralAuthoringDTO.setActiveModule(MONITORING); - - Map mapOptionsContent=voteGeneralMonitoringDTO.getMapOptionsContent(); - int maxIndex=mapOptionsContent.size(); - voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex); + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; - request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); - /*...till here */ - - //voteMonitoringAction.prepareReflectionData(request, voteContent, voteService, null, false); - - return voteMonitoringAction.submitSession(mapping, voteMonitoringForm, request, response, voteService, messageService, voteGeneralMonitoringDTO); + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + VoteGeneralMonitoringDTO voteGeneralMonitoringDTO = new VoteGeneralMonitoringDTO(); + + ActionForward validateParameters = validateParameters(request, mapping, voteMonitoringForm); + + if (validateParameters != null) { + return validateParameters; } + boolean initData = initialiseMonitoringData(mapping, form, request, response, voteService, + voteGeneralMonitoringDTO); + if (initData == false) + return (mapping.findForward(ERROR_LIST)); + + voteMonitoringForm.setCurrentTab("1"); + voteGeneralMonitoringDTO.setCurrentTab("1"); + + String toolContentID = voteMonitoringForm.getToolContentID(); + + voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); + // Come back to fix here + voteGeneralMonitoringDTO.setCountAllUsers(new Integer(0).toString()); + voteGeneralMonitoringDTO.setCountSessionComplete(new Integer(0).toString()); + + initSummaryContent(toolContentID, request, voteService, voteGeneralMonitoringDTO); + + VoteContent voteContent = voteService.retrieveVote(new Long(toolContentID)); + + /* true means there is at least 1 response */ + if (voteService.studentActivityOccurredStandardAndOpen(voteContent)) { + voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); + } else { + voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); + } + + voteMonitoringForm.setActiveModule(MONITORING); + voteGeneralMonitoringDTO.setActiveModule(MONITORING); + + voteGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString()); + voteGeneralMonitoringDTO.setIsPortfolioExport(new Boolean(false).toString()); + + request.setAttribute(VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); + + /* this section is needed for Edit Activity screen, from here... */ + voteGeneralAuthoringDTO.setActivityTitle(voteGeneralMonitoringDTO.getActivityTitle()); + voteGeneralAuthoringDTO.setActivityInstructions(voteGeneralMonitoringDTO.getActivityInstructions()); + voteGeneralAuthoringDTO.setDefaultOptionContent(voteGeneralMonitoringDTO.getDefaultOptionContent()); + voteGeneralAuthoringDTO.setMapOptionsContent(voteGeneralMonitoringDTO.getMapOptionsContent()); + voteGeneralAuthoringDTO.setActiveModule(MONITORING); + + Map mapOptionsContent = voteGeneralMonitoringDTO.getMapOptionsContent(); + int maxIndex = mapOptionsContent.size(); + voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex); + + request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + /* ...till here */ + + return submitSession(mapping, voteMonitoringForm, request, response, voteService, + messageService, voteGeneralMonitoringDTO); + } + + public ActionForward submitSession(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response, IVoteService voteService, MessageService messageService, + VoteGeneralMonitoringDTO voteGeneralMonitoringDTO) throws IOException, ServletException { - public boolean initialiseMonitoringData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response, - IVoteService voteService, VoteGeneralMonitoringDTO voteGeneralMonitoringDTO) - { - VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; - voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString()); + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; - voteGeneralMonitoringDTO.setCurrentMonitoringTab("summary"); - voteGeneralMonitoringDTO.setSbmtSuccess(new Boolean(false).toString()); - voteGeneralMonitoringDTO.setDefineLaterInEditMode(new Boolean(false).toString()); - voteGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString()); - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); - - VoteUtils.saveTimeZone(request); - - /* we have made sure TOOL_CONTENT_ID is passed */ - String toolContentID=voteMonitoringForm.getToolContentID(); - VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID)); - - if (voteContent == null) - { - VoteUtils.cleanUpSessionAbsolute(request); - voteGeneralMonitoringDTO.setUserExceptionContentDoesNotExist(new Boolean(true).toString()); - return false; - } - - - boolean isContentInUse=VoteUtils.isContentInUse(voteContent); - voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(false).toString()); - if (isContentInUse == true) - { - voteGeneralMonitoringDTO.setIsMonitoredContentInUse(new Boolean(true).toString()); - } - - voteGeneralMonitoringDTO.setActivityTitle(voteContent.getTitle()); - voteGeneralMonitoringDTO.setActivityInstructions(voteContent.getInstructions()); + MonitoringUtil.repopulateRequestParameters(request, voteMonitoringForm, voteGeneralMonitoringDTO); + String toolContentID = voteMonitoringForm.getToolContentID(); + VoteContent voteContent = voteService.retrieveVote(new Long(toolContentID)); - if (voteService.studentActivityOccurredStandardAndOpen(voteContent)) - { - VoteUtils.cleanUpSessionAbsolute(request); - voteGeneralMonitoringDTO.setUserExceptionContentInUse(new Boolean(true).toString()); - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString()); - } - else - { - voteGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(true).toString()); - } + List
+
+
+ + + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v diff -u -r1.21 -r1.22 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp 12 Nov 2012 17:13:43 -0000 1.21 +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp 23 Jan 2014 23:53:16 -0000 1.22 @@ -1,353 +1,154 @@ -<%-- -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -License Information: http://lamsfoundation.org/licensing/lams/2.0/ - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - - http://www.gnu.org/licenses/gpl.txt ---%> - - <%@ include file="/common/taglibs.jsp"%>
+
+
-
-
|
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
|
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
+ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ |
+
+
|
- |
-
Index: lams_tool_vote/web/monitoring/newNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/newNominationBox.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/monitoring/newNominationBox.jsp 24 Oct 2013 08:14:04 -0000 1.10
+++ lams_tool_vote/web/monitoring/newNominationBox.jsp 23 Jan 2014 23:53:16 -0000 1.11
@@ -1,23 +1,3 @@
- <%--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
- http://www.gnu.org/licenses/gpl.txt
---%>
-