Index: openacs-4/packages/simulation/simulation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/simulation.info,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/simulation/simulation.info 30 Nov 2004 21:30:31 -0000 1.17 +++ openacs-4/packages/simulation/simulation.info 31 Oct 2006 10:13:01 -0000 1.17.2.1 @@ -8,7 +8,7 @@ f simulation - + Collaboraid ApS O'Design Workflow-based task simulator. Build scenario @@ -17,9 +17,9 @@ of students into cases, cast the students into roles, and monitor progress. Developed as a legal education tool for www.rechtenonline.nl. - 2004-11-30 + 2005-12-01 - + Index: openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml 30 Nov 2004 21:30:38 -0000 1.5 +++ openacs-4/packages/simulation/catalog/simulation.en_US.ISO-8859-1.xml 31 Oct 2006 10:13:02 -0000 1.5.2.1 @@ -1,5 +1,5 @@ - + Abort the session Add a template @@ -18,6 +18,7 @@ Messages for %role_array.pretty_name% in %case_array.label% Case History Case home + Cases CityBuild CityBuild Help Clear filter @@ -100,6 +101,7 @@ Cannot enroll in simulation Cannot enroll in simulation "%simulation.pretty_name%" Case "%case.label%" has been deleted. + Cases in which you are participating Choose new roles for user %user.name% Choose new users for role %role.pretty_name% Create new simulation templates or edit existing ones. @@ -151,6 +153,7 @@ Return to SimBuild Home Return to Simulation root Return to Simulation Home + Return to Simulation home Return to template list page Right-click document name and select "Save as" (or equiv.) to download a document to your computer. Roles with actions only @@ -173,6 +176,7 @@ Simulations in Casting Simulations in Development Some of the tasks of this simulation require attachments. However, there are no CityBuild props to select from. + Someone was probably faster than you and brought this session to a new state while you were reading the previous page. Start a simulation with this template Stop notifying me of changes to map XML Subscribe to %pretty_name% @@ -183,7 +187,9 @@ and %simulation.enroll_end% and you cannot enroll at this time. Contact your administrator if you believe this is an error. Thank you! The following errors were encountered: + The item you requested could not be found. The mime type of your file was not recognised. + The task you were trying to perform is not valid in this state. The template "%simulation.pretty_name%" is not ready for casting. There are no cases in this simulation yet There are no documents. @@ -256,6 +262,7 @@ No, cancel No documents No messages. + Not found Notifications Notifications for Number @@ -300,6 +307,7 @@ Simulation %simulation.pretty_name% has now started. Please visit %simplay_url% to participate. Thank you! Simulation %simulation.pretty_name% has started Simulation Templates + Sorry! States Status Sub-States Index: openacs-4/packages/simulation/lib/cases-admin.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/cases-admin.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/simulation/lib/cases-admin.tcl 30 Nov 2004 21:30:38 -0000 1.8 +++ openacs-4/packages/simulation/lib/cases-admin.tcl 31 Oct 2006 10:13:02 -0000 1.8.2.1 @@ -44,6 +44,8 @@ -orderby_name case_admin_order \ -elements $elements + + db_multirow cases select_cases " select wc.case_id, sc.label, @@ -63,6 +65,8 @@ where wc.workflow_id = w.workflow_id and sc.sim_case_id = wc.object_id and w.workflow_id = ao.object_id - and ao.creation_user = :user_id + [ad_decode [permission::permission_p -party_id $user_id \ + -object_id $package_id -privilege sim_admin] \ + 1 "" "and ao.creation_user = :user_id"] [template::list::orderby_clause -orderby -name "cases"] " Index: openacs-4/packages/simulation/lib/object-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/object-display.adp,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/simulation/lib/object-display.adp 30 Nov 2004 21:09:00 -0000 1.9 +++ openacs-4/packages/simulation/lib/object-display.adp 31 Oct 2006 10:13:02 -0000 1.9.2.1 @@ -6,6 +6,12 @@ @page_title;noquote@ @context;noquote@ + + + + + + @content_html;noquote@ @@ -18,9 +24,11 @@ +

#simulation.Send_a_message_to# @page_title@

