Index: openacs-4/contrib/packages/simulation/lib/case-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/case-history.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/case-history.adp	11 Mar 2004 15:15:05 -0000	1.1
@@ -0,0 +1,18 @@
+<h3>Actions</h3>
+<p>
+  <listtemplate name="log"></listtemplate>
+<p>
+
+<if @actions_only_p@ false>
+
+  <h3>Messages</h3>
+  <p>
+    <include src="/packages/simulation/lib/messages" case_id="@case_id@" show_body_p="@show_body_p@">
+  </p>
+
+  <h3>Documents</h3>
+  <p>
+    <listtemplate name="documents"></listtemplate>
+  </p>
+
+</if>
Index: openacs-4/contrib/packages/simulation/lib/case-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/case-history.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/lib/case-history.tcl	11 Mar 2004 15:15:05 -0000	1.1
@@ -0,0 +1,121 @@
+simulation::include_contract {
+    Displays action, and optionally message and document, history for
+    a simulation case.
+
+    @author Peter Marklund
+} {
+    case_id {}
+    actions_only_p {
+        default_value 1
+    }
+    show_body_p {
+        default_value 0
+    }
+}
+
+template::list::create \
+    -name log \
+    -elements {
+        timestamp {
+            label "Time"
+            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
+        }
+        role_pretty {
+            label "Role"
+        }
+        user_name {
+            label "User"
+            link_url_eval {[acs_community_member_url -user_id $creation_user]}
+        }
+        action_pretty {
+            label "Action"
+            link_url_col action_url
+        }
+    }
+
+db_multirow -extend { action_url } log select_log {
+    select l.entry_id,
+           l.case_id,
+           l.action_id,
+           a.short_name as action_short_name,
+           a.pretty_name as action_pretty,
+           a.pretty_past_tense as action_pretty_past_tense,
+           role.role_id,
+           role.pretty_name as role_pretty,
+           io.creation_user,
+           iou.first_names || ' ' || iou.last_name as user_name,
+           to_char(io.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
+           (select min(item_id)
+            from   sim_messagesx
+            where  entry_id = l.entry_id) as message_item_id,
+           (select min(name) 
+            from   sim_case_role_object_map,
+                   cr_items
+            where  entry_id = l.entry_id
+            and    item_id = object_id) as document_name
+    from   workflow_case_log l join 
+           workflow_actions a using (action_id) join 
+           cr_items i on (i.item_id = l.entry_id) join 
+           acs_objects io on (io.object_id = i.item_id) join 
+           cc_users iou on (iou.user_id = io.creation_user) join
+           cr_revisions r on (r.revision_id = i.live_revision),
+           workflow_roles role
+    where  l.case_id = :case_id
+    and    role.role_id = a.assigned_role
+    and    a.trigger_type = 'user'
+    order  by io.creation_date
+} {
+    if { ![empty_string_p $message_item_id] } {
+        set action_url [export_vars -base message { case_id role_id { item_id $message_item_id } }]
+    } elseif { ![empty_string_p $document_name] } {
+        set action_url [simulation::object::content_url -name $document_name]
+    } else {
+        set action_url {}
+    }
+}
+
+template::list::create \
+    -name documents \
+    -no_data "No documents" \
+    -elements {
+        timestamp {
+            label "Time"
+            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
+        }
+        role_pretty {
+            label "Role"
+        }
+        user_name {
+            label "User"
+            link_url_eval {[acs_community_member_url -user_id $creation_user]}
+        }
+        document_pretty {
+            label "Document"
+            link_url_col document_url
+        }        
+    }
+
+db_multirow -extend { document_url } documents select_documents {
+    select to_char(ao.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
+           wr.pretty_name as role_pretty,
+           cu.first_names || ' ' || cu.last_name as user_name,
+           cr.title as document_pretty,
+           ci.name as document_name,
+           ao.creation_user,
+           cr.mime_type
+    from sim_case_role_object_map scrom,
+         workflow_roles wr,
+         acs_objects ao,
+         cc_users cu,
+         cr_items ci,
+         cr_revisions cr
+    where scrom.role_id = wr.role_id
+      and scrom.object_id = ao.object_id
+      and scrom.case_id = :case_id
+      and cu.user_id = ao.creation_user
+      and ci.item_id = ao.object_id
+      and ci.live_revision = cr.revision_id
+    order  by ao.creation_date
+} {
+    set document_url [simulation::object::content_url -name $document_name]
+}
Index: openacs-4/contrib/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/messages.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/simulation/lib/messages.tcl	10 Mar 2004 14:17:01 -0000	1.14
+++ openacs-4/contrib/packages/simulation/lib/messages.tcl	11 Mar 2004 15:15:05 -0000	1.15
@@ -17,6 +17,9 @@
     limit {
         default_value {}
     }
+    show_body_p {
+        default_value 0
+    }
 }
 
 set package_id [ad_conn package_id]
@@ -61,6 +64,17 @@
     }
 }
 
