TODO A (.5h): form element to set timeouts. Radio buttons to pick "No time limit/Use time limit". Input field for "Trigger after" x, where x>0, and x is translated by PG's interval conversion stuff, so you can say '1 day'. +
TODO A (.5h): Lars form element to set timeouts. Radio buttons to pick "No time limit/Use time limit". Input field for "Trigger after" x, where x>0, and x is translated by PG's interval conversion stuff, so you can say '1 day'.
-TODO A (.5h): Allow multiple recipients (replace recipient dropdown with checkbox
+TODO A (.5h): Lars Allow multiple recipients (replace recipient dropdown with checkbox
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.adp,v diff -u -r1.11 -r1.12 --- openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp 20 Jan 2004 15:34:01 -0000 1.11 +++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp 22 Jan 2004 14:08:39 -0000 1.12 @@ -10,5 +10,3 @@ Template Description: @description;noquote@ -TODO (0.5h): show only characters on the map or in the yellow pages - Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl 14 Jan 2004 15:10:54 -0000 1.14 +++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl 22 Jan 2004 14:08:39 -0000 1.15 @@ -25,7 +25,14 @@ } } -set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character] +# Only show characters in the yellow pages +set character_options [db_list_of_lists character_options { + select sc.title, + sc.item_id + from sim_charactersx sc + where sc.in_directory_p = 't' + order by sc.title +}] # Loop over all workflow roles and add a character select widget for each foreach role_id [workflow::get_roles -workflow_id $workflow_id] { Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-participants.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl 14 Jan 2004 15:10:54 -0000 1.8 +++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl 22 Jan 2004 14:08:39 -0000 1.9 @@ -13,7 +13,11 @@ set permission_group_name [simulation::permission_group_name] set subsite_group_id [application_group::group_id_from_package_id \ - -package_id [ad_conn subsite_id]] + -package_id [site_node::closest_ancestor_package \ + -node_id [ad_conn node_id] \ + -package_key "acs-subsite" \ + -include_self \ + -element "package_id"]] ad_form -name simulation -form { {workflow_id:integer(hidden) {value $workflow_id}} Index: openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql 22 Jan 2004 12:49:45 -0000 1.19 +++ openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql 22 Jan 2004 14:08:39 -0000 1.20 @@ -46,8 +46,8 @@ 'sim_location', -- content_type 'in_directory_p', -- attribute_name 'boolean', -- datatype - 'Show in directory', -- pretty_name - 'Show in directory', -- pretty_plural + 'Show in yellow pages', -- pretty_name + 'Show in yellow pages', -- pretty_plural 2, -- sort_order 'f', -- default_value 'boolean' -- column_spec @@ -153,8 +153,8 @@ 'sim_character', -- content_type 'in_directory_p', -- attribute_name 'boolean', -- datatype - 'Show in directory', -- pretty_name - 'Show in directory', -- pretty_plural + 'Show in yellow pages', -- pretty_name + 'Show in yellow pages', -- pretty_plural 1, -- sort_order 'f', -- default_value 'boolean' -- column_spec Index: openacs-4/packages/simulation/test/simulation-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/test/simulation-test-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/simulation/test/simulation-test-procs.tcl 22 Jan 2004 08:53:03 -0000 1.12 +++ openacs-4/packages/simulation/test/simulation-test-procs.tcl 22 Jan 2004 14:08:39 -0000 1.13 @@ -508,6 +508,12 @@ form find ~n object field find ~n title field fill $title + + catch { + field find ~n in_directory_p + field select2 ~v t + } + form submit } Index: openacs-4/packages/simulation/www/simbuild/task-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.adp,v diff -u -r1.13 -r1.14 --- openacs-4/packages/simulation/www/simbuild/task-edit.adp 12 Jan 2004 12:14:05 -0000 1.13 +++ openacs-4/packages/simulation/www/simbuild/task-edit.adp 22 Jan 2004 14:08:39 -0000 1.14 @@ -5,8 +5,8 @@TODO A (.5h): form element to set timeouts. Radio buttons to pick "No time limit/Use time limit". Input field for "Trigger after" x, where x>0, and x is translated by PG's interval conversion stuff, so you can say '1 day'. +
TODO A (.5h): Lars form element to set timeouts. Radio buttons to pick "No time limit/Use time limit". Input field for "Trigger after" x, where x>0, and x is translated by PG's interval conversion stuff, so you can say '1 day'.
-TODO A (.5h): Allow multiple recipients (replace recipient dropdown with checkbox
+TODO A (.5h): Lars Allow multiple recipients (replace recipient dropdown with checkbox
Index: openacs-4/packages/simulation/www/siminst/map-characters.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/simulation/www/siminst/map-characters.adp 20 Jan 2004 15:34:01 -0000 1.11 +++ openacs-4/packages/simulation/www/siminst/map-characters.adp 22 Jan 2004 14:08:39 -0000 1.12 @@ -10,5 +10,3 @@ Template Description: @description;noquote@ -TODO (0.5h): show only characters on the map or in the yellow pages - Index: openacs-4/packages/simulation/www/siminst/map-characters.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/simulation/www/siminst/map-characters.tcl 14 Jan 2004 15:10:54 -0000 1.14 +++ openacs-4/packages/simulation/www/siminst/map-characters.tcl 22 Jan 2004 14:08:39 -0000 1.15 @@ -25,7 +25,14 @@ } } -set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character] +# Only show characters in the yellow pages +set character_options [db_list_of_lists character_options { + select sc.title, + sc.item_id + from sim_charactersx sc + where sc.in_directory_p = 't' + order by sc.title +}] # Loop over all workflow roles and add a character select widget for each foreach role_id [workflow::get_roles -workflow_id $workflow_id] { Index: openacs-4/packages/simulation/www/siminst/simulation-participants.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/simulation/www/siminst/simulation-participants.tcl 14 Jan 2004 15:10:54 -0000 1.8 +++ openacs-4/packages/simulation/www/siminst/simulation-participants.tcl 22 Jan 2004 14:08:39 -0000 1.9 @@ -13,7 +13,11 @@ set permission_group_name [simulation::permission_group_name] set subsite_group_id [application_group::group_id_from_package_id \ - -package_id [ad_conn subsite_id]] + -package_id [site_node::closest_ancestor_package \ + -node_id [ad_conn node_id] \ + -package_key "acs-subsite" \ + -include_self \ + -element "package_id"]] ad_form -name simulation -form { {workflow_id:integer(hidden) {value $workflow_id}}