+ \ No newline at end of file Index: openacs-4/packages/simulation/lib/object-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/object-display.tcl,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/simulation/lib/object-display.tcl 30 Nov 2004 21:30:38 -0000 1.16 +++ openacs-4/packages/simulation/lib/object-display.tcl 31 Oct 2006 10:13:02 -0000 1.16.2.1 @@ -24,6 +24,20 @@ set simplay 0 } +if { $simplay } { + if { [exists_and_not_null case_id] } { + set num_enabled_actions [db_string select_num_enabled_actions { + select count(*) + from workflow_case_enabled_actions + where case_id = :case_id + }] + set complete_p [expr $num_enabled_actions == 0] + } else { + set complete_p 0 + } +} + + # This little exercise removes the object/ part from the extra_url # Let's just use path_info # set extra_url [eval file join [lrange [file split [ad_conn extra_url]] 1 end]] @@ -40,16 +54,14 @@ array set item [bcms::revision::get_revision -revision_id $revision_id] } +if {[catch { item::get_content \ -revision_id $item(revision_id) \ -array content +}]} { + ns_returnnotfound +} -#file delete /web/lars/www/picture.jpg - -#error [publish::handle::image 580 -html {} -revision_id 581] - -#error [publish::render_subitem 586 relation image 1 f {refresh 1}] - if { [info exists content(text)] } { switch $content(mime_type) { text/enhanced - text/plain - text/fixed-width - text/html { Index: openacs-4/packages/simulation/lib/sim-templates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-templates.tcl,v diff -u -r1.20 -r1.20.2.1 --- openacs-4/packages/simulation/lib/sim-templates.tcl 30 Nov 2004 21:30:38 -0000 1.20 +++ openacs-4/packages/simulation/lib/sim-templates.tcl 31 Oct 2006 10:13:02 -0000 1.20.2.1 @@ -113,10 +113,6 @@ # a list of templates # ###################################################################### -set filter_clause "" -if { !$package_admin_p } { - set filter_clause "and a.creation_user = :user_id" -} db_multirow -extend { edit_url view_url delete_url clone_url edit_p } sim_templates select_sim_templates " select w.workflow_id, @@ -140,7 +136,6 @@ and ss.simulation_id = w.workflow_id and w.object_id = :package_id and ss.sim_type in ('dev_template','ready_template') - $filter_clause [template::list::orderby_clause -orderby -name sim_templates] " { set description [ad_html_text_convert -from $description_mime_type -maxlen 200 -- $description] Index: openacs-4/packages/simulation/lib/yellow-pages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/yellow-pages.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/simulation/lib/yellow-pages.tcl 30 Nov 2004 21:30:38 -0000 1.8 +++ openacs-4/packages/simulation/lib/yellow-pages.tcl 31 Oct 2006 10:13:02 -0000 1.8.2.1 @@ -68,7 +68,7 @@ } title { label "[_ simulation.Name]" - orderby title + orderby uptitle link_url_col view_url } description { @@ -102,11 +102,14 @@ set where_clause(characters) [simulation::object::search_clause $search_columns(characters) $search_terms] } +set ordering [template::list::orderby_clause -orderby -name "objects"] + db_multirow -extend {view_url} objects select_objects " select sl.object_id, sl.object_type, ot.pretty_name as object_type_pretty, sl.title as title, + upper(sl.title) as uptitle, sl.mime_type, sl.name, sl.item_id, @@ -125,6 +128,7 @@ sc.object_type, ot.pretty_name as object_type_pretty, sc.title as title, + upper(sc.title) as uptitle, sc.mime_type, sc.name, sc.item_id, @@ -139,7 +143,7 @@ and sc.revision_id = cr.revision_id [ad_decode $where_clause(characters) "" "" "and $where_clause(characters)"] - [template::list::orderby_clause -orderby -name "objects"] + [ad_decode $ordering "" "order by uptitle" $ordering] " { set description [string_truncate -len 200 $description] switch -glob $mime_type { Index: openacs-4/packages/simulation/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/apm-callback-procs.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/simulation/tcl/apm-callback-procs.tcl 30 Nov 2004 21:30:39 -0000 1.17 +++ openacs-4/packages/simulation/tcl/apm-callback-procs.tcl 31 Oct 2006 10:13:02 -0000 1.17.2.1 @@ -83,7 +83,7 @@ # Create the permission groups foreach {group_name privilege_list} { "Sim Admins" {sim_admin} - "Template Authors" {sim_template_creator sim_inst sim_object_create} + "Template Authors" {sim_template_creator sim_inst sim_object_create sim_adminplayer} "Case Authors" {sim_inst sim_object_create sim_adminplayer} "City Admins" {sim_set_map_p sim_object_writer} "Actors" {} Index: openacs-4/packages/simulation/tcl/sim-action-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/sim-action-procs.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/simulation/tcl/sim-action-procs.tcl 30 Nov 2004 21:30:39 -0000 1.10 +++ openacs-4/packages/simulation/tcl/sim-action-procs.tcl 31 Oct 2006 10:13:02 -0000 1.10.2.1 @@ -293,17 +293,6 @@ } array set row [workflow::action::fsm::generate_spec -action_id $action_id -handlers $handlers] - ############ - # DEBUGGING - if { [exists_and_not_null row(parent_action_id)] } { - ns_log notice "simulation::action::generate_spec: row(parent_action_id) is $row(parent_action_id)" - } else { - ns_log notice "simulation::action::generate_spec: no paren_action_id in sight :(" - } - # STOP DEBUGGING - ############### - - # Get local spec, remove unwanted entries get -action_id $action_id -array local_row -local_only array unset local_row recipients Index: openacs-4/packages/simulation/tcl/sim-case-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/sim-case-procs.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/simulation/tcl/sim-case-procs.tcl 30 Nov 2004 21:30:39 -0000 1.8 +++ openacs-4/packages/simulation/tcl/sim-case-procs.tcl 31 Oct 2006 10:13:02 -0000 1.8.2.1 @@ -80,7 +80,8 @@ set case_id [workflow::case::new \ -workflow_id $workflow_id \ -object_id $sim_case_id \ - -user_id $creation_user] + -user_id $creation_user \ + -no_notification] return $sim_case_id } Index: openacs-4/packages/simulation/tcl/template-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/template-procs.tcl,v diff -u -r1.71 -r1.71.2.1 --- openacs-4/packages/simulation/tcl/template-procs.tcl 30 Nov 2004 21:30:39 -0000 1.71 +++ openacs-4/packages/simulation/tcl/template-procs.tcl 31 Oct 2006 10:13:02 -0000 1.71.2.1 @@ -920,6 +920,50 @@ -users_not_in_groups_var users_to_cast_not_in_groups \ -full_groups_array full_group_members \ -multiple_case_groups $multiple_case_groups + + # Send the notifications here manually, because + # otherwise notifications are not sent to right people + # since casting is incomplete before the above command + # has run. + + db_transaction { + + set action_id [simulation::template::get_element \ + -workflow_id $workflow_id \ + -element initial_action_id] + + + set comment "" + set comment_mime_type "text/plain" + set entry_id [db_string get_entry_id { + select max(entry_id) + from workflow_case_log + where case_id = :case_id + } \ + -default ""] + + if {[empty_string_p $entry_id]} { + + # Insert activity log info if not found + set extra_vars [ns_set create] + oacs_util::vars_to_ns_set \ + -ns_set $extra_vars \ + -var_list { entry_id case_id action_id comment comment_mime_type } + + set entry_id [package_instantiate_object \ + -creation_user "" \ + -extra_vars $extra_vars \ + -package_name "workflow_case_log_entry" \ + "workflow_case_log_entry"] + } + + workflow::case::action::notify \ + -case_id $case_id \ + -action_id $action_id \ + -entry_id $entry_id \ + -comment $comment \ + -comment_mime_type $comment_mime_type + } } } Index: openacs-4/packages/simulation/tcl/ui-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/ui-procs.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/simulation/tcl/ui-procs.tcl 30 Nov 2004 21:30:39 -0000 1.7 +++ openacs-4/packages/simulation/tcl/ui-procs.tcl 31 Oct 2006 10:13:02 -0000 1.7.2.1 @@ -17,6 +17,10 @@ } { return { {item_id:key} + {description:richtext,optional + {label {[_ simulation.Description]}} + {mode display} + } {document_file:file(file) {label "Document file"} } @@ -157,14 +161,10 @@ set mime_type [template::util::file::get_property mime_type $document_file] } - ns_log notice "check_mime(1): mime_type is <$mime_type>" - if { ![exists_and_not_null mime_type] } { set mime_type [cr_filename_to_mime_type -create $upload_filename] } - ns_log notice "check_mime(2): mime_type is <$mime_type>" - set mime_count [db_string get_mime { select count(*) from cr_mime_types where mime_type = :mime_type}] @@ -189,7 +189,7 @@ set extension [string tolower [string trimleft [file extension $upload_filename] "."]] set orig_mime_type [template::util::file::get_property mime_type $document_file] - ns_log notice "add_mime: mime_type is <$orig_mime_type>" - - cr_create_mime_type -extension $extension -mime_type $orig_mime_type + # Use empty description because otherwise cr_create_mime_type bombs + cr_create_mime_type -extension $extension -mime_type $orig_mime_type \ + -description "" } \ No newline at end of file Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/404.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/404.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/simulation/www/control-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/control-bar.tcl,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/simulation/www/control-bar.tcl 30 Nov 2004 21:30:39 -0000 1.2 +++ openacs-4/packages/simulation/www/control-bar.tcl 31 Oct 2006 10:13:03 -0000 1.2.2.1 @@ -20,6 +20,4 @@ set simbuild_p [permission::permission_p -object_id $package_id -privilege sim_template_read] set siminst_p [permission::permission_p -object_id $package_id -privilege sim_inst] -set curr_url [ad_conn url] -ns_log notice curr_url is $curr_url -ns_log notice package_url is $package_url +set curr_url [ad_conn url] \ No newline at end of file Index: openacs-4/packages/simulation/www/dynamic-map.swf =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/dynamic-map.swf,v diff -u -r1.1 -r1.1.4.1 Binary files differ Index: openacs-4/packages/simulation/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.tcl,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/simulation/www/index.tcl 30 Nov 2004 21:30:39 -0000 1.17 +++ openacs-4/packages/simulation/www/index.tcl 31 Oct 2006 10:13:03 -0000 1.17.2.1 @@ -9,3 +9,4 @@ set page_title "[_ simulation.Simulation_Home]" set context "" +set package_id [ad_conn package_id] \ No newline at end of file Index: openacs-4/packages/simulation/www/map.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/map.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/simulation/www/map.adp 30 Nov 2004 21:09:03 -0000 1.2 +++ openacs-4/packages/simulation/www/map.adp 31 Oct 2006 10:13:03 -0000 1.2.2.1 @@ -5,11 +5,11 @@ id="map" ALIGN="" alt="Flash map of the city"> - + - Index: openacs-4/packages/simulation/www/map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/map.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/simulation/www/map.tcl 30 Nov 2004 21:09:03 -0000 1.1 +++ openacs-4/packages/simulation/www/map.tcl 31 Oct 2006 10:13:03 -0000 1.1.4.1 @@ -1 +1,2 @@ -set url [site_node_closest_ancestor_package_url -package_key simulation] \ No newline at end of file +set root_url [site_node_closest_ancestor_package_url -package_key simulation] +set url [export_vars -base "${root_url}static-map.swf" { root_url }] \ No newline at end of file Index: openacs-4/packages/simulation/www/normal-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/normal-master.adp,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/simulation/www/normal-master.adp 30 Nov 2004 21:09:03 -0000 1.1 +++ openacs-4/packages/simulation/www/normal-master.adp 31 Oct 2006 10:13:03 -0000 1.1.4.1 @@ -1,7 +1,12 @@ @title;noquote@ @context;noquote@ + +@header_stuff;noquote@ +@extra_css;noquote@ + +
Index: openacs-4/packages/simulation/www/normal-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/normal-master.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/simulation/www/normal-master.tcl 30 Nov 2004 21:09:03 -0000 1.1 +++ openacs-4/packages/simulation/www/normal-master.tcl 31 Oct 2006 10:13:03 -0000 1.1.4.1 @@ -1 +1,7 @@ +if { [template::util::is_nil header_stuff] } { + set header_stuff "" +} +if { [template::util::is_nil extra_css] } { + set extra_css "" +} + Index: openacs-4/packages/simulation/www/simulation-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simulation-master.adp,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/simulation/www/simulation-master.adp 30 Nov 2004 21:09:03 -0000 1.11 +++ openacs-4/packages/simulation/www/simulation-master.adp 31 Oct 2006 10:13:03 -0000 1.11.2.1 @@ -9,5 +9,5 @@ @header_stuff;noquote@ - + \ No newline at end of file Index: openacs-4/packages/simulation/www/static-map.swf =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/static-map.swf,v diff -u -r1.1 -r1.1.4.1 Binary files differ Index: openacs-4/packages/simulation/www/citybuild/map.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/map.xml,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/simulation/www/citybuild/map.xml 30 Nov 2004 21:09:03 -0000 1.1 +++ openacs-4/packages/simulation/www/citybuild/map.xml 31 Oct 2006 10:13:03 -0000 1.1.4.1 @@ -3,610 +3,729 @@ sd001 Achterhaven - http://rocs.uvt.nl/simulation/object/sd-001 - images/th_sd001.jpg + object/sd-001 + object-content/th_sd001.jpg De Achterhaven is een van de drie oude havens van Sieberdam. sd002 Antex uitzendbureau - http://rocs.uvt.nl/simulation/object/sd-002 - images/th_sd002.jpg + object/sd-002 + object-content/th_sd002.jpg Antex heeft zich in de loop der tijd gespecialiseerd in dienstverlenende beroepen. sd003 Apotheek Sieberdam - http://rocs.uvt.nl/simulation/object/sd-003 - images/th_sd003.jpg + object/sd-003 + object-content/th_sd003.jpg De oude apotheek van Sieberdam is in 1932 geheel uitgebrand. Sindsdien is zij in Middelberg gevestigd. sd004 Artsenpraktijk NGF - http://rocs.uvt.nl/simulation/object/sd-004 - images/th_sd004.jpg + object/sd-004 + object-content/th_sd004.jpg Artsenpraktijk NGF is een recente samenvoeging van enkele bestaande huisartsenpraktijken. sd005 Bakker Bas - http://rocs.uvt.nl/simulation/object/sd-005 - images/th_sd005.jpg + object/sd-005 + object-content/th_sd005.jpg Al sinds de middeleeuwen zit de bakkerij in de oude stad. Er wordt nog elke nacht brood gebakken. sd006 Basisschool Amalia - http://rocs.uvt.nl/simulation/object/sd-006 - images/th_sd006.jpg + object/sd-006 + object-content/th_sd006.jpg De basisschool Amalia opende in 1978 haar deuren. De laatste jaren is er steevast een wachtlijst. sd007 Bastion Hotel - http://rocs.uvt.nl/simulation/object/sd-007 - images/th_sd007.jpg + object/sd-007 + object-content/th_sd007.jpg Bastion Hotel Sieberdam is onderdeel van de gelijknamige keten. Open sinds 1998. sd008 Begraafplaats Sieberhof - http://rocs.uvt.nl/simulation/object/sd-008 - images/th_sd008.jpg + object/sd-008 + object-content/th_sd008.jpg Begraafplaats Middelberg is gelegen op de plek waar reeds in de Romeinse tijd begraven werd. sd009 Bibliotheek Sieberdam - http://rocs.uvt.nl/simulation/object/sd-009 - images/th_sd009.jpg + object/sd-009 + object-content/th_sd009.jpg De bibliotheek van Sieberdam heeft een duidelijke streekfunctie. Multimedia zijn er sterk in opkomst. sd010 Brandweer - http://rocs.uvt.nl/simulation/object/sd-010 - images/th_sd010.jpg + object/sd-010 + object-content/th_sd010.jpg De brandweer prijst zich gelukkig met nieuw materiaal en enthousiaste vrijwilligers. Ingesteld in 1867! sd011 Buikstra cargadoorsbedrijf - http://rocs.uvt.nl/simulation/object/sd-011 - images/th_sd011.jpg + object/sd-011 + object-content/th_sd011.jpg Cargadoorsbedrijf Buikstra is onderdeel van Sieberdam als Regionaal Overslag Centrum. sd012 Buitenhaven - http://rocs.uvt.nl/simulation/object/sd-012 - images/th_sd012.jpg + object/sd-012 + object-content/th_sd012.jpg De Buitenhaven is een van de drie nieuwe havens, tot stand gekomen nadat de bruggen gebouwd waren. sd013 Cafe Beukers - http://rocs.uvt.nl/simulation/object/sd-013 - images/th_sd013.jpg + object/sd-013 + object-content/th_sd013.jpg Cafe Beukers is vanouds de verzamelplaats van de Sieberdamse kunst-scene en vrije beroepers. sd014 Cafe Locus - http://rocs.uvt.nl/simulation/object/sd-014 - images/th_sd014.jpg + object/sd-014 + object-content/th_sd014.jpg Cafe Locus is bekend om zijn volks karakter, dat versterkt wordt door de ''volkse"" (zang)activiteiten. sd015 Cafe-restaurant 't Oude Raedthuys - http://rocs.uvt.nl/simulation/object/sd-015 - images/th_sd015.jpg + object/sd-015 + object-content/th_sd015.jpg t Oude Raedhuys is trots op haar oorsprong als middeleeuwse herberg, welke uitstraling het koestert. sd016 Cash & co gerechtsdeurwaarder - http://rocs.uvt.nl/simulation/object/sd-016 - images/th_sd016.jpg + object/sd-016 + object-content/th_sd016.jpg Onze klanten staan centraal. Ons motto: maximaal resultaat tegen een redelijke prijs. sd017 Catharina College - http://rocs.uvt.nl/simulation/object/sd-017 - images/th_sd017.jpg + object/sd-017 + object-content/th_sd017.jpg Het Catharina College is de middelbare scholengemeenschap van Sieberdam. sd018 Copyshop NORP - http://rocs.uvt.nl/simulation/object/sd-018 - images/th_sd018.jpg + object/sd-018 + object-content/th_sd018.jpg Copyshop NORP staat voor NoRePro. Daarmee slaan we de creatieve spijker van ons vak op de kop. sd019 De oude fabriek - http://rocs.uvt.nl/simulation/object/sd-019 - images/th_sd019.jpg + object/sd-019 + object-content/th_sd019.jpg De locatie van deze voormalige textielfabriek wordt de laatste jaren herontwikkeld sd020 De Stalhof factory outlet - http://rocs.uvt.nl/simulation/object/sd-020 - images/th_sd020.jpg + object/sd-020 + object-content/th_sd020.jpg Voor een brede range aan originele producten bent u hier tientallen procenten goedkoper uit. sd021 De Vries makelaardij - http://rocs.uvt.nl/simulation/object/sd-021 - images/th_sd021.jpg + object/sd-021 + object-content/th_sd021.jpg De Vries Makelaardij is een veelzijdig makelaarskantoor. U bent welkom in een van de vier kantoren. sd022 De Waag - http://rocs.uvt.nl/simulation/object/sd-022 - images/th_sd022.jpg + object/sd-022 + object-content/th_sd022.jpg Volgens de overlevering is De Waag opgericht door Schotse kooplui in de 16e eeuw. sd023 Discotheek Breakout - http://rocs.uvt.nl/simulation/object/sd-023 - images/th_sd023.jpg + object/sd-023 + object-content/th_sd023.jpg Breakout is iedere zaterdagavond geopend en ook voor speciale evenementen. Kijk op onze E-pages. sd024 DMM inspectiediensten - http://rocs.uvt.nl/simulation/object/sd-024 - images/th_sd024.jpg + object/sd-024 + object-content/th_sd024.jpg Al meer dan 65 jaar is DMM actief met inspectiemethoden en andere gespecialiseerde diensten. sd025 ENSIE energiebedrijf - http://rocs.uvt.nl/simulation/object/sd-025 - images/th_sd025.jpg + object/sd-025 + object-content/th_sd025.jpg De ENSIE is een gerenommeerd en betrouwbare partner van haar afnemers. Comfort thuis en in bedrijf. sd026 Gezondheidscentrum Siedok - http://rocs.uvt.nl/simulation/object/sd-026 - images/th_sd026.jpg + object/sd-026 + object-content/th_sd026.jpg Gezondheidscentrum SieDok omvat een artsenpraktijk, fysiotherapeuten en maatschappelijk werk. sd027 Global Inc - http://rocs.uvt.nl/simulation/object/sd-027 - images/th_sd027.jpg + object/sd-027 + object-content/th_sd027.jpg Global Inc. is de eerste multinational in Sieberdam. ICT en ruimtevaart zijn haar kernactiviteiten. sd028 Groentenboer Boorn - http://rocs.uvt.nl/simulation/object/sd-028 - images/th_sd028.jpg + object/sd-028 + object-content/th_sd028.jpg Al 22 jaar lang is familiebedrijf Boorn de groentenboer van heel Sieberdam. sd029 Historisch Museum - http://rocs.uvt.nl/simulation/object/sd-029 - images/th_sd029.jpg + object/sd-029 + object-content/th_sd029.jpg In 1996 ging het Historisch Museum Sieberdam open voor het publiek. sd030 Hoek Vastgoed BV - http://rocs.uvt.nl/simulation/object/sd-030 - images/th_sd030.jpg + object/sd-030 + object-content/th_sd030.jpg Hoek Vastgoed BV is geopend maandag t/m vrijdag van 09.00 tot 17.00 uur en zaterdag tot 14.00 uur. sd031 Hotel 't Wapen van Sielre - http://rocs.uvt.nl/simulation/object/sd-031 - images/th_sd031.jpg + object/sd-031 + object-content/th_sd031.jpg t Wapen van Sielre is ouder dan Sieberdam zelf. Nu met een online reserverings-systeem. sd032 Industriegebied Alfa - http://rocs.uvt.nl/simulation/object/sd-032 - images/th_sd032.jpg + object/sd-032 + object-content/th_sd032.jpg Industrieterrein Alfa is de perfecte plaats voor bedrijven die ruimte en bereikbaarheid wensen. sd033 Kraakpand Bezet - http://rocs.uvt.nl/simulation/object/sd-033 - images/th_sd033.jpg + object/sd-033 + object-content/th_sd033.jpg Kraakpand bezet is een uiting van zo'n 80 woningzoekenden die geen hotel willen maar een huis. sd034 Laapers ziekenhuis - http://rocs.uvt.nl/simulation/object/sd-034 - images/th_sd034.jpg + object/sd-034 + object-content/th_sd034.jpg Het Laapersziekenhuis heeft een streekfunctie. Vrijwel alle specialismen zijn aanwezig. sd035 LIG coffeeshop - http://rocs.uvt.nl/simulation/object/sd-035 - images/th_sd035.jpg + object/sd-035 + object-content/th_sd035.jpg De beste weed langs de IJssel. Ook voor uw smartproducten en uw growshop. sd036 Lincoln garage - http://rocs.uvt.nl/simulation/object/sd-036 - images/th_sd036.jpg + object/sd-036 + object-content/th_sd036.jpg Merkgarage Lincoln specialiseert zich in in Amerikaanse auto's, die wij zelf importeren. sd037 McDonalds - http://rocs.uvt.nl/simulation/object/sd-037 - images/th_sd037.jpg + object/sd-037 + object-content/th_sd037.jpg I'm lovin it brengt de lifestyle van onze gasten in contact met McDonalds. sd038 Mevlana Moskee - http://rocs.uvt.nl/simulation/object/sd-038 - images/th_sd038.jpg + object/sd-038 + object-content/th_sd038.jpg Moslims in Sieberdam hebben sinds oktober 2001 een nieuwe moskee: de Mevlana Moskee. sd039 MKB Sieberdam - http://rocs.uvt.nl/simulation/object/sd-039 - images/th_sd039.jpg + object/sd-039 + object-content/th_sd039.jpg De regionale MKB-organisatie is een belangrijke gesprekspartner op lokaal en regionaal terrein. sd040 Molen Voorspoed - http://rocs.uvt.nl/simulation/object/sd-040 - images/th_sd040.jpg + object/sd-040 + object-content/th_sd040.jpg Deze ronde stenen stellingmolen heeft zijn huidige vorm sinds 1711. sd041 Nieuwe Industriehaven - http://rocs.uvt.nl/simulation/object/sd-041 - images/th_sd041.jpg + object/sd-041 + object-content/th_sd041.jpg De Nieuwe Industriehaven is de middelste van de drie nieuwe havens, buiten de bruggen. sd042 Nieuwe Kerk - http://rocs.uvt.nl/simulation/object/sd-042 - images/th_sd042.jpg + object/sd-042 + object-content/th_sd042.jpg In de nieuwe kerk vindt u de Christelijke Gereformeerde Kerk van Sieberdam. sd043 Notaris Koers - http://rocs.uvt.nl/simulation/object/sd-043 - images/th_sd043.jpg + object/sd-043 + object-content/th_sd043.jpg Koers heeft ervaring met en kennis van nagenoeg alle rechtsgebieden. sd044 NS station Sieberdam - http://rocs.uvt.nl/simulation/object/sd-044 - images/th_sd044.jpg + object/sd-044 + object-content/th_sd044.jpg Het NS station Sieberdam staat op de lijst van nieuwbouw-stations van de NS - naar verwachting 2008. sd045 Oude Kerk - http://rocs.uvt.nl/simulation/object/sd-045 - images/th_sd045.jpg + object/sd-045 + object-content/th_sd045.jpg Kerkdienst elke zondagochtend om 10.00 uur, waarna ontmoeting en gespreksmogelijkheid, met koffie. sd046 Oude Kerk - http://rocs.uvt.nl/simulation/object/sd-046 - images/th_sd046.jpg + object/sd-046 + object-content/th_sd046.jpg Kerkdienst elke zondagochtend om 10.00 uur, waarna ontmoeting en gespreksmogelijkheid, met koffie. sd047 Oude spoorbrug - http://rocs.uvt.nl/simulation/object/sd-047 - images/th_sd047.jpg + object/sd-047 + object-content/th_sd047.jpg De oude spoorbrug is ingrijpend gereconstrueerd, waarbij een fietspad is toegevoegd. sd048 Overslagbedrijf SCT - http://rocs.uvt.nl/simulation/object/sd-048 - images/th_sd048.jpg + object/sd-048 + object-content/th_sd048.jpg SCT bv is gecertificeerd voor HACCP, GMP, Minas- en Japanstandaard. sd049 Penitentiaire inrichting IJsselstein - http://rocs.uvt.nl/simulation/object/sd-049 - images/th_sd049.jpg + object/sd-049 + object-content/th_sd049.jpg De Penitentiaire Inrichting IJsselstein maakt deel uit van de DJI van het Ministerie van Justitie. sd050 Peters Mediation - http://rocs.uvt.nl/simulation/object/sd-050 - images/th_sd050.jpg + object/sd-050 + object-content/th_sd050.jpg Peters Mediation lost het op. NMI erkend mediator. sd051 Gerechtsgebouw Sieberdam - http://rocs.uvt.nl/simulation/object/sd-051 - images/th_sd051.jpg + object/sd-051 + object-content/th_sd051.jpg De zittingen in het gerechtsgebouw zijn openbaar. Melden bij de informatiebalie. sd052 SC Sieberdam - http://rocs.uvt.nl/simulation/object/sd-052 - images/th_sd052.jpg + object/sd-052 + object-content/th_sd052.jpg SC Sieberdam houdt al generaties Sieberdammers in beweging. Voetbal is meer dan gezondheid. sd053 Sieber Gazette - http://rocs.uvt.nl/simulation/object/sd-053 - images/th_sd053.jpg + object/sd-053 + object-content/th_sd053.jpg De Sieber Gazette behoort tot de oudste kranten van Nederland. Haar eerste statuut gaat terug tot 1824. sd054 Sieberdam Beton Groep - http://rocs.uvt.nl/simulation/object/sd-054 - images/th_sd054.jpg + object/sd-054 + object-content/th_sd054.jpg De Sieberdam Beton Groep is een erkend hoofdaannemer voor de publieke en de private sector. sd055 Sieberdam Golf Club - http://rocs.uvt.nl/simulation/object/sd-055 - images/th_sd055.jpg + object/sd-055 + object-content/th_sd055.jpg De Sieberdam Golfclub is een rustige jonge baan. De club telt inmiddels meer dan 300 leden. sd056 Sieberdam Shipyards - http://rocs.uvt.nl/simulation/object/sd-056 - images/th_sd056.jpg + object/sd-056 + object-content/th_sd056.jpg Sieberdam Ship Yards: nieuwbouw, onderhoud, reparatie en andere vormen van dienstverlening. sd057 Sieberlande VINEX locatie - http://rocs.uvt.nl/simulation/object/sd-057 - images/th_sd057.jpg + object/sd-057 + object-content/th_sd057.jpg Vinex locatie Sieberlande biedt plaats aan 4000 woningen, in deelplannen met elk een eigen karakter. sd058 Sielrezand vereniging - http://rocs.uvt.nl/simulation/object/sd-058 - images/th_sd058.jpg + object/sd-058 + object-content/th_sd058.jpg Sielrezand is een natuurgebied in ontwikkeling. Contact: Vereniging ter behoud van Sielrezand. sd059 Slagerij Slots - http://rocs.uvt.nl/simulation/object/sd-059 - images/th_sd059.jpg + object/sd-059 + object-content/th_sd059.jpg Slagerij Slots is een familiebedrijf, dat in 2003 van vader op dochter is overgegaan. sd060 Sloopbedrijf De Haas & dochters - http://rocs.uvt.nl/simulation/object/sd-060 - images/th_sd060.jpg + object/sd-060 + object-content/th_sd060.jpg Sloopbedrijf De Haas en Dochters - asbestverwijdering, renovatie-, sloop-, grond-, riool- en straatwerk. sd061 Sportfondsenbad Sieberberg - http://rocs.uvt.nl/simulation/object/sd-061 - images/th_sd061.jpg + object/sd-061 + object-content/th_sd061.jpg Het sportfondsenbad met veel zwemplezier voor elke doelgroep. Met binnenbad in de Sieberberg. sd062 Stad Sieberdam Verzekeringen - http://rocs.uvt.nl/simulation/object/sd-062 - images/th_sd062.jpg + object/sd-062 + object-content/th_sd062.jpg Stad Sieberdam Verzekeringen is een middelgrote verzekeraar, landelijk opererend vanuit Zoetermeer. sd063 Stadhuis - http://rocs.uvt.nl/simulation/object/sd-063 - images/th_sd063.jpg + object/sd-063 + object-content/th_sd063.jpg Het gemeentehuis aan de Lapersweg 2-20 is elke dag voor het publiek geopend van 09.00 - 17.00 uur. sd064 Stadspark De Plantage - http://rocs.uvt.nl/simulation/object/sd-064 - images/th_sd064.jpg + object/sd-064 + object-content/th_sd064.jpg Stadspark De Plantage is onderdeel van de 'groene long' van Sieberdam. Het is er goed toeven. sd065 Supermarkt De Hemel - http://rocs.uvt.nl/simulation/object/sd-065 - images/th_sd065.jpg + object/sd-065 + object-content/th_sd065.jpg Supermarkt De Hemel: een goed en supervoordeling winkelaanbod. Lage dagprijzen - weekaanbiedingen. sd066 SV architecten - http://rocs.uvt.nl/simulation/object/sd-066 - images/th_sd066.jpg + object/sd-066 + object-content/th_sd066.jpg Architectenbureau Siebervisie is een volwaardige partner in uw bouwproces. sd067 Tankstation Di-namo - http://rocs.uvt.nl/simulation/object/sd-067 - images/th_sd067.jpg + object/sd-067 + object-content/th_sd067.jpg Tankstation DI-namo - shop, carwash, handwash, Bart's Bakerstreet, 24-uurs buitenpaal. sd068 Uitvaartcentrum Sieberdam - http://rocs.uvt.nl/simulation/object/sd-068 - images/th_sd068.jpg + object/sd-068 + object-content/th_sd068.jpg Het uitvaartcentrum Sieberdam verzorgt al jaren begrafenissen en crematies. sd069 Veilinghuis Van der Hijden - http://rocs.uvt.nl/simulation/object/sd-069 - images/th_sd069.jpg + object/sd-069 + object-content/th_sd069.jpg Veilinghuis Van der Hijden - reeds dertig jaar een vaste waarde in het Nederlands veilinglandschap. sd070 Verkeersbrug - http://rocs.uvt.nl/simulation/object/sd-070 - images/th_sd070.jpg + object/sd-070 + object-content/th_sd070.jpg De verkeersbrug is geruime tijd na de Oude Spoorbrug aangelegd als vaste oeververbinding. sd071 Vervoerbedrijf Travel - http://rocs.uvt.nl/simulation/object/sd-071 - images/th_sd071.jpg + object/sd-071 + object-content/th_sd071.jpg Vervoerbedrijf Travel heeft sinds 1921 ervaring en know-how met elk gewenst vervoer. sd072 Volkspark - http://rocs.uvt.nl/simulation/object/sd-072 - images/th_sd072.jpg + object/sd-072 + object-content/th_sd072.jpg Het Volkspark is meer dan 60 jaar geleden aangelegd. De parkvijver dateert uit 1989. sd073 Volkstuinvereniging DANIG - http://rocs.uvt.nl/simulation/object/sd-073 - images/th_sd073.jpg + object/sd-073 + object-content/th_sd073.jpg Volkstuinvereniging Door Arbeid Noest In 't Groen biedt velen een waar buitenleven. sd074 Voorhaven - http://rocs.uvt.nl/simulation/object/sd-074 - images/th_sd074.jpg + object/sd-074 + object-content/th_sd074.jpg De Voorhaven is een van de drie oude havens van Sieberdam. sd075 Watch Out beveiliging - http://rocs.uvt.nl/simulation/object/sd-075 - images/th_sd075.jpg + object/sd-075 + object-content/th_sd075.jpg Beveiligingsbedrijf Watch Out kiest voor een no-nonsense benadering bij uitvoering en risicoanalyse. sd076 Winkeliersvereniging Sieberdam - http://rocs.uvt.nl/simulation/object/sd-076 - images/th_sd076.jpg + object/sd-076 + object-content/th_sd076.jpg De Winkeliersvereniging Sieberdam is opgericht op 1 januari 1884. sd077 Woningbouwvereniging EMM - http://rocs.uvt.nl/simulation/object/sd-077 - images/th_sd077.jpg + object/sd-077 + object-content/th_sd077.jpg EMM is een woningbouwvereniging met bijna 2600 woningen. In 2002 behaalde zij het KWH-huurlabel. sd078 Woningbouwvereniging Sielrebouw - http://rocs.uvt.nl/simulation/object/sd-078 - images/th_sd078.jpg + object/sd-078 + object-content/th_sd078.jpg Woningbouwvereniging Sielrebouw legt zich toe op grootschalige renovatieprojecten. sd079 Woonwagenkamp Sjaanie - http://rocs.uvt.nl/simulation/object/sd-079 - images/th_sd079.jpg + object/sd-079 + object-content/th_sd079.jpg Woonwagenkamp Sjaanie was sinds 1961 gevestigd op het terrein van de Oude Fabriek. sd080 Zalmhaven - http://rocs.uvt.nl/simulation/object/sd-080 - images/th_sd080.jpg + object/sd-080 + object-content/th_sd080.jpg De Zalmhaven is een van de drie oude havens van Sieberdam. Het is thans de jachthaven. sd081 Zoon & Zonen aannemersbedrijf - http://rocs.uvt.nl/simulation/object/sd-081 - images/th_sd081.jpg + object/sd-081 + object-content/th_sd081.jpg Op aannemersbedrijf Zoon & Zonen kunt u bouwen. Gespecialiseerd in vrije sector woningen. sd082 De Dokken - http://rocs.uvt.nl/simulation/object/sd-082 - images/th_sd082.jpg + object/sd-082 + object-content/th_sd082.jpg In De Dokken wordt de oude havens van Sieberdam nieuw leven in geblazen met bewoning en recreatie. sd083 Laaperspoort - http://rocs.uvt.nl/simulation/object/sd-083 - images/th_sd083.jpg + object/sd-083 + object-content/th_sd083.jpg De Laaperspoort is een van de toegangspoorten tot een oude stad. sd084 Sieberpark stadion - http://rocs.uvt.nl/simulation/object/sd-084 - images/th_sd084.jpg + object/sd-084 + object-content/th_sd084.jpg Het Sieberpark stadion is op 31 juli 2000 officieel geopend. SEC Sieberdam speelt er Hoofdklasse A. sd085 Speeltuin Het Torentje - http://rocs.uvt.nl/simulation/object/sd-085 - images/th_sd085.jpg + object/sd-085 + object-content/th_sd085.jpg Speeltuin Het Torentje - al 33 jaar speelplezier voor jong en oud. sd086 Spoorhaven - http://rocs.uvt.nl/simulation/object/sd-086 - images/th_sd086.jpg + object/sd-086 + object-content/th_sd086.jpg De Spoorhaven is de grootste van de drie nieuwe havens, buiten de bruggen. De Sieberwerf ligt er aan. sd087 - Standbeeld - http://rocs.uvt.nl/simulation/object/sd-087 - images/th_sd087.jpg + Standbeeld + object/sd-087 + object-content/th_sd087.jpg Het standbeeld van de Griekse koopman Solomon verwijst naar het Hanze-verleden van de stad. - + + sd088 + Bewonersvereniging Sterrebuurt + object/sd-088 + object-content/th_sd088.jpg + De bewonersvereniging Sterrebuurt is recentelijk opgericht als gevolg van de toegenomen klachten over de veiligheid in de buurt. + + + sd089 + Bewonersvereniging Spoorbuurt + object/sd-089 + object-content/th_sd089.jpg + De bewonersvereniging Spoorbuurt komt op voor de belangen van de huurders in de wijk. + + + sd090 + Werkgroep OS + object/sd-090 + object-content/th_sd090.jpg + De bedrijven rond het spoor hebben de handen ineengeslagen in de werkgroep 'Ondernemers Spoorzone' (OS) + + + sd091 + Prorail + object/sd-091 + object-content/th_sd091.jpg + Zorgen voor voldoende capaciteit, betrouwbaarheid en veiligheid op het spoor. Dat is waar ProRail in het kort voor staat + + + sd092 + Volksuniversiteit Sieberdam + object/sd-092 + object-content/th_sd092.jpg + De volksuniversiteit Sieberdam is bekend om het brede aanbod van studies, zowel technisch als niet technische studies. + + + sd093 + Adviesbureau TBM + object/sd-093 + object-content/th_sd093.jpg + Adviesbureau TBM adviseert op het snijvlak van Techniek, Bestuur en Manangement + + + sd094 + Openbaar Vervoerbedrijf (OVS) + object/sd-094 + object-content/th_sd094.jpg + Het Openbaar Vervoerbedrijf Sieberdam vervoert dagelijks ruim 400.000 mensen met bussen en trams. In de stad en in de regio. + + + sd102 + BWC + object/sd-102 + object-content/th_sd102.jpg + BWC is een brede welzijnsorganisatie die werkzaam is binnen stadsdeel centrum. + + + sd103 + Brede School de Regenboog + object/sd-103 + object-content/th_sd103.jpg + De Regenboog is een samenwerkingsverband tussen partijen die zich bezighouden met opgroeiende kinderen. + + + sd104 + Bewonersorganisatie Zeeheldenbuurt + object/sd-104 + object-content/th_sd104.jpg + Bewonersorganisatie BOZ is in 1991 opgericht om de problemen in de Zeeheldenbuurt aan te pakken. + + + sd105 + ISA winkel + object/sd-105 + object-content/th_sd105.jpg + In de winkel kunnen mensen terecht voor wijkgebonden informa + + + sd106 + Woningcorporatie de Meridiaan + object/sd-106 + object-content/th_sd106.jpg + Voor elke leefsituatie probeert de Meridiaan een passende woning te vinden. + + + sd107 + Speeltuinvereniging Piet Hein + object/sd-107 + object-content/th_sd107.jpg + Speeltuinvereniging Piet Hein wil een veilige speelomgeving dicht bij huis bieden aan alle buurtkinderen + + + sd108 + GGZ Instelling + object/sd-108 + object-content/th_sd108.jpg + Onze GGZ-instelling is een gespecialiseerde instelling voor geestelijke gezondheidszorg in de regio Sieberdam. + + + sd109 + Woon- en Zorgcentrum Pensionada + object/sd-109 + object-content/th_sd109.jpg + Woon- en zorgcentrum Pensionada is alles wat een bejaardenhuis van vroeger niet was. + + + sd110 + Stadsdeelkantoor Centrum + object/sd-110 + object-content/th_sd110.jpg + Het stadsdeelkantoor Centrum vormt de verbindende schakel tussen de gemeente en u als bewoner + + + sd111 + Stichting Onderdak (OD) + object/sd-111 + object-content/th_sd111.jpg + De stichting OnderDak (OD) is een stichting voor thuis- en daklozen + + \ No newline at end of file Index: openacs-4/packages/simulation/www/citybuild/object-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-delete.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/simulation/www/citybuild/object-delete.tcl 30 Nov 2004 21:30:40 -0000 1.7 +++ openacs-4/packages/simulation/www/citybuild/object-delete.tcl 31 Oct 2006 10:13:03 -0000 1.7.2.1 @@ -10,6 +10,14 @@ if { [template::util::is_true $confirm_p] } { permission::require_write_permission -object_id $item_id + content::item::unset_live_revision -item_id $item_id + + # we need to unset the latest revision too, otherwise + # content_item__del will bomb + db_dml unset_latest_rev { + update cr_items set latest_revision = NULL + where item_id = :item_id + } bcms::item::delete_item -item_id $item_id ad_returnredirect -message "\"$item(title)\" has been deleted." $return_url Index: openacs-4/packages/simulation/www/object-content/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/object-content/index.vuh,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/simulation/www/object-content/index.vuh 30 Nov 2004 21:30:40 -0000 1.3 +++ openacs-4/packages/simulation/www/object-content/index.vuh 31 Oct 2006 10:13:03 -0000 1.3.2.1 @@ -23,4 +23,8 @@ array set item [bcms::revision::get_revision -revision_id $revision_id] } -cr_write_content -item_id $item(item_id) +with_catch errmsg { + cr_write_content -item_id $item(item_id) +} { + ad_return_exception_template -status 404 "/packages/simulation/www/404" +} Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/resources/simplay.css'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/simulation/www/siminst/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.adp,v diff -u -r1.21 -r1.21.2.1 --- openacs-4/packages/simulation/www/siminst/index.adp 30 Nov 2004 21:09:16 -0000 1.21 +++ openacs-4/packages/simulation/www/siminst/index.adp 31 Oct 2006 10:13:04 -0000 1.21.2.1 @@ -17,6 +17,5 @@ \ No newline at end of file Index: openacs-4/packages/simulation/www/siminst/simulation-participants.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.adp,v diff -u -r1.12 -r1.12.2.1 --- openacs-4/packages/simulation/www/siminst/simulation-participants.adp 20 Apr 2004 21:12:26 -0000 1.12 +++ openacs-4/packages/simulation/www/siminst/simulation-participants.adp 31 Oct 2006 10:13:04 -0000 1.12.2.1 @@ -2,10 +2,6 @@ - -

