Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl 1 Feb 2005 22:00:10 -0000 1.1
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl 2 Feb 2005 16:54:12 -0000 1.2
@@ -7,13 +7,43 @@
} {
assessment_id:integer
section_id
+ item_id:optional
+
}
permission::require_permission -object_id $assessment_id -privilege admin
as::assessment::data -assessment_id $assessment_id
set new_assessment_revision $assessment_data(assessment_rev_id)
+set check_list ""
+set show_p 1
+set by_item_p 0
+set item_p ""
+if {[exists_and_not_null item_id]} {
+ set show_p 0
+ set by_item_p 1
+ set item_p "&item_id=$item_id"
+ set check_list "and c.inter_item_check_id in ("
+ set checks [db_list_of_lists get_all_checks { }]
+
+ foreach check $checks {
+ set cond_list [split [lindex $check 1] "="]
+ set as_item_id [lindex [split [lindex $cond_list 2] " "] 0]
+ if { $item_id == $as_item_id} {
+ append check_list "[lindex $check 0],"
+ }
+
+ }
+ set check_list [string range $check_list 0 [expr [string length $check_list] -2]]
+ append check_list ")"
+}
+db_multirow aa_checks get_aa_checks {}
+db_multirow i_checks get_i_checks {}
+db_multirow branches get_branches {}
+db_multirow m_checks get_m_checks {}
+
+
if {![info exists assessment_data(assessment_id)]} {
ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
ad_script_abort
@@ -22,8 +52,8 @@
set title "$assessment_data(title)"
set context_bar [ad_context_bar [list "one-a?assessment_id=$assessment_id" $title] "$title [_ assessment.Administration]"]
-db_multirow aa_checks get_aa_checks {}
+
template::list::create \
-name aa_checks \
-multirow aa_checks \
@@ -43,20 +73,22 @@
name {
label "[_ assessment.Name]"
display_template {
- @aa_checks.name@
+ @aa_checks.name@
}
}
action_name {
label "[_ assessment.action_to_perform]"
}
counter {
display_template {
+
+
#assessment.notify_user#
}
@@ -65,7 +97,7 @@
}
-db_multirow i_checks get_i_checks {}
+
template::list::create \
-name i_checks \
-multirow i_checks \
@@ -85,28 +117,30 @@
name {
label "[_ assessment.Name]"
display_template {
- @i_checks.name@
+ @i_checks.name@
}
}
action_name {
label "[_ assessment.action_to_perform]"
}
inter_item_check_id {
- display_template {
+ display_template {
+
+
#assessment.notify_user#
}
}
}
-db_multirow m_checks get_m_checks {}
+
template::list::create \
-name m_checks \
-multirow m_checks \
@@ -126,7 +160,7 @@
name {
label "[_ assessment.Name]"
display_template {
- @m_checks.name@
+ @m_checks.name@
}
}
action_name {
@@ -139,7 +173,7 @@
}
}
-db_multirow branches get_branches {}
+
template::list::create \
-name branches \
-multirow branches \
@@ -159,7 +193,7 @@
name {
label "[_ assessment.Name]"
display_template {
- @branches.name@
+ @branches.name@
}
}
section_id_to {