Index: openacs-4/packages/assessment/lib/section-items.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.adp,v diff -u -N -r1.17.2.1 -r1.17.2.2 --- openacs-4/packages/assessment/lib/section-items.adp 19 Jul 2005 15:57:12 -0000 1.17.2.1 +++ openacs-4/packages/assessment/lib/section-items.adp 20 Jul 2005 16:25:57 -0000 1.17.2.2 @@ -18,7 +18,7 @@ - @items.rownum@. @items.field_name@ * + @items.rownum@. @items.field_name@ * Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl,v diff -u -N -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl 18 Jul 2005 18:01:01 -0000 1.5.2.1 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-cb.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.2 @@ -84,7 +84,7 @@ db_dml update_item {} } } - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } @@ -175,7 +175,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl 4 Jul 2005 20:53:44 -0000 1.1.2.2 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-f.tcl 20 Jul 2005 16:25:57 -0000 1.1.2.3 @@ -90,7 +90,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl,v diff -u -N -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl 18 Jul 2005 18:01:01 -0000 1.5.2.1 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-rb.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.2 @@ -83,7 +83,7 @@ db_dml update_item {} } } - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } @@ -170,7 +170,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.tcl,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.tcl 7 Apr 2005 22:38:57 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sa.tcl 20 Jul 2005 16:25:57 -0000 1.3.2.1 @@ -90,7 +90,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id }]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl,v diff -u -N -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl 18 Jul 2005 18:01:01 -0000 1.5.2.1 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-sb.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.2 @@ -84,7 +84,7 @@ db_dml update_item {} } } - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } @@ -167,7 +167,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl 7 Apr 2005 22:41:26 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-ta.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.1 @@ -92,7 +92,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl,v diff -u -N -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl 4 Jul 2005 20:53:44 -0000 1.5.2.1 +++ openacs-4/packages/assessment/www/asm-admin/item-add-display-tb.tcl 20 Jul 2005 16:25:57 -0000 1.5.2.2 @@ -90,7 +90,7 @@ } } -after_submit { # now go to assessment-page - ad_returnredirect [export_vars -base one-a {assessment_id}] + ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id ad_script_abort } Index: openacs-4/packages/assessment/www/asm-admin/item-swap-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-swap-postgresql.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-swap-postgresql.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/item-swap-postgresql.xql 20 Jul 2005 16:25:57 -0000 1.1.2.1 @@ -2,6 +2,8 @@ postgresql7.1 + + update as_item_section_map Index: openacs-4/packages/assessment/www/asm-admin/item-swap.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-swap.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-swap.tcl 2 Feb 2005 21:31:15 -0000 1.2 +++ openacs-4/packages/assessment/www/asm-admin/item-swap.tcl 20 Jul 2005 16:25:57 -0000 1.2.2.1 @@ -19,7 +19,7 @@ set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege create permission::require_permission -object_id $assessment_id -privilege admin - +db_1row get_item_id {} if { $direction=="up" } { set next_sort_order [expr { $sort_order - 1 }] } else { @@ -36,4 +36,4 @@ ad_script_abort } -ad_returnredirect [export_vars -base one-a {assessment_id}] +ad_returnredirect [export_vars -base one-a {assessment_id}]\#$as_item_id Index: openacs-4/packages/assessment/www/asm-admin/item-swap.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-swap.xql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-swap.xql 1 Feb 2005 22:00:10 -0000 1.1 +++ openacs-4/packages/assessment/www/asm-admin/item-swap.xql 20 Jul 2005 16:25:57 -0000 1.1.2.1 @@ -12,4 +12,10 @@ + + + select as_item_id from as_item_section_map where sort_order=:sort_order and section_id=:section_id + + +