#simulation.Invitations_are_sent#

Index: openacs-4/packages/simulation/www/simplay/case.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case.adp,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/simulation/www/simplay/case.adp 30 Nov 2004 21:09:17 -0000 1.16 +++ openacs-4/packages/simulation/www/simplay/case.adp 31 Oct 2006 10:13:04 -0000 1.16.2.1 @@ -3,24 +3,25 @@ @context;noquote@ @workflow_id;noquote@ -
-

#simulation.Recent_Messages#

- -
+
-
- +

#simulation.Recent_Messages#

+ + +
+ +
+
-
+

#simulation.Tasks#

-

-
+

#simulation.Document_Portfolio#

Index: openacs-4/packages/simulation/www/simplay/control-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v diff -u -r1.21 -r1.21.2.1 --- openacs-4/packages/simulation/www/simplay/control-bar.adp 30 Nov 2004 21:30:41 -0000 1.21 +++ openacs-4/packages/simulation/www/simplay/control-bar.adp 31 Oct 2006 10:13:04 -0000 1.21.2.1 @@ -1,28 +1,32 @@ -
+
+

#simulation.You_are# @role.character_title@ (@role.role_pretty@) -

+

-
+ +

+

 -

@curr_state@: @state_name@

 -
-

#simulation.Your_Options#

