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.16.2.5 -r1.16.2.6
--- openacs-4/contrib/packages/simulation/lib/messages.tcl 19 Apr 2004 15:22:29 -0000 1.16.2.5
+++ openacs-4/contrib/packages/simulation/lib/messages.tcl 1 Jun 2004 14:51:45 -0000 1.16.2.6
@@ -96,12 +96,22 @@
w.pretty_name as sim_name,
sm.creation_date,
to_char(sm.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi,
- (select fr.pretty_name
- from workflow_roles fr
- where fr.role_id = sm.from_role_id) as from,
- (select tr.pretty_name
- from workflow_roles tr
- where tr.role_id = sm.to_role_id) as to,
+ (select scx.title
+ from sim_roles fr,
+ sim_charactersx scx,
+ cr_items ci
+ where fr.role_id = sm.from_role_id
+ and scx.item_id = fr.character_id
+ and ci.item_id = scx.item_id
+ and ci.live_revision = scx.object_id) as from,
+ (select scx.title
+ from sim_roles tr,
+ sim_charactersx scx,
+ cr_items ci
+ where tr.role_id = sm.to_role_id
+ and scx.item_id = tr.character_id
+ and ci.item_id = scx.item_id
+ and ci.live_revision = scx.object_id) as to,
(select count(*)
from cr_item_rels
where item_id = sm.item_id
Index: openacs-4/contrib/packages/simulation/www/simplay/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/case.adp,v
diff -u -r1.11.2.3 -r1.11.2.4
--- openacs-4/contrib/packages/simulation/www/simplay/case.adp 4 May 2004 09:19:11 -0000 1.11.2.3
+++ openacs-4/contrib/packages/simulation/www/simplay/case.adp 1 Jun 2004 14:51:45 -0000 1.11.2.4
@@ -4,7 +4,7 @@
<div class="simplay_case_messages">
<h3>Recent Messages</h3>
-<include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@" limit="5">
+<include src="/packages/simulation/lib/messages" case_id="@case_id@" role_id="@role_id@" limit="5">
</div>
<div class="simplay_case_action-links">
@@ -15,7 +15,7 @@
<div class="simplay_case_tasks">
<h3>Tasks</h3>
-<include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
+<include src="/packages/simulation/lib/tasks" case_id="@case_id@" role_id="@role_id@">
</div>
<p></p>
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.26.2.3 -r1.26.2.4
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl 19 Mar 2004 10:52:44 -0000 1.26.2.3
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl 1 Jun 2004 14:51:45 -0000 1.26.2.4
@@ -20,13 +20,13 @@
set all_role_options [list]
foreach one_role_id [workflow::role::get_ids -workflow_id $workflow_id] {
- set pretty_name [workflow::role::get_element -role_id $one_role_id -element pretty_name]
+ set pretty_name [simulation::role::get_element -role_id $one_role_id -element character_title]
lappend all_role_options [list $pretty_name $one_role_id]
}
set to_role_options [list]
foreach one_role_id [workflow::role::get_ids -workflow_id $workflow_id] {
- lappend to_role_options [list [workflow::role::get_element -role_id $one_role_id -element pretty_name] $one_role_id]
+ lappend to_role_options [list [simulation::role::get_element -role_id $one_role_id -element character_title] $one_role_id]
}
set attachment_options [simulation::case::attachment_options -case_id $case_id -role_id $role_id]
@@ -48,9 +48,9 @@
-----Original Message-----
-From: [workflow::role::get_element -role_id $content(from_role_id) -element pretty_name]
+From: [simulation::role::get_element -role_id $content(from_role_id) -element character_title]
Sent: [lc_time_fmt $content(creation_date) "%x %X"]
-To: [workflow::role::get_element -role_id $content(to_role_id) -element pretty_name]
+To: [simulation::role::get_element -role_id $content(to_role_id) -element character_title]
Subject: $content(title)
[ad_html_text_convert -from $content(mime_type) -to "text/plain" $content(text)]"
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.tcl,v
diff -u -r1.22.2.5 -r1.22.2.6
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl 19 Apr 2004 16:05:09 -0000 1.22.2.5
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl 1 Jun 2004 14:51:45 -0000 1.22.2.6
@@ -94,9 +94,9 @@
set body "
-----Original Message-----
-From: [workflow::role::get_element -role_id $from_role_id -element pretty_name]
+From: [workflow::role::get_element -role_id $from_role_id -element character_title]
Sent: [lc_time_fmt $creation_date "%x %X"]
-To: [workflow::role::get_element -role_id $to_role_id -element pretty_name]
+To: [workflow::role::get_element -role_id $to_role_id -element character_title]
Subject: $subject
[ad_html_text_convert -from $mime_type -to "text/plain" $triggering_body]"
@@ -224,13 +224,13 @@
set recipient_list [list]
foreach recipient_id $action(recipients) {
- lappend recipient_list [simulation::role::get_element -role_id $recipient_id -element pretty_name]
+ lappend recipient_list [simulation::role::get_element -role_id $recipient_id -element character_title]
}
set recipient_names [join $recipient_list ", "]
if { ![empty_string_p $action(assigned_role_id)] } {
simulation::role::get -role_id $action(assigned_role_id) -array sender_role
- set sender_name $sender_role(pretty_name)
+ set sender_name $sender_role(character_title)
}
} -on_submit {
Index: openacs-4/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/messages.tcl,v
diff -u -r1.16.2.5 -r1.16.2.6
--- openacs-4/packages/simulation/lib/messages.tcl 19 Apr 2004 15:22:29 -0000 1.16.2.5
+++ openacs-4/packages/simulation/lib/messages.tcl 1 Jun 2004 14:51:45 -0000 1.16.2.6
@@ -96,12 +96,22 @@
w.pretty_name as sim_name,
sm.creation_date,
to_char(sm.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date_ansi,
- (select fr.pretty_name
- from workflow_roles fr
- where fr.role_id = sm.from_role_id) as from,
- (select tr.pretty_name
- from workflow_roles tr
- where tr.role_id = sm.to_role_id) as to,
+ (select scx.title
+ from sim_roles fr,
+ sim_charactersx scx,
+ cr_items ci
+ where fr.role_id = sm.from_role_id
+ and scx.item_id = fr.character_id
+ and ci.item_id = scx.item_id
+ and ci.live_revision = scx.object_id) as from,
+ (select scx.title
+ from sim_roles tr,
+ sim_charactersx scx,
+ cr_items ci
+ where tr.role_id = sm.to_role_id
+ and scx.item_id = tr.character_id
+ and ci.item_id = scx.item_id
+ and ci.live_revision = scx.object_id) as to,
(select count(*)
from cr_item_rels
where item_id = sm.item_id
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.11.2.3 -r1.11.2.4
--- openacs-4/packages/simulation/www/simplay/case.adp 4 May 2004 09:19:11 -0000 1.11.2.3
+++ openacs-4/packages/simulation/www/simplay/case.adp 1 Jun 2004 14:51:45 -0000 1.11.2.4
@@ -4,7 +4,7 @@
<div class="simplay_case_messages">
<h3>Recent Messages</h3>
-<include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@" limit="5">
+<include src="/packages/simulation/lib/messages" case_id="@case_id@" role_id="@role_id@" limit="5">
</div>
<div class="simplay_case_action-links">
@@ -15,7 +15,7 @@
<div class="simplay_case_tasks">
<h3>Tasks</h3>
-<include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
+<include src="/packages/simulation/lib/tasks" case_id="@case_id@" role_id="@role_id@">
</div>
<p></p>
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.26.2.3 -r1.26.2.4
--- openacs-4/packages/simulation/www/simplay/message.tcl 19 Mar 2004 10:52:44 -0000 1.26.2.3
+++ openacs-4/packages/simulation/www/simplay/message.tcl 1 Jun 2004 14:51:45 -0000 1.26.2.4
@@ -20,13 +20,13 @@
set all_role_options [list]
foreach one_role_id [workflow::role::get_ids -workflow_id $workflow_id] {
- set pretty_name [workflow::role::get_element -role_id $one_role_id -element pretty_name]
+ set pretty_name [simulation::role::get_element -role_id $one_role_id -element character_title]
lappend all_role_options [list $pretty_name $one_role_id]
}
set to_role_options [list]
foreach one_role_id [workflow::role::get_ids -workflow_id $workflow_id] {
- lappend to_role_options [list [workflow::role::get_element -role_id $one_role_id -element pretty_name] $one_role_id]
+ lappend to_role_options [list [simulation::role::get_element -role_id $one_role_id -element character_title] $one_role_id]
}
set attachment_options [simulation::case::attachment_options -case_id $case_id -role_id $role_id]
@@ -48,9 +48,9 @@
-----Original Message-----
-From: [workflow::role::get_element -role_id $content(from_role_id) -element pretty_name]
+From: [simulation::role::get_element -role_id $content(from_role_id) -element character_title]
Sent: [lc_time_fmt $content(creation_date) "%x %X"]
-To: [workflow::role::get_element -role_id $content(to_role_id) -element pretty_name]
+To: [simulation::role::get_element -role_id $content(to_role_id) -element character_title]
Subject: $content(title)
[ad_html_text_convert -from $content(mime_type) -to "text/plain" $content(text)]"
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.22.2.5 -r1.22.2.6
--- openacs-4/packages/simulation/www/simplay/task-detail.tcl 19 Apr 2004 16:05:09 -0000 1.22.2.5
+++ openacs-4/packages/simulation/www/simplay/task-detail.tcl 1 Jun 2004 14:51:45 -0000 1.22.2.6
@@ -94,9 +94,9 @@
set body "
-----Original Message-----
-From: [workflow::role::get_element -role_id $from_role_id -element pretty_name]
+From: [workflow::role::get_element -role_id $from_role_id -element character_title]
Sent: [lc_time_fmt $creation_date "%x %X"]
-To: [workflow::role::get_element -role_id $to_role_id -element pretty_name]
+To: [workflow::role::get_element -role_id $to_role_id -element character_title]
Subject: $subject
[ad_html_text_convert -from $mime_type -to "text/plain" $triggering_body]"
@@ -224,13 +224,13 @@
set recipient_list [list]
foreach recipient_id $action(recipients) {
- lappend recipient_list [simulation::role::get_element -role_id $recipient_id -element pretty_name]
+ lappend recipient_list [simulation::role::get_element -role_id $recipient_id -element character_title]
}
set recipient_names [join $recipient_list ", "]
if { ![empty_string_p $action(assigned_role_id)] } {
simulation::role::get -role_id $action(assigned_role_id) -array sender_role
- set sender_name $sender_role(pretty_name)
+ set sender_name $sender_role(character_title)
}
} -on_submit {