Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	9 Jan 2004 14:40:03 -0000	1.11
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	12 Jan 2004 09:23:10 -0000	1.12
@@ -26,7 +26,6 @@
         }
     }
 
-# TODO: remove duplicates from this query
 set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character]
 
 # Loop over all workflow roles and add a character select widget for each
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-casting-3.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp	8 Jan 2004 14:24:44 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.adp	12 Jan 2004 09:23:10 -0000	1.11
@@ -44,8 +44,9 @@
 
 </else>
 
-
-<P>TODO: Finish button should say "Done (Begin Casting)"
+<p>TODO: if enroll-type is open, show all groups from the subsite in
+each role
 <P>TODO: Number of users should by greater than 0.
+<p>TODO: auto-check all boxes by default
 
 
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-enrollment.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	9 Jan 2004 14:40:03 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	12 Jan 2004 09:23:10 -0000	1.5
@@ -39,13 +39,13 @@
 
     # Default values
     set one_month [expr 3600*24*31]
+    set one_week [expr 3600*24*7]
 
-    # TODO: provide more sensible default dates?
     if { [empty_string_p $enroll_start] } {
-        set enroll_start [clock format [expr [clock seconds] + 1*$one_month] -format "%Y-%m-%d"]
+        set enroll_start [clock format [expr [clock seconds]] -format "%Y-%m-%d"]
     }
     if { [empty_string_p $enroll_end] } {
-        set enroll_end [clock format [expr [clock seconds] + 2*$one_month] -format "%Y-%m-%d"]
+        set enroll_end [clock format [expr [clock seconds] + 2*$one_week] -format "%Y-%m-%d"]
     }
     if { [empty_string_p $enroll_type] } {
         set enroll_type "closed"
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-participants.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	9 Jan 2004 14:40:03 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	12 Jan 2004 09:23:10 -0000	1.5
@@ -1,10 +1,8 @@
-<UL>
-<li>Allow Registered users to self-enroll <input type="checkbox">
-</ul>
+<p>TODO: implement the enrollment type and optional enrollment date
+fields from simulation-enrollment.tcl
 <p>TODO: change invited/mandatory checkboxes to a single radio button
 set per row: invited/mandatory/none
 <formtemplate id="simulation">
-
   <listtemplate name="participants"></listtemplate>
 <a href="@group_admin_url@" class="action">Manage groups</a>
   <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
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.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl	9 Jan 2004 14:40:03 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl	12 Jan 2004 09:23:10 -0000	1.4
@@ -4,8 +4,6 @@
     workflow_id:integer
 }
 
-# TODO: implement the enrollment type and optional enrollment date fields from simulation-enrollment.tcl
-
 simulation::template::get -workflow_id $workflow_id -array sim_template
 
 set group_admin_url [export_vars -base "[subsite::get_element -element url]admin/group-types/one" { { group_type group } }]
Index: openacs-4/contrib/packages/simulation/www/simplay/cast.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/cast.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/cast.adp	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/cast.adp	12 Jan 2004 09:23:10 -0000	1.2
@@ -2,6 +2,10 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
+<p>Select a case (if casting type=group, then say, "and role") to join, or create a new case for yourself.  If you do not select a case to join, you will be automatically
+      assigned a case (... and role)
+      when the simulation begins.
+
   <table class="list" cellpadding="3" cellspacing="1">
       <tr class="list-header">
           <th class="list">
@@ -85,7 +89,6 @@
 </table>
 <bR><input type="submit" value="Be the first user in
       a new case">
-
 <p>
 If no rows, display this text: "There are no cases yet."
 <p>
Index: openacs-4/contrib/packages/simulation/www/simplay/enroll.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/enroll.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/enroll.adp	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/enroll.adp	12 Jan 2004 09:23:10 -0000	1.2
@@ -2,8 +2,9 @@
 
 Does enrollment and then displays results based on sim type
 <ul>
-<li><b>auto</b>    "You have been enrolled in simulation.name.  This
-simulation will begin on begin_date"
+<li><b>auto</b>    "You have been enrolled in simulation.name.  When
+the simulation begins on begin_date, you will receive an email
+notification (manage notification url)"
 <li><b>group</b> or <b>open</b>    Redirect to <a href="cast">cast</a>
 
 </ul>
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/map-characters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/simulation/www/siminst/map-characters.tcl	9 Jan 2004 14:40:03 -0000	1.11
+++ openacs-4/packages/simulation/www/siminst/map-characters.tcl	12 Jan 2004 09:23:10 -0000	1.12
@@ -26,7 +26,6 @@
         }
     }
 