+
+ +
+

#simulation.Your_Options#

-
+

#simulation.Contacts#

- - - + \ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/control-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.tcl,v diff -u -r1.19 -r1.19.2.1 --- openacs-4/packages/simulation/www/simplay/control-bar.tcl 30 Nov 2004 21:30:41 -0000 1.19 +++ openacs-4/packages/simulation/www/simplay/control-bar.tcl 31 Oct 2006 10:13:04 -0000 1.19.2.1 @@ -114,6 +114,8 @@ set help_url [export_vars -base "${section_uri}object/[parameter::get -parameter SimPlayHelpFile]" { case_id role_id }] +set history_url [export_vars -base "${section_uri}object/[parameter::get -parameter SieberdamHistoryFile]" { case_id role_id }] + set curr_state [_ simulation.curr_state] db_1row get_state { Index: openacs-4/packages/simulation/www/simplay/document-upload.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/document-upload.adp,v diff -u -r1.3 -r1.3.6.1 --- openacs-4/packages/simulation/www/simplay/document-upload.adp 12 Jan 2004 15:37:28 -0000 1.3 +++ openacs-4/packages/simulation/www/simplay/document-upload.adp 31 Oct 2006 10:13:04 -0000 1.3.6.1 @@ -3,4 +3,6 @@ @context;noquote@ @focus;noquote@ +
+
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/index.adp,v diff -u -r1.28 -r1.28.2.1 --- openacs-4/packages/simulation/www/simplay/index.adp 30 Nov 2004 21:30:41 -0000 1.28 +++ openacs-4/packages/simulation/www/simplay/index.adp 31 Oct 2006 10:13:04 -0000 1.28.2.1 @@ -5,14 +5,15 @@
#simulation.SimPlay_Help#
+

#simulation.lt_Cases_in_which_you_ar#

#simulation.Administration#

-

#simulation.lt_You_administer_these#

+

#simulation.Cases#

@@ -30,6 +31,6 @@
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/map.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/map.adp,v diff -u -r1.2 -r1.2.2.1 --- openacs-4/packages/simulation/www/simplay/map.adp 30 Nov 2004 21:30:41 -0000 1.2 +++ openacs-4/packages/simulation/www/simplay/map.adp 31 Oct 2006 10:13:04 -0000 1.2.2.1 @@ -1,7 +1,7 @@ @title;noquote@ @context;noquote@ -
+

#simulation.Map_help#

\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/messages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/messages.adp,v diff -u -r1.14 -r1.14.2.1 --- openacs-4/packages/simulation/www/simplay/messages.adp 20 Apr 2004 21:12:26 -0000 1.14 +++ openacs-4/packages/simulation/www/simplay/messages.adp 31 Oct 2006 10:13:04 -0000 1.14.2.1 @@ -2,4 +2,6 @@ @title;noquote@ @context;noquote@ +
+
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/notifications.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/notifications.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/simulation/www/simplay/notifications.adp 30 Nov 2004 21:09:17 -0000 1.4 +++ openacs-4/packages/simulation/www/simplay/notifications.adp 31 Oct 2006 10:13:04 -0000 1.4.2.1 @@ -2,6 +2,7 @@ @page_title;noquote@ @context;noquote@ +
@@ -40,3 +41,4 @@
#simulation.Notifications_page_notification_type_header#
+
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/play-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/play-master.adp,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/simulation/www/simplay/play-master.adp 30 Nov 2004 21:09:17 -0000 1.7 +++ openacs-4/packages/simulation/www/simplay/play-master.adp 31 Oct 2006 10:13:04 -0000 1.7.2.1 @@ -4,37 +4,25 @@ @header_stuff;noquote@ - - - - - - - +@extra_css;noquote@ + + @focus;noquote@

#simulation.Session#: @simulation_title;noquote@

- - - - - -
- - +
+
+
-
\ No newline at end of file +
+
+
+ +
+ + +
+
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/play-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/play-master.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/simulation/www/simplay/play-master.tcl 30 Nov 2004 21:09:17 -0000 1.6 +++ openacs-4/packages/simulation/www/simplay/play-master.tcl 31 Oct 2006 10:13:04 -0000 1.6.2.1 @@ -41,4 +41,8 @@ set header_stuff "" } -append header_stuff "\n$stylesheet_link" \ No newline at end of file +append header_stuff "\n$stylesheet_link" + +if { [template::util::is_nil extra_css] } { + set extra_css "" +} \ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/portfolio.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/portfolio.adp,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/simulation/www/simplay/portfolio.adp 30 Nov 2004 21:09:17 -0000 1.6 +++ openacs-4/packages/simulation/www/simplay/portfolio.adp 31 Oct 2006 10:13:04 -0000 1.6.2.1 @@ -2,11 +2,11 @@ @title;noquote@ @context;noquote@ +
- - +
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/task-detail.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/simulation/www/simplay/task-detail.adp 30 Nov 2004 21:09:17 -0000 1.13 +++ openacs-4/packages/simulation/www/simplay/task-detail.adp 31 Oct 2006 10:13:04 -0000 1.13.2.1 @@ -21,10 +21,6 @@ -

