Index: openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.2.2.17 -r1.2.2.18
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 21 Mar 2020 19:59:09 -0000 1.2.2.17
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 22 Mar 2020 13:48:54 -0000 1.2.2.18
@@ -127,7 +127,9 @@
Inclass-Exam ge�ffnet (Zur Bearbeitung freigegeben)
Inclass-Exam geschlossen
Anzahl der �nderungen
- Dauer
- Nicht Abgegeben
+ Dauer
+ nicht abgegeben
+ abgegeben
+ Status
Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -N -r1.2.2.14 -r1.2.2.15
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 21 Mar 2020 19:59:09 -0000 1.2.2.14
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 22 Mar 2020 13:48:54 -0000 1.2.2.15
@@ -147,6 +147,8 @@
Created Questions
Created Assessments
Number of changes
- Duration
- Not Submitted
+ Duration
+ not submitted
+ submitted
+ State
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.7 -r1.1.2.8
--- openacs-4/packages/xowf/lib/inclass-exam.wf 22 Mar 2020 11:18:21 -0000 1.1.2.7
+++ openacs-4/packages/xowf/lib/inclass-exam.wf 22 Mar 2020 13:48:54 -0000 1.1.2.8
@@ -355,14 +355,14 @@
if {$revision_id ne ""} {
set r [::xowiki::FormPage get_instance_from_db -revision_id $revision_id]
- if {[[lindex [$items children] 0] item_id] ne [$r item_id]} {
+ if {[$r item_id] ni [lmap i [$items children] {$i item_id}]} {
error "invalid revision id '$revision_id' provided"
}
$items destroy
set items [::xo::OrderedComposite new -destroy_on_cleanup]
$items add $r
}
-
+
foreach i [$items children] {
$i set online-exam-userName [acs_user::get_element -user_id [$i creation_user] -element username]
$i set online-exam-fullName [::xo::get_user_name [$i creation_user]]
@@ -387,7 +387,7 @@
ns_log notice "online-exam: submission of $userName is empty. Ignoring."
continue
}
-
+
#
# The call to "render_content" calls actually the
# "summary_form" of online-exam-answer.wf when the submit
@@ -420,8 +420,8 @@
$userName · $fullName · $pretty_date
[xowf::test_item::answer_manager runtime_panel -revision_id $revision_id -filter_id $filter_id $i]
- $signatureString
- $question_form
+ $signatureString
+ $question_form
}]
}
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.35 -r1.7.2.36
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl 22 Mar 2020 11:18:21 -0000 1.7.2.35
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 22 Mar 2020 13:48:54 -0000 1.7.2.36
@@ -1339,6 +1339,7 @@
# - per-revision statistics: when revision_id is provided
#
set revision_sets [$answerObj get_revision_sets]
+ set page_info ""
if {$filter_id ne ""} {
set baseUrl [ns_conn url]
@@ -1350,9 +1351,11 @@
if {$rid == [$answerObj revision_id]} {
set suffix "*"
set CSSclass "current"
+ set current_item [expr {[dict get [$answerObj instance_attributes] position] + 1}]
+ set page_info "#xowf.question#: $current_item"
} else {
set suffix ""
- set CSSclass "othter"
+ set CSSclass "other"
}
lappend revision_list [subst {[incr c]$suffix}]
}
@@ -1364,12 +1367,17 @@
set duration [xowf::test_item::answer_manager get_duration $revision_sets]
set IPs [xowf::test_item::answer_manager get_IPs $revision_sets]
set state [$answerObj state]
- set submissionState [expr {$state ne "done" ? "- #xowf.not_submitted#" : ""}]
+ if {$state eq "done"} {
+ set submission_info "#xowf.submitted#"
+ } else {
+ set submission_info "#xowf.not_submitted# ($page_info)"
+ }
set HTML [subst {
$revisionDetails
- #xowf.duration#: [dict get $duration from] - [dict get $duration to]
- ([dict get $duration duration]) $submissionState
- IP: $IPs
+ #xowf.Status#: $submission_info
+ #xowf.Duration#: [dict get $duration from] - [dict get $duration to]
+ ([dict get $duration duration])
+ IP: $IPs
}]
return $HTML
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.16 -r1.1.2.17
--- openacs-4/packages/xowf/www/resources/test-item.css 21 Mar 2020 12:22:37 -0000 1.1.2.16
+++ openacs-4/packages/xowf/www/resources/test-item.css 22 Mar 2020 13:48:54 -0000 1.1.2.17
@@ -20,6 +20,12 @@
color: black;
padding: 2px 10px 4px 12px;
}
+div.single_exam div.runtime-data .data {
+ color: #888;
+}
+div.single_exam div.runtime-data a {
+ color: #66f;
+}
@media print{
div {