+set extend { message_url creation_date_pretty }
+
+if { $show_body_p } {
+    lappend elements body
+    lappend elements {
+        label "Body"
+    }
+
+    lappend extend body
+}
+
 if { [exists_and_not_null case_id] && [exists_and_not_null role_id] } {
     set actions [list "Send new message" [export_vars -base message { case_id role_id }] {}]
 } else {
@@ -74,7 +88,7 @@
     -actions $actions \
     -elements $elements
 
-db_multirow -extend { message_url creation_date_pretty } messages select_messages "
+db_multirow -extend $extend messages select_messages "
     select sm.message_id,
            cr.item_id,
            sm.title as subject,
@@ -94,6 +108,7 @@
                and relation_tag = 'attachment') as  attachment_count,
            sm.to_role_id,
            sm.case_id as msg_case_id
+           [ad_decode $show_body_p 0 "" ", cr.content, cr.mime_type"]
     from   sim_messagesx sm,
            cr_revisions cr,
            workflows w,
@@ -116,4 +131,8 @@
         set message_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/message" { item_id { case_id $msg_case_id } { role_id $to_role_id } }]
     }
     set creation_date_pretty [lc_time_fmt $creation_date_ansi "%x %X"]
+
+    if { $show_body_p } {
+        set body [ad_html_text_convert -from $mime_type -to "text/plain" $content]
+    }
 }
Index: openacs-4/contrib/packages/simulation/www/simplay/case-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case-admin.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/simulation/www/simplay/case-admin.adp	10 Mar 2004 14:17:07 -0000	1.11
+++ openacs-4/contrib/packages/simulation/www/simplay/case-admin.adp	11 Mar 2004 15:15:06 -0000	1.12
@@ -21,23 +21,8 @@
 
 <h2>Case History</h2>
 
-@case_history_filter;noquote@
-
-<h3>Actions</h3>
 <p>
-  <listtemplate name="log"></listtemplate>
-<p>
+<a href="@full_history_url@">Export full case history</a>
+</p>
 
-<if @actions_only_p@ false>
-
-  <h3>Messages</h3>
-  <p>
-    <include src="/packages/simulation/lib/messages" case_id="@case_id@">
-  </p>
-
-  <h3>Documents</h3>
-  <p>
-    <listtemplate name="documents"></listtemplate>
-  </p>
-
-</if>
\ No newline at end of file
+<include src="/packages/simulation/lib/case-history" case_id="@case_id@" />
Index: openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case-admin.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl	10 Mar 2004 14:17:07 -0000	1.15
+++ openacs-4/contrib/packages/simulation/www/simplay/case-admin.tcl	11 Mar 2004 15:15:06 -0000	1.16
@@ -1,10 +1,11 @@
 ad_page_contract {
     This page allows admins to see all the roles in a simulation case and the user
-    playing each role.
+    playing each role. It also shows an action history for the simulation.
 } {
     case_id:integer
     {assigned_only_p 0}
     {actions_only_p 1}
+    {show_body_p 0}
 }
 
 set package_id [ad_conn package_id]