-@action.description@ -

-

Index: openacs-4/packages/simulation/www/simplay/task-detail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.tcl,v diff -u -r1.27 -r1.27.2.1 --- openacs-4/packages/simulation/www/simplay/task-detail.tcl 30 Nov 2004 21:30:41 -0000 1.27 +++ openacs-4/packages/simulation/www/simplay/task-detail.tcl 31 Oct 2006 10:13:04 -0000 1.27.2.1 @@ -10,8 +10,11 @@ subject:optional body:optional received_message_item_id:optional + case_id + role_id } + # FIXME: I am exporting the enabled_action_id list as the string variable enabled_action_ids in # the forms as I can't export multiples. Here I'm recreating the list again. This is convoluted. if { ![empty_string_p $enabled_action_ids] } { @@ -22,9 +25,21 @@ set bulk_p 1 } -if { [llength $enabled_action_id] == 1 } { - workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action +if { [empty_string_p $return_url] } { + set return_url [export_vars -base case { case_id role_id }] +} +if { [llength $enabled_action_id] == 1 } { + + # Check that no other player has changed the state while + # we have been filling in the form. + if { [catch { + workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action + }] } { + ad_returnredirect -message "

[_ simulation.Sorry] [_ simulation.lt_The_task_you_were_try]

[_ simulation.lt_Someone_was_probably_]

