Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java =================================================================== diff -u -r7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b -r3a34b1940e23fadb7937c45e8020704d95c8af14 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 3a34b1940e23fadb7937c45e8020704d95c8af14) @@ -71,7 +71,8 @@ * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline" * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater" * @struts.action-forward name="notebook" path="tiles:/learning/notebook" - * @struts.action-forward name="voteCount" path="/pages/learning/voteCount.jsp" + * @struts.action-forward name="voteCount" path="/pages/learning/parts/voteCount.jsp" + * @struts.action-forward name="voteConfirmation" path="/pages/learning/parts/voteConfirmation.jsp" */ public class LearningAction extends LamsDispatchAction { @@ -295,8 +296,14 @@ setupDTOs(request, session, scribeUser); scribeService.saveOrUpdateScribeUser(scribeUser); - - return mapping.findForward("learning"); + + if (session.getAppointedScribe().equals(scribeUser)) { + // send updated voteCount + return getVoteCount(mapping, form, request, response); + } else { + // load learning page. + return mapping.findForward("learning"); + } } public ActionForward getVoteCount(ActionMapping mapping, ActionForm form, Index: lams_tool_scribe/web/pages/learning/learning.jsp =================================================================== diff -u -rbcba0d582a372333624718d5d8d98df6e4018976 -r3a34b1940e23fadb7937c45e8020704d95c8af14 --- lams_tool_scribe/web/pages/learning/learning.jsp (.../learning.jsp) (revision bcba0d582a372333624718d5d8d98df6e4018976) +++ lams_tool_scribe/web/pages/learning/learning.jsp (.../learning.jsp) (revision 3a34b1940e23fadb7937c45e8020704d95c8af14) @@ -51,7 +51,7 @@

- + Index: lams_tool_scribe/web/pages/learning/parts/voteCount.jsp =================================================================== diff -u --- lams_tool_scribe/web/pages/learning/parts/voteCount.jsp (revision 0) +++ lams_tool_scribe/web/pages/learning/parts/voteCount.jsp (revision 3a34b1940e23fadb7937c45e8020704d95c8af14) @@ -0,0 +1 @@ +${voteCount} \ No newline at end of file Index: lams_tool_scribe/web/pages/learning/scribe.jsp =================================================================== diff -u -r012bd69a7c1235d509d09c618f4fe38bc8626cf2 -r3a34b1940e23fadb7937c45e8020704d95c8af14 --- lams_tool_scribe/web/pages/learning/scribe.jsp (.../scribe.jsp) (revision 012bd69a7c1235d509d09c618f4fe38bc8626cf2) +++ lams_tool_scribe/web/pages/learning/scribe.jsp (.../scribe.jsp) (revision 3a34b1940e23fadb7937c45e8020704d95c8af14) @@ -28,6 +28,22 @@ setTimeout("refreshPage()",5000) } + + function submitApproval() { + var url = '${tool}learning.do'; + var params = 'dispatch=submitApproval&toolSessionID=${scribeSessionDTO.sessionID}'; + + var myAjax = new Ajax.Updater( + 'voteDisplay', + url, + { + method: 'get', + parameters: params + }); + + // remove the Agree button. + document.getElementById("agreeButton").innerHTML = ""; + }

@@ -73,13 +89,17 @@ -

- - - -

+ + +
+ + + + + + Fisheye: Tag 3a34b1940e23fadb7937c45e8020704d95c8af14 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/learning/voteCount.jsp'. Fisheye: No comparison available. Pass `N' to diff?