@@ -80,6 +81,9 @@
         case_id {
             hide_p 1
         }
+        actions_only_p {
+            hide_p 1
+        }
     }
 
 # Set clauses for the assigned only filter
@@ -157,121 +161,4 @@
 
 set case_delete_url [export_vars -base case-delete { case_id { return_url [ad_return_url] } }]
 
-
-#----------------------------------------------------------------------
-# Case activity history
-#----------------------------------------------------------------------
-
-if { $actions_only_p } {
-    set toggle_url [export_vars -base case-admin { case_id assigned_only_p {actions_only_p 0}}]
-    set case_history_filter "Display \[ <b>Only actions</b> | <a href=\"$toggle_url\">Actions, messages, and documents</a> \]"
-} else {
-    set toggle_url [export_vars -base case-admin { case_id assigned_only_p {actions_only_p 1}}]
-    set case_history_filter "Display \[ <a href=\"$toggle_url\">Only actions</a> | <b>Actions, messages, and documents</b> \]"
-}
-
-template::list::create \
-    -name log \
-    -elements {
-        timestamp {
-            label "Time"
-            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
-        }
-        role_pretty {
-            label "Role"
-        }
-        user_name {
-            label "User"
-            link_url_eval {[acs_community_member_url -user_id $creation_user]}
-        }
-        action_pretty {
-            label "Action"
-            link_url_col action_url
-        }
-    }
-
-db_multirow -extend { action_url } log select_log {
-    select l.entry_id,
-           l.case_id,
-           l.action_id,
-           a.short_name as action_short_name,
-           a.pretty_name as action_pretty,
-           a.pretty_past_tense as action_pretty_past_tense,
-           role.role_id,
-           role.pretty_name as role_pretty,
-           io.creation_user,
-           iou.first_names || ' ' || iou.last_name as user_name,
-           to_char(io.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
-           (select min(item_id)
-            from   sim_messagesx
-            where  entry_id = l.entry_id) as message_item_id,
-           (select min(name) 
-            from   sim_case_role_object_map,
-                   cr_items
-            where  entry_id = l.entry_id
-            and    item_id = object_id) as document_name
-    from   workflow_case_log l join 
-           workflow_actions a using (action_id) join 
-           cr_items i on (i.item_id = l.entry_id) join 
-           acs_objects io on (io.object_id = i.item_id) join 
-           cc_users iou on (iou.user_id = io.creation_user) join
-           cr_revisions r on (r.revision_id = i.live_revision),
-           workflow_roles role
-    where  l.case_id = :case_id
-    and    role.role_id = a.assigned_role
-    and    a.trigger_type = 'user'
-    order  by io.creation_date
-} {
-    if { ![empty_string_p $message_item_id] } {
-        set action_url [export_vars -base message { case_id role_id { item_id $message_item_id } }]
-    } elseif { ![empty_string_p $document_name] } {
-        set action_url [simulation::object::content_url -name $document_name]
-    } else {
-        set action_url {}
-    }
-}
-
-template::list::create \
-    -name documents \
-    -no_data "No documents uploaded in this simulation case" \
-    -elements {
-        timestamp {
-            label "Time"
-            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
-        }
-        role_pretty {
-            label "Role"
-        }
-        user_name {
-            label "User"
-            link_url_eval {[acs_community_member_url -user_id $creation_user]}
-        }
-        document_pretty {
-            label "Document"
-            link_url_col document_url
-        }        
-    }
-
-db_multirow -extend { document_url } documents select_documents {
-    select to_char(ao.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
-           wr.pretty_name as role_pretty,
-           cu.first_names || ' ' || cu.last_name as user_name,
-           cr.title as document_pretty,
-           ci.name as document_name,
-           ao.creation_user
-    from sim_case_role_object_map scrom,
-         workflow_roles wr,
-         acs_objects ao,
-         cc_users cu,
-         cr_items ci,
-         cr_revisions cr
-    where scrom.role_id = wr.role_id
-      and scrom.object_id = ao.object_id
-      and scrom.case_id = :case_id
-      and cu.user_id = ao.creation_user
-      and ci.item_id = ao.object_id
-      and ci.live_revision = cr.revision_id
-    order  by ao.creation_date
-} {
-    set document_url [simulation::object::content_url -name $document_name]
-}
+set full_history_url [export_vars -base case-history { case_id }]
Index: openacs-4/contrib/packages/simulation/www/simplay/case-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case-history.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simplay/case-history.adp	11 Mar 2004 15:15:06 -0000	1.1
@@ -0,0 +1,5 @@
+<master src="/packages/simulation/www/simulation-master">
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<include src="/packages/simulation/lib/case-history" case_id="@case_id@" actions_only_p="0" show_body_p="1" />
Index: openacs-4/contrib/packages/simulation/www/simplay/case-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case-history.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simplay/case-history.tcl	11 Mar 2004 15:15:06 -0000	1.1
@@ -0,0 +1,14 @@
+ad_page_contract {
+    This page shows the full action, message, and document history of
+    a simulation case.
+
+    @author Peter Marklund
+} {
+    case_id:integer
+}
+
+simulation::case::get -case_id $case_id -array case
+
+set page_title "Full History for $case(label)"
+set context [list [list . "SimPlay"] $page_title]
+
Index: openacs-4/contrib/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl	4 Mar 2004 12:09:44 -0000	1.25
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl	11 Mar 2004 15:15:06 -0000	1.26
@@ -189,7 +189,7 @@
         foreach attachment_set $attachments_set_list {
             set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
             set object_title [ns_set get $attachment_set title]
-            append attachments "<a href=\"$object_url\">$object_title</a><br>"
+            append attachments "<a href=\"$object_url\">$object_title</a> ($content(mime_type))<br>"
         }
         if { [llength $attachments_set_list] == 0 } {
             element set_properties message attachments -widget hidden
Index: openacs-4/packages/simulation/lib/case-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/case-history.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/case-history.adp	11 Mar 2004 15:15:05 -0000	1.1
@@ -0,0 +1,18 @@
+<h3>Actions</h3>
+<p>
+  <listtemplate name="log"></listtemplate>
+<p>
+
+<if @actions_only_p@ false>
+
+  <h3>Messages</h3>
+  <p>
+    <include src="/packages/simulation/lib/messages" case_id="@case_id@" show_body_p="@show_body_p@">
+  </p>
+
+  <h3>Documents</h3>
+  <p>
+    <listtemplate name="documents"></listtemplate>
+  </p>
+
+</if>
Index: openacs-4/packages/simulation/lib/case-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/case-history.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/case-history.tcl	11 Mar 2004 15:15:05 -0000	1.1
@@ -0,0 +1,121 @@
+simulation::include_contract {
+    Displays action, and optionally message and document, history for
+    a simulation case.
+
+    @author Peter Marklund
+} {
+    case_id {}
+    actions_only_p {
+        default_value 1
+    }
+    show_body_p {
+        default_value 0
+    }
+}
+
+template::list::create \
+    -name log \
+    -elements {
+        timestamp {
+            label "Time"
+            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
+        }
+        role_pretty {
+            label "Role"
+        }
+        user_name {
+            label "User"
+            link_url_eval {[acs_community_member_url -user_id $creation_user]}
+        }
+        action_pretty {
+            label "Action"
+            link_url_col action_url
+        }
+    }
+
+db_multirow -extend { action_url } log select_log {
+    select l.entry_id,
+           l.case_id,
+           l.action_id,
+           a.short_name as action_short_name,
+           a.pretty_name as action_pretty,
+           a.pretty_past_tense as action_pretty_past_tense,
+           role.role_id,
+           role.pretty_name as role_pretty,
+           io.creation_user,
+           iou.first_names || ' ' || iou.last_name as user_name,
+           to_char(io.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
+           (select min(item_id)
+            from   sim_messagesx
+            where  entry_id = l.entry_id) as message_item_id,
+           (select min(name) 
+            from   sim_case_role_object_map,
+                   cr_items
+            where  entry_id = l.entry_id
+            and    item_id = object_id) as document_name
+    from   workflow_case_log l join 
+           workflow_actions a using (action_id) join 
+           cr_items i on (i.item_id = l.entry_id) join 
+           acs_objects io on (io.object_id = i.item_id) join 
+           cc_users iou on (iou.user_id = io.creation_user) join
+           cr_revisions r on (r.revision_id = i.live_revision),
+           workflow_roles role
+    where  l.case_id = :case_id
+    and    role.role_id = a.assigned_role
+    and    a.trigger_type = 'user'
+    order  by io.creation_date
+} {
+    if { ![empty_string_p $message_item_id] } {
+        set action_url [export_vars -base message { case_id role_id { item_id $message_item_id } }]
+    } elseif { ![empty_string_p $document_name] } {
+        set action_url [simulation::object::content_url -name $document_name]
+    } else {
+        set action_url {}
+    }
+}
+
+template::list::create \
+    -name documents \
+    -no_data "No documents" \
+    -elements {
+        timestamp {
+            label "Time"
+            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
+        }
+        role_pretty {
+            label "Role"
+        }
+        user_name {
+            label "User"
+            link_url_eval {[acs_community_member_url -user_id $creation_user]}
+        }
+        document_pretty {
+            label "Document"
+            link_url_col document_url
+        }        
+    }
+
+db_multirow -extend { document_url } documents select_documents {
+    select to_char(ao.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
+           wr.pretty_name as role_pretty,
+           cu.first_names || ' ' || cu.last_name as user_name,
+           cr.title as document_pretty,
+           ci.name as document_name,
+           ao.creation_user,
+           cr.mime_type
+    from sim_case_role_object_map scrom,
+         workflow_roles wr,
+         acs_objects ao,
+         cc_users cu,
+         cr_items ci,
+         cr_revisions cr
+    where scrom.role_id = wr.role_id
+      and scrom.object_id = ao.object_id
+      and scrom.case_id = :case_id
+      and cu.user_id = ao.creation_user
+      and ci.item_id = ao.object_id
+      and ci.live_revision = cr.revision_id
+    order  by ao.creation_date
+} {
+    set document_url [simulation::object::content_url -name $document_name]
+}
Index: openacs-4/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/messages.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/simulation/lib/messages.tcl	10 Mar 2004 14:17:01 -0000	1.14
+++ openacs-4/packages/simulation/lib/messages.tcl	11 Mar 2004 15:15:05 -0000	1.15
@@ -17,6 +17,9 @@
     limit {
         default_value {}
     }
+    show_body_p {
+        default_value 0
+    }
 }
 
 set package_id [ad_conn package_id]
@@ -61,6 +64,17 @@
     }
 }
 
+set extend { message_url creation_date_pretty }
+
+if { $show_body_p } {
+    lappend elements body
+    lappend elements {
+        label "Body"
+    }
+
+    lappend extend body
+}
+
 if { [exists_and_not_null case_id] && [exists_and_not_null role_id] } {
     set actions [list "Send new message" [export_vars -base message { case_id role_id }] {}]
 } else {
@@ -74,7 +88,7 @@
     -actions $actions \
     -elements $elements
 
-db_multirow -extend { message_url creation_date_pretty } messages select_messages "
+db_multirow -extend $extend messages select_messages "
     select sm.message_id,
            cr.item_id,
            sm.title as subject,
@@ -94,6 +108,7 @@
                and relation_tag = 'attachment') as  attachment_count,
            sm.to_role_id,
            sm.case_id as msg_case_id
+           [ad_decode $show_body_p 0 "" ", cr.content, cr.mime_type"]
     from   sim_messagesx sm,
            cr_revisions cr,
            workflows w,
@@ -116,4 +131,8 @@
         set message_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/message" { item_id { case_id $msg_case_id } { role_id $to_role_id } }]
     }
     set creation_date_pretty [lc_time_fmt $creation_date_ansi "%x %X"]
+
+    if { $show_body_p } {
+        set body [ad_html_text_convert -from $mime_type -to "text/plain" $content]
+    }
 }