" \ + -html $return_url + ad_script_abort + } set action_id $enabled_action(action_id) set case_id $enabled_action(case_id) simulation::action::get -action_id $action_id -array action @@ -34,10 +49,6 @@ set common_enabled_action_ids [list [list $enabled_action_id $case_id]] - if { [empty_string_p $return_url] } { - set return_url [export_vars -base case { case_id role_id }] - } - set common_actions_count 1 set ignored_actions_count 0 @@ -236,6 +247,7 @@ [simulation::ui::forms::document_upload::form_block]] \ -on_request { set pretty_name $action(pretty_name) + set description [template::util::richtext::create $action(description) $action(description_mime_type)] } -validate { {document_file {[simulation::ui::forms::document_upload::check_mime -document_file $document_file]} @@ -245,6 +257,7 @@ } } -on_submit { + db_transaction { foreach one_action $common_enabled_action_ids { set case_id [lindex $one_action 1] Index: openacs-4/packages/simulation/www/simplay/tasks.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks.adp,v diff -u -r1.11 -r1.11.6.1 --- openacs-4/packages/simulation/www/simplay/tasks.adp 27 Jan 2004 12:48:39 -0000 1.11 +++ openacs-4/packages/simulation/www/simplay/tasks.adp 31 Oct 2006 10:13:04 -0000 1.11.6.1 @@ -2,4 +2,6 @@ @title;noquote@ @context;noquote@ +
+
\ No newline at end of file Index: openacs-4/packages/simulation/www/simplay/yellow-pages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/yellow-pages.adp,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/simulation/www/simplay/yellow-pages.adp 30 Nov 2004 21:09:17 -0000 1.1 +++ openacs-4/packages/simulation/www/simplay/yellow-pages.adp 31 Oct 2006 10:13:04 -0000 1.1.4.1 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ -

+

@@ -11,4 +11,4 @@ -

+