Index: openacs-4/packages/assessment/www/asm-admin/results-users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.tcl,v diff -u -N -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/assessment/www/asm-admin/results-users.tcl 12 Jul 2007 12:58:56 -0000 1.9.2.3 +++ openacs-4/packages/assessment/www/asm-admin/results-users.tcl 14 Sep 2007 23:09:39 -0000 1.9.2.4 @@ -65,6 +65,18 @@ } } +if { [exists_and_not_null status] } { + if { $status == "complete" } { + set whereclause "cs.completed_datetime is not null" + } elseif { $status == "incomplete" } { + set whereclause "cs.completed_datetime is null and ns.session_id is not null" + } else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" + } +} else { + set whereclause "cs.completed_datetime is null and ns.session_id is null" +} + template::list::create \ -name results \ -multirow results \ @@ -103,11 +115,7 @@ status { values {{"[_ assessment.Complete]" complete} {"[_ assessment.Incomplete]" incomplete} {"[_ assessment.Not_Taken]" nottaken}} where_clause { - (case when :status = 'complete' - then not cs.completed_datetime is null - when :status = 'incomplete' - then cs.completed_datetime is null and ns.session_id is not null - else cs.completed_datetime is null and ns.session_id is null end) + $whereclause } } } -bulk_actions {"#assessment.Send_Email#" send-mail "#assessment.Send_an_email_to_the_selected users#"} \