Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v
diff -u -r1.9 -r1.10
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	5 Aug 2005 04:40:22 -0000	1.9
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java	8 Aug 2005 00:27:45 -0000	1.10
@@ -73,6 +73,7 @@
 public class NbMonitoringAction extends LamsLookupDispatchAction {
     
     static Logger logger = Logger.getLogger(NbMonitoringAction.class.getName());
+    public final static String FORM="NbMonitoringForm";
     
     protected Map getKeyMethodMap()
 	{
@@ -89,7 +90,7 @@
     		ActionMapping mapping,
     		ActionForm form,
     		HttpServletRequest request,
-    		HttpServletResponse response)
+    		HttpServletResponse response) throws NbApplicationException
     {
         return summary(mapping, form, request, response);
     }
@@ -102,10 +103,11 @@
      * @return
      */
     public ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+        
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;                
-       // Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
-        Long toolContentId = getToolContentId(request);
+      
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 		NbWebUtil.copyValuesIntoSession(request, content);
 		if (NbWebUtil.isContentEditable(content))
@@ -143,12 +145,15 @@
     public ActionForward instructions(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
      
         //Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
-        Long toolContentId = getToolContentId(request);
+       // Long toolContentId = getToolContentId(request);
+        
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         NbMonitoringForm monitorForm = (NbMonitoringForm)form;
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
 		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
 		NbWebUtil.copyValuesIntoSession(request, content);
 		
+		request.setAttribute(NoticeboardConstants.ONLINE_INSTRUCTIONS, content.getOnlineInstructions());
 		
 		Map attachmentMap = monitorForm.getAttachments();
 	        
@@ -177,8 +182,10 @@
      */
     public ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
        // Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
-        Long toolContentId = getToolContentId(request);
+       // Long toolContentId = getToolContentId(request);
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
+        NbMonitoringForm monitorForm = (NbMonitoringForm)form;
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
    		NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
    		NbWebUtil.copyValuesIntoSession(request, content);
         
@@ -197,7 +204,10 @@
         
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         Map map = new HashMap();
-        Long toolContentId = getToolContentId(request);
+       // Long toolContentId = getToolContentId(request);
+        NbMonitoringForm monitorForm = (NbMonitoringForm)form;
+        Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentId());
+        
         NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
         
         //Get the total number of learners that have participated in this tool activity
@@ -221,11 +231,6 @@
         return mapping.findForward(NoticeboardConstants.MONITOR_PAGE);
     }
     
-    private Long getToolContentId(HttpServletRequest request)
-    {
-        Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE);
-        return toolContentId;
-    }
-    
    
+   
 }