Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.40 -r1.41
--- lams_tool_vote/conf/language/ApplicationResources.properties	11 Jun 2006 17:57:38 -0000	1.40
+++ lams_tool_vote/conf/language/ApplicationResources.properties	13 Jun 2006 17:29:16 -0000	1.41
@@ -130,6 +130,7 @@
 label.warning =Warning
 label.summary.sessionSeparator =_________________________________________________
 label.groupName =Group Name:
+label.learnersVoted= Learners Voted
 
 
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v
diff -u -r1.26 -r1.27
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	11 Jun 2006 17:57:38 -0000	1.26
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	13 Jun 2006 17:29:27 -0000	1.27
@@ -60,6 +60,7 @@
     public static final String ERROR_LIST								="errorList";
     public static final String PREVIEW									="preview";
     public static final String LEARNER_PROGRESS							="learnerProgress";
+    public static final String VOTE_NOMINATION_VIEWER					="voteNominationViewer";
     public static final String LEARNER_PROGRESS_USERID					="learnerProgressUserId";
 	
     public static final String AUTHORING								="authoring";
@@ -124,6 +125,7 @@
     public static final String MAP_STARTUP_GENERAL_OPTIONS_CONTENT		="mapStartupGeneralOptionsContent";
     public static final String MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT	="mapStartupGeneralSelectedOptionsContent";
     public static final String MAP_STARTUP_GENERAL_OPTIONS_QUEID		="mapStartupGeneralOptionsQueId";
+    public static final String MAP_STUDENTS_VOTED						="mapStudentsVoted";
     public static final String QUESTIONS_WITHNO_OPTIONS					="questionsWithNoOptions";
     
     public static final String MAP_GENERAL_CHECKED_OPTIONS_CONTENT		="mapGeneralCheckedOptionsContent";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	13 Jun 2006 09:38:00 -0000	1.29
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	13 Jun 2006 17:29:57 -0000	1.30
@@ -1015,11 +1015,46 @@
 	    request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession);
 	    logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION));
 
-    	//return (mapping.findForward(LOAD_MONITORING));
 	    logger.debug("submitting session to refresh the data from the database: ");
 	    return submitSession(mapping, form,  request, response);	    
      }
 
