\ No newline at end of file
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 -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl 20 Nov 2003 12:57:00 -0000 1.2
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl 16 Dec 2003 14:16:30 -0000 1.3
@@ -1,4 +1,37 @@
+# an includelet showing messages and tasks for a user
+
set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
set section_uri [apm_package_url_from_id $package_id]simplay/
+
+set message_count [db_string message_count_sql "
+ select count(*)
+ from sim_messages sm,
+ workflow_case_role_party_map wcrmp,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.role_id = sm.to_role_id
+ and wcrmp.case_id = sm.case_id
+"]
set messages_url ${section_uri}messages
+
+
+# TODO: decide whether to replace direct sql with this API loop:
+# get a list of cases in which the user participates
+# for each case, do [workflow::case::get_available_actions -case_id case_id -user_id :user_id ]
+
+set task_count [db_string task_count_sql "
+ select count(wcea.enabled_action_id)
+ from workflow_case_enabled_actions wcea,
+ workflow_case_role_party_map wcrmp,
+ workflow_actions wa,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.case_id = wcea.case_id
+ and wcrmp.role_id = wa.assigned_role
+ and wa.action_id = wcea.action_id
+"]
+
set tasks_url ${section_uri}tasks
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/simplay/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simplay/index.adp 18 Nov 2003 09:44:32 -0000 1.3
+++ openacs-4/contrib/packages/simulation/www/simplay/index.adp 16 Dec 2003 14:16:30 -0000 1.4
@@ -2,10 +2,4 @@
@title;noquote@@context;noquote@
-
- To-do: show all active simulations (records in sim_simulation),
- including number of cases (records in workflow_cases that are related
- to a sim_simulation via the extension table sim_workflow_cases).
-
- List of currently active simulation cases:
-
\ No newline at end of file
+
Index: openacs-4/contrib/packages/simulation/www/simplay/messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/messages.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/simplay/messages.adp 20 Nov 2003 12:57:00 -0000 1.3
+++ openacs-4/contrib/packages/simulation/www/simplay/messages.adp 16 Dec 2003 14:16:30 -0000 1.4
@@ -2,7 +2,6 @@
@page_title;noquote@@context;noquote@
- Show all tasks for all cases in which the current user_id is a
- party, grouped by case.
+
-
\ No newline at end of file
+
TODO: Show sent messages in a separate list
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/simplay/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/messages.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simplay/messages.tcl 20 Nov 2003 12:57:00 -0000 1.2
+++ openacs-4/contrib/packages/simulation/www/simplay/messages.tcl 16 Dec 2003 14:16:30 -0000 1.3
@@ -3,5 +3,6 @@
}
set page_title "Messages"
+set user_id [ad_conn user_id]
set context [list [list "." "SimPlay"] [list $page_title] ]
set package_id [ad_conn package_id]
Index: openacs-4/contrib/packages/simulation/www/simplay/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/tasks.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/tasks.adp 20 Nov 2003 12:57:00 -0000 1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/tasks.adp 16 Dec 2003 14:16:30 -0000 1.2
@@ -2,6 +2,4 @@
@page_title;noquote@@context;noquote@
-
-
Show all currently enabled tasks for the current user_id, grouped
- by case. Each task has a link to task-detail.
\ No newline at end of file
+
Index: openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/tasks.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl 20 Nov 2003 12:57:00 -0000 1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl 16 Dec 2003 14:16:30 -0000 1.2
@@ -3,5 +3,6 @@
}
set page_title "Tasks"
-set context [list $page_title]
+set user_id [ad_conn user_id]
+set context [list [list "." "SimPlay"] [list $page_title] ]
set package_id [ad_conn package_id]
Index: openacs-4/packages/simulation/lib/messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/messages.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/lib/messages.adp 18 Nov 2003 09:44:30 -0000 1.1
+++ openacs-4/packages/simulation/lib/messages.adp 16 Dec 2003 14:16:28 -0000 1.2
@@ -1 +1,2 @@
+
Index: openacs-4/packages/simulation/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/messages.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/lib/messages.tcl 18 Nov 2003 09:44:30 -0000 1.1
+++ openacs-4/packages/simulation/lib/messages.tcl 16 Dec 2003 14:16:28 -0000 1.2
@@ -5,23 +5,28 @@
@creation-date 2003-11-12
@cvs-id $Id$
} {
- party_id {
+ user_id {
default_value ""
}
}
set package_id [ad_conn package_id]
set elements {
+ case_name {
+ label "Case"
+ }
+ from {
+ label "From"
+ }
subject {
+ link_url_col
+ message_url
label "Subject"
}
date {
label "Date"
}
- from {
- label "From"
- }
attachment_count {
label "Attachments"
}
@@ -33,8 +38,11 @@
-no_data "You don't have any messages." \
-elements $elements
-db_multirow messages select_messages "
- select title as subject,
+# TODO: make case_name be a combo of simulation name and case #
+db_multirow -extend { message_url } messages select_messages "
+ select sm.message_id,
+ sm.title as subject,
+ sm.case_id as case_name,
creation_date as date,
(select p.first_names || ' ' || p.last_name
from persons p
@@ -43,5 +51,12 @@
from cr_item_rels
where item_id = item_id
and relation_tag = 'attachment') as attachment_count
- from sim_messagesi
-"
\ No newline at end of file
+ from sim_messagesx sm,
+ workflow_case_role_party_map wcrmp,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.case_id = sm.case_id
+" {
+ set message_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/message" { message_id }]
+}
\ No newline at end of file
Index: openacs-4/packages/simulation/lib/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/tasks.adp 16 Dec 2003 14:16:28 -0000 1.1
@@ -0,0 +1 @@
+
Index: openacs-4/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/lib/tasks.tcl 16 Dec 2003 14:16:28 -0000 1.1
@@ -0,0 +1,47 @@
+simulation::include_contract {
+ Displays a list of tasks for a given user_id
+
+ @author Joel Aufrecht
+ @creation-date 2003-11-12
+ @cvs-id $Id: tasks.tcl,v 1.1 2003/12/16 14:16:28 joela Exp $
+} {
+ user_id {
+ default_value ""
+ }
+}
+
+set package_id [ad_conn package_id]
+
+set elements {
+ case_name {
+ label "Case"
+ }
+ name {
+ link_url_col task_url
+ label "Task"
+ }
+}
+
+template::list::create \
+ -name tasks \
+ -multirow tasks \
+ -no_data "You don't have any tasks." \
+ -elements $elements
+
+# TODO: make case_name be a combo of simulation name and case #
+db_multirow -extend { task_url } tasks select_tasks "
+ select wcea.enabled_action_id,
+ wa.pretty_name as name,
+ wcea.case_id
+ from workflow_case_enabled_actions wcea,
+ workflow_case_role_party_map wcrmp,
+ workflow_actions wa,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.case_id = wcea.case_id
+ and wcrmp.role_id = wa.assigned_role
+ and wa.action_id = wcea.action_id
+" {
+ set task_url [export_vars -base "[apm_package_url_from_id $package_id]simplay/task-detail" { enabled_action_id }]
+}
\ No newline at end of file
Index: openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql 28 Nov 2003 12:55:45 -0000 1.13
+++ openacs-4/packages/simulation/sql/postgresql/simulation-content-types-create.sql 16 Dec 2003 14:16:28 -0000 1.14
@@ -261,6 +261,7 @@
----------------------------------------------------------------------
-- sim_message
----------------------------------------------------------------------
+-- # TODO: conststrain to_role_id and from_role_id
select content_type__create_type(
'sim_message', -- content_type
@@ -285,37 +286,26 @@
select content_type__create_attribute(
'sim_message', -- content_type
- 'to_case_id', -- attribute_name
+ 'from_role_id', -- attribute_name
'integer', -- datatype
- 'To case_id', -- pretty_name
- 'To case_ids', -- pretty_plural
+ 'From role_id', -- pretty_name
+ 'From rase_ids', -- pretty_plural
2, -- sort_order
null, -- default_value
'integer' -- column_spec
);
select content_type__create_attribute(
'sim_message', -- content_type
- 'from_role_id', -- attribute_name
+ 'case_id', -- attribute_name
'integer', -- datatype
- 'From role_id', -- pretty_name
- 'From role_ids', -- pretty_plural
+ 'Case ID', -- pretty_name
+ 'case IDs', -- pretty_plural
3, -- sort_order
null, -- default_value
'integer' -- column_spec
);
-select content_type__create_attribute(
- 'sim_message', -- content_type
- 'from_case_id', -- attribute_name
- 'integer', -- datatype
- 'From case_id', -- pretty_name
- 'From case_ids', -- pretty_plural
- 1, -- sort_order
- null, -- default_value
- 'integer' -- column_spec
-);
-
select content_type__register_relation_type (
'sim_message', -- content_type
'sim_prop', -- target_type
Index: openacs-4/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.adp,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/simulation/www/index.adp 11 Dec 2003 13:21:52 -0000 1.26
+++ openacs-4/packages/simulation/www/index.adp 16 Dec 2003 14:16:28 -0000 1.27
@@ -2,43 +2,40 @@
@page_title;noquote@@context;noquote@
-
-
\ 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.2 -r1.3
--- openacs-4/packages/simulation/www/simplay/control-bar.tcl 20 Nov 2003 12:57:00 -0000 1.2
+++ openacs-4/packages/simulation/www/simplay/control-bar.tcl 16 Dec 2003 14:16:30 -0000 1.3
@@ -1,4 +1,37 @@
+# an includelet showing messages and tasks for a user
+
set package_id [ad_conn package_id]
+set user_id [ad_conn user_id]
set section_uri [apm_package_url_from_id $package_id]simplay/
+
+set message_count [db_string message_count_sql "
+ select count(*)
+ from sim_messages sm,
+ workflow_case_role_party_map wcrmp,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.role_id = sm.to_role_id
+ and wcrmp.case_id = sm.case_id
+"]
set messages_url ${section_uri}messages
+
+
+# TODO: decide whether to replace direct sql with this API loop:
+# get a list of cases in which the user participates
+# for each case, do [workflow::case::get_available_actions -case_id case_id -user_id :user_id ]
+
+set task_count [db_string task_count_sql "
+ select count(wcea.enabled_action_id)
+ from workflow_case_enabled_actions wcea,
+ workflow_case_role_party_map wcrmp,
+ workflow_actions wa,
+ party_approved_member_map pamm
+ where pamm.member_id = :user_id
+ and wcrmp.party_id = pamm.party_id
+ and wcrmp.case_id = wcea.case_id
+ and wcrmp.role_id = wa.assigned_role
+ and wa.action_id = wcea.action_id
+"]
+
set tasks_url ${section_uri}tasks
\ 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.3 -r1.4
--- openacs-4/packages/simulation/www/simplay/index.adp 18 Nov 2003 09:44:32 -0000 1.3
+++ openacs-4/packages/simulation/www/simplay/index.adp 16 Dec 2003 14:16:30 -0000 1.4
@@ -2,10 +2,4 @@
@title;noquote@@context;noquote@
-
- To-do: show all active simulations (records in sim_simulation),
- including number of cases (records in workflow_cases that are related
- to a sim_simulation via the extension table sim_workflow_cases).
-
- List of currently active simulation cases:
-
\ 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.3 -r1.4
--- openacs-4/packages/simulation/www/simplay/messages.adp 20 Nov 2003 12:57:00 -0000 1.3
+++ openacs-4/packages/simulation/www/simplay/messages.adp 16 Dec 2003 14:16:30 -0000 1.4
@@ -2,7 +2,6 @@
@page_title;noquote@@context;noquote@
- Show all tasks for all cases in which the current user_id is a
- party, grouped by case.
+
-
\ No newline at end of file
+
TODO: Show sent messages in a separate list
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simplay/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/messages.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/simplay/messages.tcl 20 Nov 2003 12:57:00 -0000 1.2
+++ openacs-4/packages/simulation/www/simplay/messages.tcl 16 Dec 2003 14:16:30 -0000 1.3
@@ -3,5 +3,6 @@
}
set page_title "Messages"
+set user_id [ad_conn user_id]
set context [list [list "." "SimPlay"] [list $page_title] ]
set package_id [ad_conn package_id]
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.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/tasks.adp 20 Nov 2003 12:57:00 -0000 1.1
+++ openacs-4/packages/simulation/www/simplay/tasks.adp 16 Dec 2003 14:16:30 -0000 1.2
@@ -2,6 +2,4 @@
@page_title;noquote@@context;noquote@
-
-
Show all currently enabled tasks for the current user_id, grouped
- by case. Each task has a link to task-detail.
\ No newline at end of file
+
Index: openacs-4/packages/simulation/www/simplay/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/tasks.tcl 20 Nov 2003 12:57:00 -0000 1.1
+++ openacs-4/packages/simulation/www/simplay/tasks.tcl 16 Dec 2003 14:16:30 -0000 1.2
@@ -3,5 +3,6 @@
}
set page_title "Tasks"
-set context [list $page_title]
+set user_id [ad_conn user_id]
+set context [list [list "." "SimPlay"] [list $page_title] ]
set package_id [ad_conn package_id]