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.64 -r1.65
--- openacs-4/contrib/packages/simulation/tcl/template-procs.tcl 26 Jan 2004 16:07:22 -0000 1.64
+++ openacs-4/contrib/packages/simulation/tcl/template-procs.tcl 27 Jan 2004 09:58:43 -0000 1.65
@@ -620,7 +620,6 @@
and case_start < current_timestamp
}]
foreach simulation_id $simulations_to_start {
- ns_log Notice "pm debug starting simulation $simulation_id"
start -workflow_id $simulation_id
}
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-participants.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl 23 Jan 2004 13:18:43 -0000 1.10
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl 27 Jan 2004 09:58:43 -0000 1.11
@@ -4,12 +4,19 @@
workflow_id:integer
}
-# TODO (.5h): Dynamically change "Neither invited nor mandatory" to "Can self-enroll", or "Not participating" depending on the enrollment_type (open/closed)
-
permission::require_write_permission -object_id $workflow_id
simulation::template::get -workflow_id $workflow_id -array sim_template
+switch $sim_template(enroll_type) {
+ "closed" {
+ set neither_label "Not participating"
+ }
+ "open" {
+ set neither_label "Can self-enroll"
+ }
+}
+
set group_admin_url [export_vars -base "[subsite::get_element -element url]admin/group-types/one" { { group_type group } }]
set permission_group_name [simulation::permission_group_name]
@@ -77,7 +84,7 @@
n_users {
label "\# Users"
display_eval {[lc_numeric $n_users]}
- html { align right }
+ html { align center }
}
invited_p {
label "Invited"
@@ -94,7 +101,7 @@
html { align center }
}
neither {
- label "Neither invited nor mandatory"
+ label $neither_label
display_template {
<input name="__group_@participants.group_id@" value="neither" type="radio" <if @participants.group_radio@ eq "neither">checked="checked"</if>>
}
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.21 -r1.22
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl 22 Jan 2004 15:47:23 -0000 1.21
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl 27 Jan 2004 09:58:43 -0000 1.22
@@ -12,7 +12,7 @@
simulation::case::assert_user_may_play_role -case_id $case_id -role_id $role_id
-# TODO (1h): Message should have parent_id be the object of the case, just like the workflow-case-log comments do
+# TODO (1h): Lars. Message should have parent_id be the object of the case, just like the workflow-case-log comments do
set page_title "Message"
set context [list [list "." "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] $page_title]
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.12 -r1.13
--- openacs-4/contrib/packages/simulation/www/simplay/messages.adp 12 Jan 2004 15:37:28 -0000 1.12
+++ openacs-4/contrib/packages/simulation/www/simplay/messages.adp 27 Jan 2004 09:58:43 -0000 1.13
@@ -3,6 +3,3 @@
<property name="context">@context;noquote@</property>
<include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
-
-<p>TODO (1h): automatically create a Notification entry for each user per
-role, and show an add/remove link here
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.64 -r1.65
--- openacs-4/packages/simulation/tcl/template-procs.tcl 26 Jan 2004 16:07:22 -0000 1.64
+++ openacs-4/packages/simulation/tcl/template-procs.tcl 27 Jan 2004 09:58:43 -0000 1.65
@@ -620,7 +620,6 @@
and case_start < current_timestamp
}]
foreach simulation_id $simulations_to_start {
- ns_log Notice "pm debug starting simulation $simulation_id"
start -workflow_id $simulation_id
}
Index: openacs-4/packages/simulation/www/siminst/simulation-participants.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/www/siminst/simulation-participants.tcl 23 Jan 2004 13:18:43 -0000 1.10
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.tcl 27 Jan 2004 09:58:43 -0000 1.11
@@ -4,12 +4,19 @@
workflow_id:integer
}
-# TODO (.5h): Dynamically change "Neither invited nor mandatory" to "Can self-enroll", or "Not participating" depending on the enrollment_type (open/closed)
-
permission::require_write_permission -object_id $workflow_id
simulation::template::get -workflow_id $workflow_id -array sim_template
+switch $sim_template(enroll_type) {
+ "closed" {
+ set neither_label "Not participating"
+ }
+ "open" {
+ set neither_label "Can self-enroll"
+ }
+}
+
set group_admin_url [export_vars -base "[subsite::get_element -element url]admin/group-types/one" { { group_type group } }]
set permission_group_name [simulation::permission_group_name]
@@ -77,7 +84,7 @@
n_users {
label "\# Users"
display_eval {[lc_numeric $n_users]}
- html { align right }
+ html { align center }
}
invited_p {
label "Invited"
@@ -94,7 +101,7 @@
html { align center }
}
neither {
- label "Neither invited nor mandatory"
+ label $neither_label
display_template {
<input name="__group_@participants.group_id@" value="neither" type="radio" <if @participants.group_radio@ eq "neither">checked="checked"</if>>
}
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.21 -r1.22
--- openacs-4/packages/simulation/www/simplay/message.tcl 22 Jan 2004 15:47:23 -0000 1.21
+++ openacs-4/packages/simulation/www/simplay/message.tcl 27 Jan 2004 09:58:43 -0000 1.22
@@ -12,7 +12,7 @@
simulation::case::assert_user_may_play_role -case_id $case_id -role_id $role_id
-# TODO (1h): Message should have parent_id be the object of the case, just like the workflow-case-log comments do
+# TODO (1h): Lars. Message should have parent_id be the object of the case, just like the workflow-case-log comments do
set page_title "Message"
set context [list [list "." "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] $page_title]
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.12 -r1.13
--- openacs-4/packages/simulation/www/simplay/messages.adp 12 Jan 2004 15:37:28 -0000 1.12
+++ openacs-4/packages/simulation/www/simplay/messages.adp 27 Jan 2004 09:58:43 -0000 1.13
@@ -3,6 +3,3 @@
<property name="context">@context;noquote@</property>
<include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
-
-<p>TODO (1h): automatically create a Notification entry for each user per
-role, and show an add/remove link here