Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl 20 Sep 2006 15:04:15 -0000 1.10
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl 26 Sep 2006 04:10:09 -0000 1.11
@@ -29,14 +29,17 @@
lappend elements title \
[list \
- label "[_ assessment.open_assessments]" \
- display_template {@assessments.title@}]
+ label "[_ assessment.Title]" \
+ display_template {@assessments.title@Yes(this assessment is anonymous)}]
-lappend elements anonymous_p \
- [list \
- label "[_ assessment-portlet.lt_Is_this_assessment_an]" \
- display_template {YesNo}]
-
+lappend elements status {
+ label "[_ assessment.Status]"
+ display_template {IncompleteFinishedUntaken}
+}
+lappend elements take {
+ label ""
+ display_template {TakeRetake}
+}
if {[llength $list_of_package_ids]==1} {
set admin_p [permission::permission_p \
-party_id $user_id \
@@ -52,11 +55,21 @@
set hide 1
}
+lappend elements session \
+ [list \
+ label {} \
+ display_template {[_ assessment.Review]}]
+
+lappend elements admin {
+ label ""
+ display_template {\#acs-kernel.common_Admin\#}
+}
+
lappend elements results {
- hide_p $hide
- label "[_ assessment.View_results]"
- display_template {\#assessment.View_results\#}
+ label ""
+ display_template {\#assessment.Results\#}
}
+
# create a list with all open assessments
template::list::create \
-name assessments \
@@ -66,10 +79,10 @@
-main_class narrow
# get the information of all open assessments
-template::multirow create assessments assessment_id title description assessment_url community_url community_name anonymous_p
+template::multirow create assessments assessment_id title description assessment_url community_url community_name anonymous_p in_progress_p completed_p status number_tries admin_p
set old_comm_node_id 0
db_foreach open_asssessments {} {
- if {$comm_node_id == $old_comm_node_id} {e
+ if {$comm_node_id == $old_comm_node_id} {
set community_name ""
}
set community_url [site_node::get_url -node_id $comm_node_id]
@@ -81,8 +94,15 @@
} else {
append assessment_url [export_vars -base "assessment-password" {assessment_id}]
}
+ if {$in_progress_p > 0} {
+ set status in_progress
+ } elseif {$completed_p >0} {
+ set status finished
+ } else {
+ set status untaken
+ }
- template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name $anonymous_p
+ template::multirow append assessments $assessment_id $title $description $assessment_url $community_url $community_name $anonymous_p $in_progress_p $completed_p $status $number_tries $admin_p
}
@@ -101,14 +121,24 @@
lappend elements title \
[list \
- label "[_ assessment.Assessments]"] \
+ label "[_ assessment.Title]"]
+
lappend elements session \
[list \
- label {[_ assessment.Sessions]} \
- display_template {[_ assessment.Sessions]}]
+ label {} \
+ display_template {[_ assessment.Review]}]
+lappend elements admin {
+ label ""
+ display_template {\#acs-kernel.common_Admin\#}
+}
+lappend elements results {
+ label ""
+ display_template {\#assessment.Results\#}
+ }
+
# create a list with all answered assessments and their sessions
template::list::create \
-name sessions \
@@ -124,6 +154,6 @@
set community_name ""
}
set community_url [site_node::get_url -node_id $comm_node_id]
- set session_url "[site_node::get_url -node_id $as_node_id][export_vars -base sessions {assessment_id}]"
+ set session_url "[site_node::get_url -node_id $as_node_id][export_vars -base session {assessment_id}]"
set old_comm_node_id $comm_node_id
}