+    public ActionForward getVoteNomination(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request,HttpServletResponse response) throws IOException,
+            ServletException, ToolException
+    {
+        logger.debug("dispatching getVoteNomination...");
+        String questionUid=request.getParameter("questionUid");
+        String sessionUid=request.getParameter("sessionUid");
+        
+        logger.debug("questionUid: " + questionUid);
+        logger.debug("sessionUid: " + sessionUid);
+        
+    	IVoteService voteService=null;
+	    voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("voteService: " + voteService);
+
+		List userNames=voteService.getStandardAttemptUsersForQuestionContentAndSessionUid(new Long(questionUid), new Long(sessionUid));
+		logger.debug("userNames: " + userNames);
+		List listVotedLearnersDTO= new LinkedList();
+		
+        Iterator userIterator=userNames.iterator();
+    	while (userIterator.hasNext())
+    	{
+    	    VoteUsrAttempt voteUsrAttempt=(VoteUsrAttempt)userIterator.next();
+    	    VoteMonitoredUserDTO voteMonitoredUserDTO= new VoteMonitoredUserDTO();
+    	    voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname());
+    	    voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+    	    listVotedLearnersDTO.add(voteMonitoredUserDTO);
+    	}
+		logger.debug("listVoteAllSessionsDTO: " + listVotedLearnersDTO);
+		
+		request.getSession().setAttribute(MAP_STUDENTS_VOTED,listVotedLearnersDTO);
+		
+		logger.debug("fdwing to: " + VOTE_NOMINATION_VIEWER);
+		return (mapping.findForward(VOTE_NOMINATION_VIEWER));          
+    }
+
     
     
     /**
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteNominationViewer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/struts-config.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/web/WEB-INF/struts-config.xml	17 May 2006 13:32:25 -0000	1.18
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	13 Jun 2006 17:33:16 -0000	1.19
@@ -449,8 +449,13 @@
 			path="/monitoring/MonitoringMaincontent.jsp"
 			redirect="false"
 	  	/>
-	      
 
+        <forward 
+        	name="voteNominationViewer" 
+        	path="/monitoring/VoteNominationViewer.jsp" 
+        	redirect="false"
+       	/>	      
+
 	  	<forward
 		    name="errorList"
 	        path="/VoteErrorBox.jsp"
@@ -461,7 +466,6 @@
    <action 	path="/clearsession" 
    			type="org.lamsfoundation.lams.tool.vote.web.ClearSessionAction"> 
 	</action>     			
-	
  </action-mappings>
 	
 	<message-resources parameter="org.lamsfoundation.lams.tool.vote.ApplicationResources"/>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/WEB-INF/web.xml	12 Jun 2006 19:52:11 -0000	1.7
+++ lams_tool_vote/web/WEB-INF/web.xml	13 Jun 2006 17:33:16 -0000	1.8
@@ -138,13 +138,7 @@
 		<servlet-class>org.lamsfoundation.lams.tool.vote.web.VoteChartGenerator</servlet-class>
 	</servlet>
 
-	<servlet>
-		<servlet-name>voteNominationViewer</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.vote.web.VoteNominationViewer</servlet-class>
-	</servlet>
 
-
-
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
@@ -180,12 +174,6 @@
 		<url-pattern>/chartGenerator/*</url-pattern>
   	</servlet-mapping>
 
-  	<servlet-mapping>
-		<servlet-name>voteNominationViewer</servlet-name>
-		<url-pattern>/voteNominationViewer/*</url-pattern>
-  	</servlet-mapping>
-
-
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
 	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	2 Jun 2006 08:03:42 -0000	1.16
+++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp	13 Jun 2006 17:30:30 -0000	1.17
@@ -50,18 +50,10 @@
 	<html:html locale="true">
 	<head>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:headItems/>
 	<title> <bean:message key="activity.title"/>  </title>
-	
-	 <lams:css/>
+	<lams:css/>
 
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->	 
- 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-   	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript">
 		var imgRoot="${lams}images/";
 		var themeName="aqua";
Index: lams_tool_vote/web/learning/learningHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/learningHeader.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/learning/learningHeader.jsp	21 May 2006 14:02:09 -0000	1.3
+++ lams_tool_vote/web/learning/learningHeader.jsp	13 Jun 2006 17:31:25 -0000	1.4
@@ -35,14 +35,7 @@
 	<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 	
 	<title> <bean:message key="label.learning"/> </title>
-	 <lams:css/>
-	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
-
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
+	<lams:headItems/>
 	<script language="JavaScript" type="text/JavaScript">
 
 		
@@ -62,6 +55,3 @@
 	    var themeName="aqua";
         
 	</script>
-	
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
-	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	13 Jun 2006 09:40:33 -0000	1.5
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	13 Jun 2006 17:32:37 -0000	1.6
@@ -155,7 +155,7 @@
 					
 																		  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
 																							<c:set var="viewURL">
-																								<html:rewrite page="/voteNominationViewer?questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}"/>
+																								<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 																							</c:set>
 																		  																					
 																							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	13 Jun 2006 09:40:33 -0000	1.5
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	13 Jun 2006 17:32:37 -0000	1.6
@@ -148,7 +148,7 @@
 		
 																  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
 																					<c:set var="viewURL">
-																						<html:rewrite page="/voteNominationViewer?questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}"/>
+																						<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 																					</c:set>
 																  																					
 																					<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	1 Jun 2006 09:17:58 -0000	1.7
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	13 Jun 2006 17:32:37 -0000	1.8
@@ -49,18 +49,9 @@
 	<html:html locale="true">
 	<head>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:headItems/>
 	<title> <bean:message key="label.monitoring"/> </title>
-	
-	 <lams:css/>
 
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->	 
- 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
-   	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-
-	<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
-
 	<script type="text/javascript">
 		var imgRoot="${lams}images/";
 		var themeName="aqua";
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/VoteNominationViewer.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	13 Jun 2006 17:32:37 -0000	1.1
@@ -0,0 +1,65 @@
+<%-- 
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ page import="java.util.LinkedHashSet" %>
+<%@ page import="java.util.Set" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
+<html:html locale="true">
+	<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:headItems/>
+	<title> <bean:message key="label.learnersVoted"/> </title>
+</head>
+<body>
+
+    <table width='80%' cellspacing='8' align='CENTER' class='forms'>
+	    <tr> <th NOWRAP colspan=2>  <bean:message key="label.learnersVoted"/> </th> </tr>
+	
+		<tr> 
+	       <td NOWRAP align=center valign=top><b> <bean:message key="label.user"/> </b></td>
+		   <td NOWRAP align=center valign=top><b> <bean:message key="label.attemptTime"/> </b></td>
+	   </tr>
+	    
+		<c:forEach var="userData" items="${mapStudentsVoted}">
+			<tr>		 
+					 <td NOWRAP valign=top align=center>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
+					 <td NOWRAP valign=top align=center>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+			</tr>				 
+		</c:forEach>		  	
+    </table>
+
+</body>
+</html:html>