Index: openacs-4/packages/simulation/www/simplay/case-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case-admin.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/simulation/www/simplay/case-admin.adp	10 Mar 2004 14:17:07 -0000	1.11
+++ openacs-4/packages/simulation/www/simplay/case-admin.adp	11 Mar 2004 15:15:06 -0000	1.12
@@ -21,23 +21,8 @@
 
 <h2>Case History</h2>
 
-@case_history_filter;noquote@
-
-<h3>Actions</h3>
 <p>
-  <listtemplate name="log"></listtemplate>
-<p>
+<a href="@full_history_url@">Export full case history</a>
+</p>
 
-<if @actions_only_p@ false>
-
-  <h3>Messages</h3>
-  <p>
-    <include src="/packages/simulation/lib/messages" case_id="@case_id@">
-  </p>
-
-  <h3>Documents</h3>
-  <p>
-    <listtemplate name="documents"></listtemplate>
-  </p>
-
-</if>
\ No newline at end of file
+<include src="/packages/simulation/lib/case-history" case_id="@case_id@" />
Index: openacs-4/packages/simulation/www/simplay/case-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case-admin.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/simulation/www/simplay/case-admin.tcl	10 Mar 2004 14:17:07 -0000	1.15
+++ openacs-4/packages/simulation/www/simplay/case-admin.tcl	11 Mar 2004 15:15:06 -0000	1.16
@@ -1,10 +1,11 @@
 ad_page_contract {
     This page allows admins to see all the roles in a simulation case and the user
-    playing each role.
+    playing each role. It also shows an action history for the simulation.
 } {
     case_id:integer
     {assigned_only_p 0}
     {actions_only_p 1}
+    {show_body_p 0}
 }
 
 set package_id [ad_conn package_id]
