Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r0cd3a215c27e8fd64b488f94fe084b665ab15567 -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 0cd3a215c27e8fd64b488f94fe084b665ab15567)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff)
@@ -12,9 +12,20 @@
 		
 		function finish()
 		{
-			window.parent.opener.location.href='urlcontent.do?method=setContentDone&sessionId=27534&urlId=7365&mode=resume&actor=learner';
-			window.parent.opener=null;
-			window.parent.close();
+			if(${mode.learner}){
+			   var reqIDVar = new Date();
+			   //if auto run mode, the opener will be null
+			   if(window.parent.opener != null) 
+				   window.parent.opener.parent.frames['learningFrame'].location.href="<c:url value="/learning/completeItem.do"/>?itemUid=${itemUid}&reqID="+reqIDVar.getTime();
+			   else{
+			   //set complete flag and finish this activity as well.
+			       window.parent.opener.parent.frames['learningFrame'].location.href='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&itemUid=${itemUid}"/>';
+			   }
+			}
+		   if(window.parent.opener != null) {
+				window.parent.opener=null;
+				window.parent.close();
+			}
 		}
 
 		function finishIns(){