Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql
===================================================================
diff -u -rf88a2a4d76c8b1b50ef5a09a64c0564cc929cf11 -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95
--- lams_tool_forum/db/sql/drop_lams_tool_forum.sql (.../drop_lams_tool_forum.sql) (revision f88a2a4d76c8b1b50ef5a09a64c0564cc929cf11)
+++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql (.../drop_lams_tool_forum.sql) (revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
@@ -5,6 +5,7 @@
drop table if exists tl_lafrum11_message;
drop table if exists tl_lafrum11_message_seq;
drop table if exists tl_lafrum11_tool_session;
+drop table if exists tl_lafrum11_report;
SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95
--- lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
@@ -43,9 +43,9 @@
1,
1,
0,
-'lams/tool/lafrum11/learning/viewForum.do',
-'lams/tool/lafrum11/authoring/init.do',
-'lams/tool/lafrum11/monitoring/listContentUsers.do',
+'tool/lafrum11/learning/viewForum.do',
+'tool/lafrum11/authoring/init.do',
+'tool/lafrum11/monitoring/listContentUsers.do',
'tool/lafrum11/export.do',
'tool/lafrum11/monitor.do',
'tool/lafrum11/contribute.do',
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java (.../ForumUserDao.java) (revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
@@ -52,4 +52,9 @@
return (ForumUser) list.get(0);
}
+ public ForumUser getByUid(Long userUid) {
+
+ return (ForumUser) this.getHibernateTemplate().get(ForumUser.class,userUid);
+ }
+
}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
@@ -33,9 +33,11 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
import org.lamsfoundation.lams.tool.forum.service.IForumService;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.springframework.web.context.WebApplicationContext;
@@ -115,52 +117,60 @@
private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward releaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward viewUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward editMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ MarkForm markForm = (MarkForm) form;
+ forumService = getForumService();
+ Long userId = new Long(WebUtil.readLongParam(request,"userID"));
+ ForumReport report = forumService.getReport(userId);
+ if(report != null){
+ markForm.setMark(new Integer(report.getMark()).toString());
+ markForm.setComment(report.getComment());
+ }
+ return mapping.findForward("success");
}
private ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward editActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward updateActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward viewInstructions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) {
- return null;
+ return mapping.findForward("success");
}
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r2cbe00467f4c2d4ad30ba38f398830c6de5d2e95
--- lams_tool_forum/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 2cbe00467f4c2d4ad30ba38f398830c6de5d2e95)
@@ -18,6 +18,10 @@
type="org.lamsfoundation.lams.tool.forum.web.forms.ForumForm"
/>
+
@@ -244,15 +248,15 @@
name="emptyForm"
scope="request"
validate="false"
- parameter="viewUserMark" >
+ parameter="releaseMarks" >
+ parameter="downloadMarks" >
+ parameter="viewAllMarks" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+