Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 15 Apr 2005 18:15:48 -0000 1.55
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml 18 Apr 2005 12:30:26 -0000 1.56
@@ -63,6 +63,7 @@
<msg key="Answer_Choices">Answer Choices</msg>
<msg key="Answer_Value">Answer Value</msg>
<msg key="Answer_Value_help">Value of this answer</msg>
+ <msg key="answered_assessments">Answered Assessments</msg>
<msg key="Applet">Assessment Applet</msg>
<msg key="approve">Approve</msg>
<msg key="approve_actions">Approve Actions</msg>
@@ -111,6 +112,7 @@
<msg key="assessment_too_many_tries">Only %number_tries% tries allowed.</msg>
<msg key="assessment_wait_retry">You have to wait %pretty_wait_time% before your next try.</msg>
<msg key="assessment_wrong_password">Wrong password.</msg>
+ <msg key="Assessments">Assessments</msg>
<msg key="at_the_end">At the end of this assessment</msg>
<msg key="Attempt">Attempt</msg>
<msg key="Author">Author</msg>
@@ -349,6 +351,7 @@
<msg key="one_correct_choice_req">At least one correct choice required</msg>
<msg key="Only_correct">Only correct Responses</msg>
<msg key="Only_incorrect">Only incorrect Responses</msg>
+ <msg key="open_assessments">Open Assessments</msg>
<msg key="oq_Keywords">Keywords</msg>
<msg key="oq_Keywords_help">Keywords used for automatic grading</msg>
<msg key="oq_Reference_Answer">Reference Answer</msg>
Index: openacs-4/packages/assessment/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/index-oracle.xql 21 Feb 2005 14:32:56 -0000 1.2
+++ openacs-4/packages/assessment/www/index-oracle.xql 18 Apr 2005 12:30:27 -0000 1.3
@@ -2,7 +2,7 @@
<queryset>
<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-<fullquery name="asssessment_id_name_definition">
+<fullquery name="open_asssessments">
<querytext>
select cr.item_id as assessment_id, cr.title, cr.description, a.password,
to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time,
Index: openacs-4/packages/assessment/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/index-postgresql.xql 21 Feb 2005 14:32:56 -0000 1.3
+++ openacs-4/packages/assessment/www/index-postgresql.xql 18 Apr 2005 12:30:27 -0000 1.4
@@ -2,7 +2,7 @@
<queryset>
<rdbms><type>postgresql</type><version>7.3</version></rdbms>
-<fullquery name="asssessment_id_name_definition">
+<fullquery name="open_asssessments">
<querytext>
select cr.item_id as assessment_id, cr.title, cr.description, a.password,
to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time,
Index: openacs-4/packages/assessment/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/assessment/www/index.adp 9 Feb 2005 10:42:50 -0000 1.13
+++ openacs-4/packages/assessment/www/index.adp 18 Apr 2005 12:30:27 -0000 1.14
@@ -5,3 +5,8 @@
<if @admin_p@ eq "1"><p style="text-align: right;"><a href="asm-admin/"><img src="/resources/assessment/admin.gif" border="0" alt="Administer Assessments"></a></p></if>
<listtemplate name="assessments"></listtemplate>
+
+<if @sessions:rowcount@ gt 0>
+ <h3>#assessment.answered_assessments#</h3>
+ <listtemplate name="sessions"></listtemplate>
+</if>
Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/assessment/www/index.tcl 21 Feb 2005 14:32:56 -0000 1.12
+++ openacs-4/packages/assessment/www/index.tcl 18 Apr 2005 12:30:27 -0000 1.13
@@ -16,38 +16,56 @@
set folder_id [as::assessment::folder_id -package_id $package_id]
set user_id [ad_conn user_id]
-# create a list with all assessments and their sessions
+# create a list with all open assessments
template::list::create \
-name assessments \
-multirow assessments \
-key assessment_id \
-elements {
title {
- label {Assessment}
- display_template {<if @assessments.assessment_url@ not nil><a href="@assessments.assessment_url@">@assessments.title@</a></if><else>@assessments.title@</else>}
+ label "[_ assessment.open_assessments]"
+ display_template {<a href="@assessments.assessment_url@">@assessments.title@</a>}
}
- session {
- label {[_ assessment.Sessions]}
- link_url_eval {[export_vars -base "sessions" {assessment_id}]}
- }
} -main_class {
narrow
}
-# get the information of all assessments store in the database
-db_multirow -extend { session assessment_url } assessments asssessment_id_name_definition {} {
- set session {Sessions}
+# get the information of all open assessments
+template::multirow create assessments assessment_id title description assessment_url
+db_foreach open_asssessments {} {
if {([empty_string_p $start_time] || $start_time <= $cur_time) && ([empty_string_p $end_time] || $end_time >= $cur_time)} {
if {[empty_string_p $password]} {
set assessment_url [export_vars -base "assessment" {assessment_id}]
} else {
set assessment_url [export_vars -base "assessment-password" {assessment_id}]
}
- } else {
- set assessment_url ""
+ template::multirow append assessments $assessment_id $title $description $assessment_url
}
}
+# create a list with all answered assessments and their sessions
+template::list::create \
+ -name sessions \
+ -multirow sessions \
+ -key assessment_id \
+ -elements {
+ title {
+ label "[_ assessment.Assessments]"
+ display_template {@sessions.title@}
+ }
+ session {
+ label {[_ assessment.Sessions]}
+ link_url_eval {[export_vars -base "sessions" {assessment_id}]}
+ }
+ } -main_class {
+ narrow
+ }
+
+# get the information of all assessments store in the database
+db_multirow -extend { session } sessions answered_asssessments {} {
+ set session {Sessions}
+}
+
set admin_p [ad_permission_p $package_id create]
ad_return_template
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/index.xql'.
Fisheye: No comparison available. Pass `N' to diff?