@@ -80,6 +81,9 @@
         case_id {
             hide_p 1
         }
+        actions_only_p {
+            hide_p 1
+        }
     }
 
 # Set clauses for the assigned only filter
@@ -157,121 +161,4 @@
 
 set case_delete_url [export_vars -base case-delete { case_id { return_url [ad_return_url] } }]
 
-
-#----------------------------------------------------------------------
-# Case activity history
-#----------------------------------------------------------------------
-
-if { $actions_only_p } {
-    set toggle_url [export_vars -base case-admin { case_id assigned_only_p {actions_only_p 0}}]
-    set case_history_filter "Display \[ <b>Only actions</b> | <a href=\"$toggle_url\">Actions, messages, and documents</a> \]"
-} else {
-    set toggle_url [export_vars -base case-admin { case_id assigned_only_p {actions_only_p 1}}]
-    set case_history_filter "Display \[ <a href=\"$toggle_url\">Only actions</a> | <b>Actions, messages, and documents</b> \]"
-}
-
-template::list::create \
-    -name log \
-    -elements {
-        timestamp {
-            label "Time"
-            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
-        }
-        role_pretty {
-            label "Role"
-        }
-        user_name {
-            label "User"
-            link_url_eval {[acs_community_member_url -user_id $creation_user]}
-        }
-        action_pretty {
-            label "Action"
-            link_url_col action_url
-        }
-    }
-
-db_multirow -extend { action_url } log select_log {
-    select l.entry_id,
-           l.case_id,
-           l.action_id,
-           a.short_name as action_short_name,
-           a.pretty_name as action_pretty,
-           a.pretty_past_tense as action_pretty_past_tense,
-           role.role_id,
-           role.pretty_name as role_pretty,
-           io.creation_user,
-           iou.first_names || ' ' || iou.last_name as user_name,
-           to_char(io.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
-           (select min(item_id)
-            from   sim_messagesx
-            where  entry_id = l.entry_id) as message_item_id,
-           (select min(name) 
-            from   sim_case_role_object_map,
-                   cr_items
-            where  entry_id = l.entry_id
-            and    item_id = object_id) as document_name
-    from   workflow_case_log l join 
-           workflow_actions a using (action_id) join 
-           cr_items i on (i.item_id = l.entry_id) join 
-           acs_objects io on (io.object_id = i.item_id) join 
-           cc_users iou on (iou.user_id = io.creation_user) join
-           cr_revisions r on (r.revision_id = i.live_revision),
-           workflow_roles role
-    where  l.case_id = :case_id
-    and    role.role_id = a.assigned_role
-    and    a.trigger_type = 'user'
-    order  by io.creation_date
-} {
-    if { ![empty_string_p $message_item_id] } {
-        set action_url [export_vars -base message { case_id role_id { item_id $message_item_id } }]
-    } elseif { ![empty_string_p $document_name] } {
-        set action_url [simulation::object::content_url -name $document_name]
-    } else {
-        set action_url {}
-    }
-}
-
-template::list::create \
-    -name documents \
-    -no_data "No documents uploaded in this simulation case" \
-    -elements {
-        timestamp {
-            label "Time"
-            display_eval {[lc_time_fmt $creation_date_ansi "%x %X"]}
-        }
-        role_pretty {
-            label "Role"
-        }
-        user_name {
-            label "User"
-            link_url_eval {[acs_community_member_url -user_id $creation_user]}
-        }
-        document_pretty {
-            label "Document"
-            link_url_col document_url
-        }        
-    }
-
-db_multirow -extend { document_url } documents select_documents {
-    select to_char(ao.creation_date, 'YYYY-HH-MM HH24:MI:SS') as creation_date_ansi,
-           wr.pretty_name as role_pretty,
-           cu.first_names || ' ' || cu.last_name as user_name,
-           cr.title as document_pretty,
-           ci.name as document_name,
-           ao.creation_user
-    from sim_case_role_object_map scrom,
-         workflow_roles wr,
-         acs_objects ao,
-         cc_users cu,
-         cr_items ci,
-         cr_revisions cr
-    where scrom.role_id = wr.role_id
-      and scrom.object_id = ao.object_id
-      and scrom.case_id = :case_id
-      and cu.user_id = ao.creation_user
-      and ci.item_id = ao.object_id
-      and ci.live_revision = cr.revision_id
-    order  by ao.creation_date
-} {
-    set document_url [simulation::object::content_url -name $document_name]
-}
+set full_history_url [export_vars -base case-history { case_id }]
Index: openacs-4/packages/simulation/www/simplay/case-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case-history.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simplay/case-history.adp	11 Mar 2004 15:15:06 -0000	1.1
@@ -0,0 +1,5 @@
+<master src="/packages/simulation/www/simulation-master">
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<include src="/packages/simulation/lib/case-history" case_id="@case_id@" actions_only_p="0" show_body_p="1" />
Index: openacs-4/packages/simulation/www/simplay/case-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case-history.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simplay/case-history.tcl	11 Mar 2004 15:15:06 -0000	1.1
@@ -0,0 +1,14 @@
+ad_page_contract {
+    This page shows the full action, message, and document history of
+    a simulation case.
+
+    @author Peter Marklund
+} {
+    case_id:integer
+}
+
+simulation::case::get -case_id $case_id -array case
+
+set page_title "Full History for $case(label)"
+set context [list [list . "SimPlay"] $page_title]
+
Index: openacs-4/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/simulation/www/simplay/message.tcl	4 Mar 2004 12:09:44 -0000	1.25
+++ openacs-4/packages/simulation/www/simplay/message.tcl	11 Mar 2004 15:15:06 -0000	1.26
@@ -189,7 +189,7 @@
         foreach attachment_set $attachments_set_list {
             set object_url [simulation::object::content_url -name [ns_set get $attachment_set name]]
             set object_title [ns_set get $attachment_set title]
-            append attachments "<a href=\"$object_url\">$object_title</a><br>"
+            append attachments "<a href=\"$object_url\">$object_title</a> ($content(mime_type))<br>"
         }
         if { [llength $attachments_set_list] == 0 } {
             element set_properties message attachments -widget hidden