Index: openacs-4/packages/assessment/www/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/assessment/www/assessment.tcl 26 Jan 2005 23:13:16 -0000 1.33 +++ openacs-4/packages/assessment/www/assessment.tcl 29 Jan 2005 11:03:07 -0000 1.34 @@ -59,6 +59,9 @@ } else { db_1row unfinished_section_id {} db_1row unfinished_item_order {} + if {[empty_string_p $item_order]} { + db_1row unfinished_last_item {} + } incr section_order -1 incr item_order -1 } Index: openacs-4/packages/assessment/www/assessment.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.xql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/assessment/www/assessment.xql 24 Jan 2005 14:54:30 -0000 1.10 +++ openacs-4/packages/assessment/www/assessment.xql 29 Jan 2005 11:03:07 -0000 1.11 @@ -62,6 +62,17 @@ + + + + select max(i.sort_order) as item_order + from as_session_items i + where i.session_id = :session_id + and i.section_id = :section_id + + + + Index: openacs-4/packages/assessment/www/admin/assessment-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/assessment-form.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/assessment/www/admin/assessment-form.tcl 23 Jan 2005 18:10:49 -0000 1.9 +++ openacs-4/packages/assessment/www/admin/assessment-form.tcl 29 Jan 2005 11:03:07 -0000 1.10 @@ -41,7 +41,7 @@ if {[info exists assessment_id]} { ad_form -extend -name assessment_form -form { - {name:text(inform) {label "[_ assessment.Name]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}} + {name:text(inform) {label "#assessment.Name#"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.assessment_Name_help]"}} } } else { ad_form -extend -name assessment_form -form { Index: openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-cb.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl 28 Jan 2005 20:28:16 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/item-add-display-cb.tcl 29 Jan 2005 11:03:07 -0000 1.7 @@ -38,7 +38,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-rb.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl 28 Jan 2005 20:28:16 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/item-add-display-rb.tcl 29 Jan 2005 11:03:07 -0000 1.7 @@ -38,7 +38,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-add-display-sb.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl 28 Jan 2005 20:28:16 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/item-add-display-sb.tcl 29 Jan 2005 11:03:07 -0000 1.6 @@ -34,7 +34,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-cb.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl 28 Jan 2005 20:28:16 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/item-edit-display-cb.tcl 29 Jan 2005 11:03:07 -0000 1.7 @@ -36,7 +36,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-rb.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl 28 Jan 2005 20:28:16 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/item-edit-display-rb.tcl 29 Jan 2005 11:03:07 -0000 1.7 @@ -36,7 +36,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/item-edit-display-sb.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl 28 Jan 2005 20:28:16 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/item-edit-display-sb.tcl 29 Jan 2005 11:03:07 -0000 1.7 @@ -33,7 +33,7 @@ } set order_types [list] -foreach one_order_type [list numerical alphabetical randomized order_of_entry] { +foreach one_order_type [list alphabetical randomized order_of_entry] { lappend order_types [list "[_ assessment.$one_order_type]" $one_order_type] } Index: openacs-4/packages/assessment/www/admin/one-a.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/one-a.adp,v diff -u -r1.13 -r1.14 --- openacs-4/packages/assessment/www/admin/one-a.adp 26 Jan 2005 11:06:45 -0000 1.13 +++ openacs-4/packages/assessment/www/admin/one-a.adp 29 Jan 2005 11:03:07 -0000 1.14 @@ -24,7 +24,7 @@ #assessment.CSV_file##assessment.CSV_file# - + #assessment.Email_Options#@notification_chunk;noquote@ #assessment.Send_bulkmail# #assessment.regarding_this_assess#