Skip to content
Snippets Groups Projects
Commit 60f54986 authored by srosse's avatar srosse
Browse files

OO-3989: wait 1.5s before printing, fix issues in statistics as well

parent 5c62ab7c
No related branches found
No related tags found
No related merge requests found
...@@ -555,10 +555,12 @@ ...@@ -555,10 +555,12 @@
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
// execute after radial score rendering // execute after radial score rendering
setTimeout(function() { jQuery(function() {
window.focus(); setTimeout(function() {
window.print(); window.focus();
},110); window.print();
},1500);
});
/* ]]> */ /* ]]> */
</script> </script>
#end #end
......
...@@ -123,6 +123,7 @@ public class QTI21AssessmentItemStatisticsController extends BasicController { ...@@ -123,6 +123,7 @@ public class QTI21AssessmentItemStatisticsController extends BasicController {
itemBodyCtrl = new QTI21ItemBodyController(ureq, getWindowControl(), itemRef, resolvedAssessmentItem, resourceResult); itemBodyCtrl = new QTI21ItemBodyController(ureq, getWindowControl(), itemRef, resolvedAssessmentItem, resourceResult);
listenTo(itemBodyCtrl); listenTo(itemBodyCtrl);
mainVC.put("question", itemBodyCtrl.getInitialComponent()); mainVC.put("question", itemBodyCtrl.getInitialComponent());
mainVC.contextPut("questionComponentId", itemBodyCtrl.getInteractionsComponentId());
mapperUri = itemBodyCtrl.getMapperUri(); mapperUri = itemBodyCtrl.getMapperUri();
putInitialPanel(mainVC); putInitialPanel(mainVC);
......
...@@ -67,6 +67,8 @@ public class QTI21ItemBodyController extends FormBasicController { ...@@ -67,6 +67,8 @@ public class QTI21ItemBodyController extends FormBasicController {
private final ItemSessionController itemSessionController; private final ItemSessionController itemSessionController;
private final ResolvedAssessmentItem resolvedAssessmentItem; private final ResolvedAssessmentItem resolvedAssessmentItem;
private ItemBodyResultFormItem questionItem;
@Autowired @Autowired
private QTI21Service qtiService; private QTI21Service qtiService;
...@@ -92,10 +94,14 @@ public class QTI21ItemBodyController extends FormBasicController { ...@@ -92,10 +94,14 @@ public class QTI21ItemBodyController extends FormBasicController {
public String getMapperUri() { public String getMapperUri() {
return mapperUri; return mapperUri;
} }
public String getInteractionsComponentId() {
return questionItem.getComponent().getDispatchID();
}
@Override @Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) { protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
ItemBodyResultFormItem questionItem = new ItemBodyResultFormItem("question", resolvedAssessmentItem); questionItem = new ItemBodyResultFormItem("question", resolvedAssessmentItem);
questionItem.setItemSessionState(itemSessionController.getItemSessionState()); questionItem.setItemSessionState(itemSessionController.getItemSessionState());
questionItem.setCandidateSessionContext(new TerminatedStaticCandidateSessionContext(new InMemoryAssessmentTestSession())); questionItem.setCandidateSessionContext(new TerminatedStaticCandidateSessionContext(new InMemoryAssessmentTestSession()));
questionItem.setResourceLocator(inputResourceLocator); questionItem.setResourceLocator(inputResourceLocator);
......
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
<script type='text/javascript'> <script type='text/javascript'>
/* <![CDATA[ */ /* <![CDATA[ */
## Execute deferred. Gives browser the time to finish the page rendering first before executing the print dialog. ## Execute deferred. Gives browser the time to finish the page rendering first before executing the print dialog.
jQuery(function() {window.print();}); jQuery(function() {
setTimeout(function() {
window.focus();
window.print();
},1500);
});
/* ]]> */ /* ]]> */
</script> </script>
\ No newline at end of file
<div id="o_c$questionComponentId">
#if($r.available("filter")) #if($r.available("filter"))
<div class="o_button_group o_button_group_right"> <div class="o_button_group o_button_group_right">
$r.render("filter") $r.render("filter")
...@@ -53,3 +54,4 @@ ...@@ -53,3 +54,4 @@
$r.render($interactionId) $r.render($interactionId)
#end #end
</div> </div>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment