Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,16 @@ + + + + oracle8.1.6 + + + + + begin + :1 := evaluation.delete_evaluation_task_group (:evaluation_group_id); + end; + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 22 Dec 2004 22:06:41 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl 5 Apr 2005 17:19:09 -0000 1.6 @@ -10,6 +10,7 @@ evaluation_group_id:integer task_id:integer operation + return_url } if { [string eq $operation "[_ evaluation.lt_Yes_I_really_want_to__2]"] } { @@ -22,10 +23,11 @@ ad_return_error "[_ evaluation.lt_Error_deleting_the_ev]" "[_ evaluation.lt_We_got_the_following_]" ad_script_abort } +} else { + # it is a "don't do anything" request + ad_returnredirect $return_url } db_release_unused_handles -# redirect to the index page by default - ad_returnredirect "one-task?[export_vars -url { task_id }]" Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,14 @@ + + + + oracle8.1.6 + + + + + select acs_group.name(:evaluation_group_id) as group_name from dual + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 22 Dec 2004 22:06:41 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/groups/group-delete.tcl 5 Apr 2005 17:19:09 -0000 1.6 @@ -9,13 +9,15 @@ } { evaluation_group_id:integer task_id:integer + return_url:optional } set page_title "[_ evaluation.Delete_Evaluation_]" set context [list [list "[export_vars -base one-task { task_id }]" "[_ evaluation.Task_Groups_]"] [list "[export_vars -base one-group { task_id evaluation_group_id }]" "[_ evaluation.One_Group_]"] "[_ evaluation.Delete_Group_]"] db_1row get_group_info { *SQL* } -set export_vars [export_vars -form { evaluation_group_id task_id }] +ns_log notice "si.. es $return_url \n" +set export_vars [export_vars -form { evaluation_group_id task_id return_url }] Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,20 @@ + + + + oracle8.1.6 + + + + begin + :1 := evaluation.evaluation_group_member_add ( + p_evaluation_group_id => :evaluation_group_id, + p_user_id => :student_id, + p_package_id => :package_id, + p_creation_user_id => :creation_user_id, + p_creation_ip => :creation_ip + ); + end; + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-new-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-2-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-new-2-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,32 @@ + + + + oracle8.1.6 + + + + begin + :1 := acs_rel.new ( + rel_id => null, + rel_type => 'evaluation_task_group_rel', + object_id_one => :evaluation_group_id, + object_id_two => $student_ids($student_id), + context_id => :package_id, + creation_user => :creation_user_id, + creation_ip => :creation_ip + ); + end; + + + + + + + select task_item_id + from evaluation_tasks + where task_id = :task_id + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-new-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-new-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,17 @@ + + + + oracle8.1.6 + + + + select count(group_id)+1 + from evaluation_task_groups etg, evaluation_tasks et + where et.task_id = :task_id + and etg.task_item_id = et.task_item_id + and content_revision.is_live(et.task_id) = 't' + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-new-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-new-postgresql.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,17 @@ + + + + postgresql7.3 + + + + select count(group_id)+1 + from evaluation_task_groups etg, evaluation_tasks et + where et.task_id = :task_id + and etg.task_item_id = et.task_item_id + and content_revision__is_live(et.task_id) = true + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-remove-member-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-remove-member-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-remove-member-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,36 @@ + + + + oracle8.1.6 + + + + + begin + acs_rel.del (:rel_id); + end; + + + + + + + + select count(*) from acs_rels where object_id_one = :evaluation_group_id + + + + + + + + begin + :1 := evaluation.delete_evaluation_task_group ( + :evaluation_group_id + ); + end; + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-oracle.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,24 @@ + + + + oracle8.1.6 + + + + + begin + :1 := acs_rel.new ( + null, + 'evaluation_task_group_rel', + :new_evaluation_group_id, + :new_member_id, + :package_id, + :creation_user_id, + :creation_ip + ); + end; + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql 10 Sep 2004 19:16:32 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2-postgresql.xql 5 Apr 2005 17:19:09 -0000 1.5 @@ -3,42 +3,6 @@ postgresql7.3 - - - - select count(*) - from evaluation_task_groups etg, evaluation_tasks et, acs_rels map - where etg.task_item_id = et.task_item_id - and map.rel_type = 'evaluation_task_group_rel' - and map.object_id_one = etg.group_id - and et.task_id = :task_id - - - - - - - - select etg.group_id as from_evaluation_group_id, - g.group_name - from evaluation_task_groups etg, groups g, evaluation_tasks et - where etg.task_item_id = et.task_item_id - and et.task_id = :from_task_id - and etg.group_id = g.group_id - - - - - - - - select task_item_id - from evaluation_tasks - where task_id = :task_id - - - - @@ -55,14 +19,4 @@ - - - - select map.object_id_two as new_member_id - from acs_rels map - where map.object_id_one = :from_evaluation_group_id - - - - Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,52 @@ + + + + + + + + + select count(*) + from evaluation_task_groups etg, evaluation_tasks et, acs_rels map + where etg.task_item_id = et.task_item_id + and map.rel_type = 'evaluation_task_group_rel' + and map.object_id_one = etg.group_id + and et.task_id = :task_id + + + + + + + + select etg.group_id as from_evaluation_group_id, + g.group_name + from evaluation_task_groups etg, groups g, evaluation_tasks et + where etg.task_item_id = et.task_item_id + and et.task_id = :from_task_id + and etg.group_id = g.group_id + + + + + + + + select task_item_id + from evaluation_tasks + where task_id = :task_id + + + + + + + + select map.object_id_two as new_member_id + from acs_rels map + where map.object_id_one = :from_evaluation_group_id + + + + + Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/evaluation/www/admin/groups/group-reuse-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.xql 5 Apr 2005 17:19:09 -0000 1.1 @@ -0,0 +1,24 @@ + + + + + + + + select et.task_name, et.number_of_members, + et.task_id as from_task_id, + eg.grade_plural_name + from evaluation_tasks et, evaluation_grades eg, acs_objects ao, cr_items cri1, cr_items cri2 + where et.number_of_members > 1 + and et.grade_item_id = eg.grade_item_id + and cri1.live_revision = eg.grade_id + and cri2.live_revision = et.task_id + and ao.object_id = eg.grade_item_id + and ao.context_id = :package_id + and et.task_id <> :task_id + $orderby + + + + + Index: openacs-4/packages/evaluation/www/admin/groups/one-group.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 22 Dec 2004 22:06:41 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/groups/one-group.tcl 5 Apr 2005 17:19:09 -0000 1.8 @@ -22,8 +22,9 @@ append page_title ": $group_name" } +set return_url "[ad_conn url]?[export_vars -url { evaluation_group_id task_id }]" -set actions [list "[_ evaluation.Delete_Group_]" [export_vars -base "group-delete" { evaluation_group_id task_id }] {}] +set actions [list "[_ evaluation.Delete_Group_]" [export_vars -base "group-delete" { evaluation_group_id task_id return_url }] {}] set elements [list student_name \ [list label "[_ evaluation.Student_Name_]" \ @@ -39,7 +40,7 @@ -name one_group \ -multirow one_group \ -key group_id \ - -pass_properties { return_url evaluation_group_id } \ + -pass_properties { evaluation_group_id } \ -filters { task_id {} evaluation_group_id {} } \ -actions $actions \ -elements $elements