SAK-42756 after timer submits for user take them back to main page (s…

…akaiproject#7538)
DaweiXia · Nov 13, 2019 · b52a15f · b52a15f
1 parent 3ef1a54
commit b52a15f
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/submitted.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/submitted.jsp
@@ -50,17 +50,9 @@ document.links[newindex].onclick();
 }
 
 function closeWindow() {alert("1"); self.opener=this; self.close(); }
-
-function CloseWin()
-
-{
-window.opener = top ;
-
-window.close();
-}
 </script>
 
-      <body onload="<%= request.getAttribute("html.body.onload") %>">
+<body onload="<%= request.getAttribute("html.body.onload") %>">
 
       <!-- IF A SECURE DELIVERY MODULE HAS BEEN SELECTED, INJECT ITS HTML FRAGMENT (IF ANY) HERE -->
 	  <h:outputText  value="#{delivery.secureDeliveryHTMLFragment}" escape="false" />
@@ -102,13 +94,11 @@ window.close();
 	</div>
 </div>
 
-<div class="table-responsive">
-
 <h:form id="submittedForm">
 
+<div class="table-responsive">
 	<h:outputText id="renderTimeoutMessage" styleClass="sak-banner-error" value="#{deliveryMessages.timeOutSubmission}" rendered="#{delivery.timeOutSubmission=='true'}"/>
-
-<h:messages styleClass="sak-banner-error" rendered="#{! empty facesContext.maximumSeverity}" layout="table"/>
+  <h:messages styleClass="sak-banner-error" rendered="#{! empty facesContext.maximumSeverity}" layout="table"/>
 
 	<h:outputText value="#{deliveryMessages.submission_confirmation_message_1}" rendered="#{!delivery.actionString=='takeAssessmentViaUrl'}"/>
     <h:outputText value="#{deliveryMessages.submission_confirmation_message_4}" rendered="#{delivery.actionString=='takeAssessmentViaUrl'}"/>
@@ -126,7 +116,7 @@ window.close();
 
     <h:outputLabel value="#{deliveryMessages.number_of_sub_remain}" />
     <h:panelGroup>
-	<h:outputText value="#{delivery.submissionsRemaining} #{deliveryMessages.text_out_of} #{delivery.settings.maxAttempts}"
+      <h:outputText value="#{delivery.submissionsRemaining} #{deliveryMessages.text_out_of} #{delivery.settings.maxAttempts}"
           rendered="#{!delivery.settings.unlimitedAttempts}"/>
       <h:outputText value="#{deliveryMessages.unlimited_}"
           rendered="#{delivery.settings.unlimitedAttempts}"/>
@@ -156,7 +146,8 @@ window.close();
 
 <div class="tier1">
   <h:panelGrid columns="2" cellpadding="3" cellspacing="3">
-    <h:commandButton type="submit" value="#{deliveryMessages.button_continue}" action="select"
+    <h:commandButton type="submit" value="#{deliveryMessages.button_continue}"
+       onclick="return returnToHostUrl(\"#{delivery.selectURL}\");"
        rendered="#{delivery.actionString=='takeAssessment'}" />
 
     <h:commandButton value="#{deliveryMessages.review_results}" type="button" id="reviewAssessment"