+ 
+ }
+}
+lappend elements initialize {
+ label "Initialize"
+ display_template {
+
+ 
+ ![\"Edit\"](\"/resources/acs-subsite/Edit16.gif\")
\${label_state_$state_id}" \
+ html { align center } \
+ display_template "
+ 
+
+ }
+}
+
template::list::create \
-name tasks \
-multirow tasks \
-no_data "No tasks in this Simulation Template" \
-actions $actions \
- -elements {
- edit {
- hide_p {[ad_decode $display_mode edit 0 1]}
- sub_class narrow
- link_url_col edit_url
- display_template {
-
- }
- }
- name {
- label "Name"
- display_col pretty_name
- link_url_col {[ad_decode $display_mode edit view_url ""]}
- }
- assigned_name {
- label "Assigned to"
- }
- recipient_name {
- label "Recipient"
- }
- delete {
- sub_class narrow
- hide_p {[ad_decode $display_mode edit 0 1]}
- display_template {
-
-
-
- }
- }
- }
+ -elements $elements
#-------------------------------------------------------------
# tasks db_multirow
#-------------------------------------------------------------
-# TODO: fix this so it returns rows when it should
-set return_url "[ad_conn url]?[ad_conn query]"
-db_multirow -extend { edit_url view_url delete_url } tasks select_tasks "
+# TODO: fix this so it returns rows when it should
+
+set initial_action_id [workflow::get_element \
+ -workflow_id $workflow_id \
+ -element initial_action_id]
+
+set extend [list]
+lappend extend edit_url view_url delete_url initial_p set_initial_url
+
+foreach state_id $states {
+ lappend extend state_$state_id
+}
+
+array set enabled_in_state [list]
+
+# Ordering by assigned_p, so we get assigned states ('t') last
+db_foreach select_enabled_in_states {
+ select aeis.action_id,
+ aeis.state_id,
+ aeis.assigned_p
+ from workflow_actions a,
+ workflow_fsm_action_en_in_st aeis
+ where a.workflow_id = :workflow_id
+ and aeis.action_id = a.action_id
+ order by aeis.assigned_p
+} {
+ set enabled_in_state($action_id,$state_id) $assigned_p
+}
+
+ds_comment [array get enabled_in_state]
+
+
+db_multirow -extend $extend tasks select_tasks "
select wa.action_id,
wa.pretty_name,
(select pretty_name
@@ -92,15 +173,33 @@
(select pretty_name
from workflow_roles
where role_id = st.recipient) as recipient_name,
- wa.sort_order
+ wa.sort_order,
+ wa.always_enabled_p
from workflow_actions wa,
sim_tasks st
where wa.workflow_id = :workflow_id
and st.task_id = wa.action_id
- order by lower(pretty_name)
+ order by wa.sort_order
" {
set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }]
set view_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }]
- set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-delete" { action_id return_url }]
+ set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-delete" { action_id {return_url [ad_return_url]} }]
+ set initial_p [string equal $initial_action_id $action_id]
+ set set_initial_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/initial-action-set" { action_id {return_url [ad_return_url]} }]
+
+ foreach state_id $states {
+ ds_comment "enabled_in_state($action_id,$state_id)"
+ if { [info exists enabled_in_state($action_id,$state_id)] } {
+ if { [template::util::is_true $enabled_in_state($action_id,$state_id)] } {
+ ds_comment "Assigned"
+ set state_$state_id assigned
+ ds_comment "set state_$state_id assigned -- $extend"
+ } else {
+ ds_comment "Enabled"
+ set state_$state_id enabled
+ ds_comment "set state_$state_id enabled -- $extend"
+ }
+ }
+ }
}
Index: openacs-4/contrib/packages/simulation/tcl/action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/action-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/tcl/action-procs.tcl 1 Dec 2003 10:16:56 -0000 1.2
+++ openacs-4/contrib/packages/simulation/tcl/action-procs.tcl 9 Dec 2003 15:58:12 -0000 1.3
@@ -10,61 +10,42 @@
ad_proc -public simulation::action::edit {
{-action_id:required}
- {-sort_order {}}
- {-short_name:required}
- {-pretty_name:required}
- {-pretty_past_tense {}}
- {-edit_fields {}}
- {-allowed_roles {}}
- {-assigned_role {}}
- {-privileges {}}
- {-enabled_states {}}
- {-assigned_states {}}
- {-new_state {}}
- {-callbacks {}}
- {-always_enabled_p f}
- {-initial_action_p f}
- {-recipient_role:required {}}
- {-description {}}
- {-description_mime_type {}}
+ {-workflow_id {}}
+ {-array:required}
+ {-internal:boolean}
} {
- Edit an action. Mostly a wrapper for fsm, plus some simulation-specific stuff.
+ Edit an action. Mostly a wrapper for FSM, plus some simulation-specific stuff.
} {
-
- # should call API, but API doesn't exist yet
- # deferring at the moment since we're only changing two fields in this
- # prototype UI anyway. But it would look like this:
-
- # workflow::action::fsm::edit \
- # -workflow_id $workflow_id
- # -short_name $name \
- # -pretty_name $name \
- # -assigned_role $assigned_role
-
+ upvar 1 $array org_row
+ array set row [array get org_row]
-
-
- set workflow_id [workflow::action::get_workflow_id -action_id $action_id]
-
-
-
db_transaction {
- foreach col { short_name pretty_name assigned_role description description_mime_type } {
- set action_array($col) [set $col]
+ if { [info exists row(recipient_role)] } {
+ set recipient_role_id [workflow::role::get_id \
+ -workflow_id $workflow_id \
+ -short_name $row(recipient_role)]
+
+ db_dml edit_sim_role {
+ update sim_tasks
+ set recipient = :recipient_role_id
+ where task_id = :action_id
+ }
+
+ unset row(recipient_role)
}
-
+
workflow::action::fsm::edit \
+ -internal \
-action_id $action_id \
- -array action_array
+ -workflow_id $workflow_id \
+ -array row
- set recipient_role_id [workflow::role::get_id -workflow_id $workflow_id -short_name $recipient_role]
- db_dml edit_sim_role {
- update sim_tasks
- set recipient = :recipient_role_id
- where task_id = :action_id
+ if { !$internal_p } {
+ workflow::definition_changed_handler -workflow_id $workflow_id
}
}
- workflow::definition_changed_handler -workflow_id $workflow_id
- workflow::action::flush_cache -workflow_id $workflow_id
+ if { !$internal_p } {
+ workflow::flush_cache -workflow_id $workflow_id
+ }
}
Index: openacs-4/contrib/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/template-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/tcl/template-procs.tcl 1 Dec 2003 10:16:56 -0000 1.6
+++ openacs-4/contrib/packages/simulation/tcl/template-procs.tcl 9 Dec 2003 15:58:12 -0000 1.7
@@ -33,16 +33,6 @@
-package_key $package_key \
-object_id $object_id]
- # TODO: this step should be rendered obsolete by updates to workflow
- # and then this step should be removed
- # create a dummy action with initial action setting because
- # workflow::get doesn't work on bare workflows
- workflow::action::fsm::new \
- -initial_action_p t \
- -workflow_id $workflow_id \
- -short_name "dummy action" \
- -pretty_name "dummy action"
-
insert_sim \
-workflow_id $workflow_id \
-ready_p $ready_p \
Index: openacs-4/contrib/packages/simulation/www/simbuild/initial-action-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/initial-action-set.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simbuild/initial-action-set.tcl 9 Dec 2003 15:58:13 -0000 1.1
@@ -0,0 +1,15 @@
+ad_page_contract {
+ Set the initial action of a workflow.
+} {
+ action_id:integer
+ return_url
+}
+
+set row(initial_action_p) 1
+
+workflow::action::edit \
+ -action_id $action_id \
+ -array row
+
+ad_returnredirect $return_url
+
Index: openacs-4/contrib/packages/simulation/www/simbuild/state-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/state-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simbuild/state-edit.adp 9 Dec 2003 15:58:13 -0000 1.1
@@ -0,0 +1,7 @@
+TODO: selecting task type refreshes form (as in ../citybuild/sim-objects)
-
AskInfo
-
GiveInfo
-
ReviewInfo
-
This is the master task editing form. For new tasks, we will -instead have a two-part sequence: 1, pick a task type, such as -"GiveInfo". 2) fill out certain pre-selected values relevant to that -task type. -
More info per task: MOCKUPS: -
| Task | -Min Completions | -Max Completions | -
|---|---|---|
| - - | -- | - |
| - - | -- | - |
| - | Task | -- | State | -
|---|---|---|---|
| - | - - | -Is Is not |
- - - | -
| and or |
- - - | -Is Is not |
- - - | -
| and or |
- - - | -> - >= - = - != - <= - < - | - - | -
TODO: Allow sorting of roles, (states), tasks.
-MOCKUP: workflow matrix -
| Talking to Client | Prepare Case | Submit -Case | ||
|---|---|---|---|---|
| Ask information from Other Client | X | |||
| Respond to Ask information | X | |||
| INtervene | X | X | X | |
TODO: Allow sorting of roles, states, tasks.
+ Index: openacs-4/packages/simulation/lib/sim-template-roles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-roles.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/simulation/lib/sim-template-roles.tcl 1 Dec 2003 10:16:56 -0000 1.8 +++ openacs-4/packages/simulation/lib/sim-template-roles.tcl 9 Dec 2003 15:58:12 -0000 1.9 @@ -64,7 +64,7 @@ wr.sort_order from workflow_roles wr where wr.workflow_id = :workflow_id - order by lower(pretty_name) + order by wr.sort_order " { set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/role-edit" { role_id }] set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/role-delete" { role_id return_url }] Index: openacs-4/packages/simulation/lib/sim-template-tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/simulation/lib/sim-template-tasks.tcl 1 Dec 2003 10:16:56 -0000 1.7 +++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl 9 Dec 2003 15:58:12 -0000 1.8 @@ -42,48 +42,129 @@ set actions "" } +set elements [list] +lappend elements edit { + hide_p {[ad_decode $display_mode edit 0 1]} + sub_class narrow + link_url_col edit_url + display_template { +
+ }
+}
+lappend elements initialize {
+ label "Initialize"
+ display_template {
+
+
+ \${label_state_$state_id}" \
+ html { align center } \
+ display_template "
+
+
+ }
+}
+
template::list::create \
-name tasks \
-multirow tasks \
-no_data "No tasks in this Simulation Template" \
-actions $actions \
- -elements {
- edit {
- hide_p {[ad_decode $display_mode edit 0 1]}
- sub_class narrow
- link_url_col edit_url
- display_template {
-
- }
- }
- name {
- label "Name"
- display_col pretty_name
- link_url_col {[ad_decode $display_mode edit view_url ""]}
- }
- assigned_name {
- label "Assigned to"
- }
- recipient_name {
- label "Recipient"
- }
- delete {
- sub_class narrow
- hide_p {[ad_decode $display_mode edit 0 1]}
- display_template {
-
-
-
- }
- }
- }
+ -elements $elements
#-------------------------------------------------------------
# tasks db_multirow
#-------------------------------------------------------------
-# TODO: fix this so it returns rows when it should
-set return_url "[ad_conn url]?[ad_conn query]"
-db_multirow -extend { edit_url view_url delete_url } tasks select_tasks "
+# TODO: fix this so it returns rows when it should
+
+set initial_action_id [workflow::get_element \
+ -workflow_id $workflow_id \
+ -element initial_action_id]
+
+set extend [list]
+lappend extend edit_url view_url delete_url initial_p set_initial_url
+
+foreach state_id $states {
+ lappend extend state_$state_id
+}
+
+array set enabled_in_state [list]
+
+# Ordering by assigned_p, so we get assigned states ('t') last
+db_foreach select_enabled_in_states {
+ select aeis.action_id,
+ aeis.state_id,
+ aeis.assigned_p
+ from workflow_actions a,
+ workflow_fsm_action_en_in_st aeis
+ where a.workflow_id = :workflow_id
+ and aeis.action_id = a.action_id
+ order by aeis.assigned_p
+} {
+ set enabled_in_state($action_id,$state_id) $assigned_p
+}
+
+ds_comment [array get enabled_in_state]
+
+
+db_multirow -extend $extend tasks select_tasks "
select wa.action_id,
wa.pretty_name,
(select pretty_name
@@ -92,15 +173,33 @@
(select pretty_name
from workflow_roles
where role_id = st.recipient) as recipient_name,
- wa.sort_order
+ wa.sort_order,
+ wa.always_enabled_p
from workflow_actions wa,
sim_tasks st
where wa.workflow_id = :workflow_id
and st.task_id = wa.action_id
- order by lower(pretty_name)
+ order by wa.sort_order
" {
set edit_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }]
set view_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-edit" { action_id }]
- set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-delete" { action_id return_url }]
+ set delete_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/task-delete" { action_id {return_url [ad_return_url]} }]
+ set initial_p [string equal $initial_action_id $action_id]
+ set set_initial_url [export_vars -base "[apm_package_url_from_id $package_id]simbuild/initial-action-set" { action_id {return_url [ad_return_url]} }]
+
+ foreach state_id $states {
+ ds_comment "enabled_in_state($action_id,$state_id)"
+ if { [info exists enabled_in_state($action_id,$state_id)] } {
+ if { [template::util::is_true $enabled_in_state($action_id,$state_id)] } {
+ ds_comment "Assigned"
+ set state_$state_id assigned
+ ds_comment "set state_$state_id assigned -- $extend"
+ } else {
+ ds_comment "Enabled"
+ set state_$state_id enabled
+ ds_comment "set state_$state_id enabled -- $extend"
+ }
+ }
+ }
}
Index: openacs-4/packages/simulation/tcl/action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/Attic/action-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/tcl/action-procs.tcl 1 Dec 2003 10:16:56 -0000 1.2
+++ openacs-4/packages/simulation/tcl/action-procs.tcl 9 Dec 2003 15:58:12 -0000 1.3
@@ -10,61 +10,42 @@
ad_proc -public simulation::action::edit {
{-action_id:required}
- {-sort_order {}}
- {-short_name:required}
- {-pretty_name:required}
- {-pretty_past_tense {}}
- {-edit_fields {}}
- {-allowed_roles {}}
- {-assigned_role {}}
- {-privileges {}}
- {-enabled_states {}}
- {-assigned_states {}}
- {-new_state {}}
- {-callbacks {}}
- {-always_enabled_p f}
- {-initial_action_p f}
- {-recipient_role:required {}}
- {-description {}}
- {-description_mime_type {}}
+ {-workflow_id {}}
+ {-array:required}
+ {-internal:boolean}
} {
- Edit an action. Mostly a wrapper for fsm, plus some simulation-specific stuff.
+ Edit an action. Mostly a wrapper for FSM, plus some simulation-specific stuff.
} {
-
- # should call API, but API doesn't exist yet
- # deferring at the moment since we're only changing two fields in this
- # prototype UI anyway. But it would look like this:
-
- # workflow::action::fsm::edit \
- # -workflow_id $workflow_id
- # -short_name $name \
- # -pretty_name $name \
- # -assigned_role $assigned_role
-
+ upvar 1 $array org_row
+ array set row [array get org_row]
-
-
- set workflow_id [workflow::action::get_workflow_id -action_id $action_id]
-
-
-
db_transaction {
- foreach col { short_name pretty_name assigned_role description description_mime_type } {
- set action_array($col) [set $col]
+ if { [info exists row(recipient_role)] } {
+ set recipient_role_id [workflow::role::get_id \
+ -workflow_id $workflow_id \
+ -short_name $row(recipient_role)]
+
+ db_dml edit_sim_role {
+ update sim_tasks
+ set recipient = :recipient_role_id
+ where task_id = :action_id
+ }
+
+ unset row(recipient_role)
}
-
+
workflow::action::fsm::edit \
+ -internal \
-action_id $action_id \
- -array action_array
+ -workflow_id $workflow_id \
+ -array row
- set recipient_role_id [workflow::role::get_id -workflow_id $workflow_id -short_name $recipient_role]
- db_dml edit_sim_role {
- update sim_tasks
- set recipient = :recipient_role_id
- where task_id = :action_id
+ if { !$internal_p } {
+ workflow::definition_changed_handler -workflow_id $workflow_id
}
}
- workflow::definition_changed_handler -workflow_id $workflow_id
- workflow::action::flush_cache -workflow_id $workflow_id
+ if { !$internal_p } {
+ workflow::flush_cache -workflow_id $workflow_id
+ }
}
Index: openacs-4/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/template-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/tcl/template-procs.tcl 1 Dec 2003 10:16:56 -0000 1.6
+++ openacs-4/packages/simulation/tcl/template-procs.tcl 9 Dec 2003 15:58:12 -0000 1.7
@@ -33,16 +33,6 @@
-package_key $package_key \
-object_id $object_id]
- # TODO: this step should be rendered obsolete by updates to workflow
- # and then this step should be removed
- # create a dummy action with initial action setting because
- # workflow::get doesn't work on bare workflows
- workflow::action::fsm::new \
- -initial_action_p t \
- -workflow_id $workflow_id \
- -short_name "dummy action" \
- -pretty_name "dummy action"
-
insert_sim \
-workflow_id $workflow_id \
-ready_p $ready_p \
Index: openacs-4/packages/simulation/www/simbuild/initial-action-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/Attic/initial-action-set.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simbuild/initial-action-set.tcl 9 Dec 2003 15:58:13 -0000 1.1
@@ -0,0 +1,15 @@
+ad_page_contract {
+ Set the initial action of a workflow.
+} {
+ action_id:integer
+ return_url
+}
+
+set row(initial_action_p) 1
+
+workflow::action::edit \
+ -action_id $action_id \
+ -array row
+
+ad_returnredirect $return_url
+
Index: openacs-4/packages/simulation/www/simbuild/state-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/state-edit.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simbuild/state-edit.adp 9 Dec 2003 15:58:13 -0000 1.1
@@ -0,0 +1,7 @@
+TODO: selecting task type refreshes form (as in ../citybuild/sim-objects)
-
AskInfo
-
GiveInfo
-
ReviewInfo
-
This is the master task editing form. For new tasks, we will -instead have a two-part sequence: 1, pick a task type, such as -"GiveInfo". 2) fill out certain pre-selected values relevant to that -task type. -
More info per task: MOCKUPS: -
| Task | -Min Completions | -Max Completions | -
|---|---|---|
| - - | -- | - |
| - - | -- | - |
| - | Task | -- | State | -
|---|---|---|---|
| - | - - | -Is Is not |
- - - | -
| and or |
- - - | -Is Is not |
- - - | -
| and or |
- - - | -> - >= - = - != - <= - < - | - - | -
TODO: Allow sorting of roles, (states), tasks.
-MOCKUP: workflow matrix -
| Talking to Client | Prepare Case | Submit -Case | ||
|---|---|---|---|---|
| Ask information from Other Client | X | |||
| Respond to Ask information | X | |||
| INtervene | X | X | X | |
TODO: Allow sorting of roles, states, tasks.
+