-# TODO: remove duplicates from this query
 set character_options [simulation::object::get_object_type_options -null_label "" -object_type sim_character]
 
 # Loop over all workflow roles and add a character select widget for each
Index: openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp	8 Jan 2004 14:24:44 -0000	1.10
+++ openacs-4/packages/simulation/www/siminst/simulation-casting-3.adp	12 Jan 2004 09:23:10 -0000	1.11
@@ -44,8 +44,9 @@
 
 </else>
 
-
-<P>TODO: Finish button should say "Done (Begin Casting)"
+<p>TODO: if enroll-type is open, show all groups from the subsite in
+each role
 <P>TODO: Number of users should by greater than 0.
+<p>TODO: auto-check all boxes by default
 
 
Index: openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/simulation-enrollment.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	9 Jan 2004 14:40:03 -0000	1.4
+++ openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	12 Jan 2004 09:23:10 -0000	1.5
@@ -39,13 +39,13 @@
 
     # Default values
     set one_month [expr 3600*24*31]
+    set one_week [expr 3600*24*7]
 
-    # TODO: provide more sensible default dates?
     if { [empty_string_p $enroll_start] } {
-        set enroll_start [clock format [expr [clock seconds] + 1*$one_month] -format "%Y-%m-%d"]
+        set enroll_start [clock format [expr [clock seconds]] -format "%Y-%m-%d"]
     }
     if { [empty_string_p $enroll_end] } {
-        set enroll_end [clock format [expr [clock seconds] + 2*$one_month] -format "%Y-%m-%d"]
+        set enroll_end [clock format [expr [clock seconds] + 2*$one_week] -format "%Y-%m-%d"]
     }
     if { [empty_string_p $enroll_type] } {
         set enroll_type "closed"
Index: openacs-4/packages/simulation/www/siminst/simulation-participants.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-participants.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/siminst/simulation-participants.adp	9 Jan 2004 14:40:03 -0000	1.4
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.adp	12 Jan 2004 09:23:10 -0000	1.5
@@ -1,10 +1,8 @@
-<UL>
-<li>Allow Registered users to self-enroll <input type="checkbox">
-</ul>
+<p>TODO: implement the enrollment type and optional enrollment date
+fields from simulation-enrollment.tcl
 <p>TODO: change invited/mandatory checkboxes to a single radio button
 set per row: invited/mandatory/none
 <formtemplate id="simulation">
-
   <listtemplate name="participants"></listtemplate>
 <a href="@group_admin_url@" class="action">Manage groups</a>
   <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
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.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/simulation-participants.tcl	9 Jan 2004 14:40:03 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.tcl	12 Jan 2004 09:23:10 -0000	1.4
@@ -4,8 +4,6 @@
     workflow_id:integer
 }
 
-# TODO: implement the enrollment type and optional enrollment date fields from simulation-enrollment.tcl
-
 simulation::template::get -workflow_id $workflow_id -array sim_template
 
 set group_admin_url [export_vars -base "[subsite::get_element -element url]admin/group-types/one" { { group_type group } }]
Index: openacs-4/packages/simulation/www/simplay/cast.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/cast.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/cast.adp	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/packages/simulation/www/simplay/cast.adp	12 Jan 2004 09:23:10 -0000	1.2
@@ -2,6 +2,10 @@
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
+<p>Select a case (if casting type=group, then say, "and role") to join, or create a new case for yourself.  If you do not select a case to join, you will be automatically
+      assigned a case (... and role)
+      when the simulation begins.
+
   <table class="list" cellpadding="3" cellspacing="1">
       <tr class="list-header">
           <th class="list">
@@ -85,7 +89,6 @@
 </table>
 <bR><input type="submit" value="Be the first user in
       a new case">
-
 <p>
 If no rows, display this text: "There are no cases yet."
 <p>
Index: openacs-4/packages/simulation/www/simplay/enroll.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/enroll.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/enroll.adp	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/packages/simulation/www/simplay/enroll.adp	12 Jan 2004 09:23:10 -0000	1.2
@@ -2,8 +2,9 @@
 
 Does enrollment and then displays results based on sim type
 <ul>
-<li><b>auto</b>    "You have been enrolled in simulation.name.  This
-simulation will begin on begin_date"
+<li><b>auto</b>    "You have been enrolled in simulation.name.  When
+the simulation begins on begin_date, you will receive an email
+notification (manage notification url)"
 <li><b>group</b> or <b>open</b>    Redirect to <a href="cast">cast</a>
 
 </ul>
\ No newline at end of file