|
-
+
|
Index: openacs-4/contrib/packages/simulation/www/simplay/play-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/play-master.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simplay/play-master.tcl 19 Dec 2003 14:00:39 -0000 1.1
@@ -0,0 +1,5 @@
+ad_page_contract {
+ Simplay master: Links to tasks, messages, etc.
+} {
+ {case_id:integer ""}
+}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/simplay/task-detail.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/simplay/tasks.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/simplay/tasks.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/simulation/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/tasks.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/lib/tasks.tcl 16 Dec 2003 14:16:28 -0000 1.1
+++ openacs-4/packages/simulation/lib/tasks.tcl 19 Dec 2003 14:00:38 -0000 1.2
@@ -8,40 +8,61 @@
user_id {
default_value ""
}
+ case_id {
+ default_value ""
+ }
}
set package_id [ad_conn package_id]
set elements {
- case_name {
- label "Case"
- }
name {
link_url_col task_url
label "Task"
}
+ sim_name {
+ label "Simulation"
+ }
+ case_label {
+ label "Case"
+ }
}
template::list::create \
-name tasks \
-multirow tasks \
-no_data "You don't have any tasks." \
- -elements $elements
+ -elements $elements \
+ -filters {
+ case_id {
+ where_clause "wc.case_id = :case_id"
+ }
+ }
# 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
+ wcea.case_id,
+ sc.label as case_label,
+ w.pretty_name as sim_name
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
+ party_approved_member_map pamm,
+ workflow_cases wc,
+ sim_cases sc,
+ workflows w
+ where wcea.enabled_state = 'enabled'
+ and 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
+ and wc.case_id = wcea.case_id
+ and sc.sim_case_id = wc.object_id
+ and w.workflow_id = wc.workflow_id
+ [template::list::filter_where_clauses -and -name "tasks"]
" {
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/www/siminst/map-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/map-tasks.tcl 15 Dec 2003 15:28:21 -0000 1.3
+++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl 19 Dec 2003 14:00:39 -0000 1.4
@@ -10,7 +10,7 @@
set page_title "Tasks for $workflow_array(pretty_name)"
set context [list [list "." "SimInst" ] $page_title]
-db_multirow -extend { description_html } tasks select_taks {
+db_multirow -extend { description_html prop_missing_count } tasks select_taks {
select a.action_id,
a.short_name,
a.pretty_name,
@@ -26,6 +26,7 @@
and st.task_id = a.action_id
} {
set description_html [ad_html_text_convert -maxlen 100 -from $description_mime_type -- $description]
+ set prop_missing_count [expr $attachment_num - $prop_not_empty_count]
}
# TODO: Honor description_mime_type, fancy truncate
@@ -43,8 +44,10 @@
}
attachment_num {
label "Number of attachments"
+ display_template {@tasks.attachment_num@}
}
- prop_not_empty_count {
- label "Number of attachments populated"
+ prop_missing_count {
+ label "Missing attachments"
+ display_template {@tasks.prop_missing_count@}
}
}
Index: openacs-4/packages/simulation/www/simplay/case.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/case.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/case.tcl 18 Dec 2003 15:39:03 -0000 1.1
+++ openacs-4/packages/simulation/www/simplay/case.tcl 19 Dec 2003 14:00:39 -0000 1.2
@@ -4,7 +4,10 @@
case_id:integer
}
-set title "SimPlay"
+# TODO: Name of case
+# TODO: simulation::case::get - gets information about the case
+
+set title "Case"
set context [list [list . "SimPlay"] $title]
set user_id [ad_conn user_id]
set package_id [ad_conn package_id]
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.4 -r1.5
--- openacs-4/packages/simulation/www/simplay/control-bar.adp 16 Dec 2003 14:16:30 -0000 1.4
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp 19 Dec 2003 14:00:39 -0000 1.5
@@ -1,6 +1,6 @@
\ 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.4 -r1.5
--- openacs-4/packages/simulation/www/simplay/control-bar.tcl 18 Dec 2003 09:58:28 -0000 1.4
+++ openacs-4/packages/simulation/www/simplay/control-bar.tcl 19 Dec 2003 14:00:39 -0000 1.5
@@ -5,6 +5,10 @@
set section_uri [apm_package_url_from_id $package_id]simplay/
set adminplayer_p [permission::permission_p -object_id $package_id -privilege sim_adminplayer]
+if { ![info exists case_id] } {
+ set case_id {}
+}
+
if { !$adminplayer_p } {
# TODO: constrain queries based on case_id, which (another TODO) should be passed in
}
@@ -38,6 +42,7 @@
and wcrmp.case_id = wcea.case_id
and wcrmp.role_id = wa.assigned_role
and wa.action_id = wcea.action_id
+ [ad_decode $case_id "" "" "and wcea.case_id = :case_id"]
"]
-set tasks_url ${section_uri}tasks
\ No newline at end of file
+set tasks_url [export_vars -base ${section_uri}tasks { case_id }]
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.2 -r1.3
--- openacs-4/packages/simulation/www/simplay/play-master.adp 19 Dec 2003 13:03:22 -0000 1.2
+++ openacs-4/packages/simulation/www/simplay/play-master.adp 19 Dec 2003 14:00:39 -0000 1.3
@@ -1,11 +1,12 @@
@title;noquote@
@context;noquote@
+ @focus;noquote@
|
-
+
|
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simplay/play-master.tcl 19 Dec 2003 14:00:39 -0000 1.1
@@ -0,0 +1,5 @@
+ad_page_contract {
+ Simplay master: Links to tasks, messages, etc.
+} {
+ {case_id:integer ""}
+}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/simplay/task-detail.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/simplay/task-detail.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/simplay/tasks.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/simplay/tasks.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
| |