Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl	11 Mar 2004 12:44:53 -0000	1.16
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl	20 Apr 2004 21:12:26 -0000	1.17
@@ -17,28 +17,26 @@
 
 set workflow_id $case(workflow_id)
 
-set show_contacts_p [db_string getflag {
-    select show_contacts_p
+db_1row getflags {
+    select show_contacts_p, show_states_p
       from sim_simulations
-     where simulation_id=:workflow_id}]
+     where simulation_id=:workflow_id}
 
 set case_home_url [export_vars -base "case" { case_id role_id }]
 
-set message_count [db_string message_count_sql {
+set message_count [db_string message_count_sql "
     select count(*) 
-      from sim_messages sm
-     where sm.to_role_id = :role_id
+      from sim_messagesx sm
+     where (sm.to_role_id = :role_id or sm.from_role_id = :role_id)
        and sm.case_id = :case_id
-}]
+"]
 set messages_url [export_vars -base ${section_uri}messages { case_id role_id }]
 
 set task_count [db_string task_count_sql {
-    select count(wcea.enabled_action_id) 
-      from workflow_case_enabled_actions wcea,
-           workflow_actions wa
-     where wa.assigned_role = :role_id
-       and wa.action_id = wcea.action_id
-       and wcea.case_id = :case_id
+    select count(wcaa.action_id) 
+      from workflow_case_assigned_actions wcaa
+     where wcaa.role_id = :role_id
+       and wcaa.case_id = :case_id
 }]
 
 set tasks_url [export_vars -base ${section_uri}tasks { case_id role_id }]
@@ -64,18 +62,23 @@
 
 set role(character_url) [simulation::object::url -name $role(character_name)]
 
-array set thumbnail [lindex [util_list_of_ns_sets_to_list_of_lists -list_of_ns_sets [bcms::item::list_related_items -item_id $role(character_item_id) -relation_tag "thumbnail" -return_list]] 0]
+array set thumbnail [lindex \
+  [util_list_of_ns_sets_to_list_of_lists -list_of_ns_sets \
+    [bcms::item::list_related_items -item_id $role(character_item_id) \
+      -relation_tag "thumbnail" -return_list]] 0]
 
-if { [exists_and_not_null thumbnail(name)] && [exists_and_not_null thumbnail(live_revision)] } {
-    set role(thumbnail_url) [simulation::object::content_url -name $thumbnail(name)]
-    set role(thumbnail_name) $thumbnail(name)
+if { [exists_and_not_null thumbnail(name)] \
+     && [exists_and_not_null thumbnail(live_revision)] } {
+      set role(thumbnail_url) \
+        [simulation::object::content_url -name $thumbnail(name)]
+      set role(thumbnail_name) $thumbnail(name)
 
-    array set thumbnail_rev [bcms::revision::get_revision \
-                                 -revision_id $thumbnail(live_revision) \
-                                 -additional_properties { width height }]
-                             
-    set role(thumbnail_height) $thumbnail_rev(height)
-    set role(thumbnail_width) $thumbnail_rev(width)
+      array set thumbnail_rev [bcms::revision::get_revision \
+                                   -revision_id $thumbnail(live_revision) \
+                                   -additional_properties { width height }]
+                               
+      set role(thumbnail_height) $thumbnail_rev(height)
+      set role(thumbnail_width) $thumbnail_rev(width)
 }
 
 db_multirow -unclobber -extend { character_url } contacts select_contacts "