Index: openacs-4/packages/xowf/lib/inclass-exam.wf =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/Attic/inclass-exam.wf,v diff -u -N -r1.1.2.33 -r1.1.2.34 --- openacs-4/packages/xowf/lib/inclass-exam.wf 17 May 2020 18:52:23 -0000 1.1.2.33 +++ openacs-4/packages/xowf/lib/inclass-exam.wf 6 Jun 2020 16:30:11 -0000 1.1.2.34 @@ -622,7 +622,7 @@ foreach type {camera-image desktop-image} { if {[dict exists $image $ts $type]} { set ext [dict get $image $ts $type] - append markup [subst {}] + append markup [subst {}] } } if {[dict exists $image $ts camera-audio]} { @@ -757,7 +757,7 @@ # The line "

You are being proctored!

" is just a # placeholder and has to be replaced with real code. # - set link [${:package_id} query_parameter link:localurl ""] + set link [:query_parameter link:localurl ""] ::xo::cc set_parameter template_file view-plain-master ::xo::cc set_parameter MenuBar 0 @@ -766,10 +766,16 @@ set object_id ${:item_id} set object_url $link set upload_url /xowf-proctoring-upload + if {[string match *p.try_out_mode=1* $link]} { + #set examination_statement_p 0 + set examination_statement_url "" + } + ${:package_id} return_page -adp /packages/xowf/lib/proctored-page -variables { object_id object_url upload_url + examination_statement_url } } else { return [:www-view [subst { @@ -779,6 +785,7 @@ }]] } } + :proc www-proctor-image {} { set type [${:package_id} query_parameter type:ascii ""] set ts [${:package_id} query_parameter ts:integer ""] Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v diff -u -N -r1.7.2.64 -r1.7.2.65 --- openacs-4/packages/xowf/tcl/test-item-procs.tcl 3 Jun 2020 14:06:03 -0000 1.7.2.64 +++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 6 Jun 2020 16:30:11 -0000 1.7.2.65 @@ -2067,6 +2067,8 @@ {-target_time:required} {-id:required} {-audio_alarm:boolean true} + {-audio_alarm_cookie incass_exam_audio_alarm} + {-audio_alarm_times: 60,30,20,10,5,2} } { # # Accepted formats for target_time, determined by JavaScript @@ -2177,14 +2179,14 @@ span.classList.remove('glyphicon-volume-off'); span.classList.add('glyphicon-volume-up'); container.dataset.alarm = 'active'; - document.cookie = 'incass_exam_audio_alarm=active; sameSite=strict'; + document.cookie = '$audio_alarm_cookie=active; sameSite=strict'; audioContext.resume().then(() => {console.log('Playback resumed successfully ' + targetState);}); } else { var span = container.getElementsByTagName('span')\[0\]; span.classList.remove('glyphicon-volume-up'); span.classList.add('glyphicon-volume-off'); container.dataset.alarm = 'inactive'; - document.cookie = 'incass_exam_audio_alarm=inactive; sameSite=strict'; + document.cookie = '$audio_alarm_cookie=inactive; sameSite=strict'; audioContext.suspend().then(() => {console.log('Playback suspended successfully ' + targetState);}); } //console.log('setSate ' + audioContext.state + ' alarm ' + container.dataset.alarm); @@ -2202,7 +2204,7 @@ }); var audioContext_onload = (function (event) { - var m = document.cookie.match('(^|;)\\s*incass_exam_audio_alarm\\s*=\\s*(\[^;\]+)'); + var m = document.cookie.match('(^|;)\\s*$audio_alarm_cookie\\s*=\\s*(\[^;\]+)'); var cookieValue = (m ? m.pop() : 'inactive'); console.log('audioContext_onload ' + audioContext.state + ' cookie ' + cookieValue); @@ -2230,12 +2232,12 @@ window.addEventListener('load', audioContext_onload); }] - set alarmState [ns_getcookie incass_exam_audio_alarm "inactive"] + set alarmState [ns_getcookie $audio_alarm_cookie "inactive"] set glypphIcon [expr {$alarmState eq "inactive" ? "glyphicon-volume-off":"glyphicon-volume-up"}] #ns_log notice "C=$alarmState" return [subst { -
+
Index: openacs-4/packages/xowf/www/resources/test-item.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/resources/Attic/test-item.css,v diff -u -N -r1.1.2.24 -r1.1.2.25 --- openacs-4/packages/xowf/www/resources/test-item.css 3 Jun 2020 15:25:03 -0000 1.1.2.24 +++ openacs-4/packages/xowf/www/resources/test-item.css 6 Jun 2020 16:30:11 -0000 1.1.2.25 @@ -234,8 +234,9 @@ */ div.xowiki-content div.countdown-timer { float: right; - height: 14px; - vertical-align: text-bottom; + margin-top: 10px; + margin-bottom: 10px; + vertical-align: text-bottom; } div.xowiki-content div.countdown-timer span.glyphicon-volume-off { color: red;