Index: openacs-4/contrib/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-templates.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 11:52:41 -0000	1.14
+++ openacs-4/contrib/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 14:40:03 -0000	1.15
@@ -53,7 +53,7 @@
                 }
             }
             name {
-                label "Name"
+                label "Template Name"
                 orderby upper(ot.pretty_name)
                 link_url_col view_url
             }
Index: openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/object-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 11:52:41 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 14:40:03 -0000	1.7
@@ -6,6 +6,9 @@
 <formtemplate id="object"></formtemplate>
 TODO: Show on map should be read-only unless user has "sim_set_map_p"
 priv on package_id
+<p>TODO: modify content field to allow uploading of non-text documents
+(word, etc), after which point content field should display as a
+hyperlink and a delete button (applies to all types)
 <p>TODO: suppress HTML cut-paste text for stylesheets
 <p>TODO: default Show in Directory to No
 <p>TODO: "Associated with 1" should say "Associated With"
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-edit.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 11:52:41 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 14:40:03 -0000	1.11
@@ -7,4 +7,5 @@
 TODO: If there are no states, show a message "This task cannot be
 fully developed because its workflow has no states" and link to add states
 <p>TODO: B: "add a state" option next to "next state" which adds a new
-state and selects it in the dropdown without losing form info
\ No newline at end of file
+state and selects it in the dropdown without losing form info
+<p>TODO: new task type: review documents.  (incomplete)
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl	9 Jan 2004 09:37:50 -0000	1.18
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.tcl	9 Jan 2004 14:40:03 -0000	1.19
@@ -181,8 +181,6 @@
 
 set spec_url [export_vars -base template-spec { workflow_id }]
 
-
-
 if { [exists_and_equal sim_template_array(sim_type) "dev_template"] } {
     set mark_ready_url [export_vars -base "template-sim-type-update" { workflow_id }]
 }
Index: openacs-4/contrib/packages/simulation/www/siminst/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/index.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/contrib/packages/simulation/www/siminst/index.adp	7 Jan 2004 12:22:40 -0000	1.14
+++ openacs-4/contrib/packages/simulation/www/siminst/index.adp	9 Jan 2004 14:40:03 -0000	1.15
@@ -7,13 +7,10 @@
 <listtemplate name="dev_sims"></listtemplate>
 <p></p>
 
-<h2>Simulations in Casting</h2>
-
-<listtemplate name="casting_sims"></listtemplate>
-<p></p>
-
 <a href="../simplay/" class="action">Live Simulations</a>
 
 
 <p>TODO: page for the admin to see the groups that are created, and change them
 <p>TODO: open enrollment UI for players
+<p>TODO: make sure dev_sims template shows all simulations, including
+those from Simulations in casting list
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	7 Jan 2004 16:27:35 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	9 Jan 2004 14:40:03 -0000	1.8
@@ -2,5 +2,5 @@
 <p>Select from existing characters or <a
 href="../citybuild/object-edit">add a new character</a> and refresh
 this page.  (TODO: make the link pre-set the form to character)
-<p><b>Template Description</b>: @description@
+<p><b>Template Description</b>: @description;noquote@
 
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.10 -r1.11
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	8 Jan 2004 16:14:04 -0000	1.10
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	9 Jan 2004 14:40:03 -0000	1.11
@@ -26,6 +26,7 @@
         }
     }
 
+# 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/map-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-create.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl	7 Jan 2004 12:22:40 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl	9 Jan 2004 14:40:03 -0000	1.8
@@ -14,14 +14,14 @@
 set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name]
 acs_user::get -user_id $user_id -array user_array
 
-set name_default "New Simulation from template $old_name"
+set name_default "New Simulation based on $old_name"
 
 ad_form \
     -name template \
     -export { workflow_id } \
     -form {
         {pretty_name:text
-            {label "Template name"}
+            {label "Simulation name"}
             {value $name_default}
             {html {size 60}}
             {help_text "Please choose a new name for your new simulation"}
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl	7 Jan 2004 16:27:35 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl	9 Jan 2004 14:40:03 -0000	1.9
@@ -14,7 +14,7 @@
         {workflow_id:integer(hidden) {value $workflow_id}}
     }
 
-set prop_options [simulation::object::get_object_type_options -object_type "sim_prop"]
+set prop_options [simulation::object::get_object_type_options -object_type "sim_prop" -null_label "--Not Yet Selected--"]
 
 set actions [list]
 
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-casting-3.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 16:27:35 -0000	1.15
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-3.tcl	9 Jan 2004 14:40:03 -0000	1.16
@@ -8,15 +8,19 @@
     workflow_id:integer
 }
 
+# TODO: auto-check all boxes
+# TODO: if enroll-type is open, show all groups from the subsite in each role
+
 set page_title "Set user casting rules"
 set context [list [list "." "SimInst"] $page_title]
 
 set form [list]
 
 lappend form {casting_type:text(radio)
     {label "Casting type"}
-    {options {{Automatic auto} {Group group} {Open open}}}
+    {options {{"Participants are <b>automatically</b> assigned cases and roles" auto} {"Participants choose their own cases" group} {"Participants choose cases and roles" open}}}
     {section "Casting type"}
+    {help_text "If participants have not selected groups or roles by the simulation start time, they are automatically assigned.  TODO: implement this"}
 }
 
 
@@ -37,7 +41,7 @@
     }
 
     lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
-                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> from these groups"] \
+                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> only from these groups"] \
                       {options $eligible_groups} \
                       [list section "\$role_${role_id}_pretty_name"]
                      ]
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-edit.tcl	8 Jan 2004 14:24:44 -0000	1.5
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-edit.tcl	9 Jan 2004 14:40:03 -0000	1.6
@@ -5,6 +5,7 @@
 }
 
 # TODO: finish implementing description field (I cut-paste from template-edit.tcl and may have left out stuff)
+# TODO: pre-populate the description with the template description
 
 simulation::template::get -workflow_id $workflow_id -array sim_template
 
@@ -27,6 +28,7 @@
         {html {cols 60 rows 8}}
         {help_text "This description is visible to users during enrollment."}
     }
+
 } -edit_request {
     set description [template::util::richtext::create $simulation(description) $simulation(description_mime_type)]
 } -on_request {
@@ -43,7 +45,7 @@
     # Default values
     set one_month [expr 3600*24*31]
 
-    # TODO: provide more sensible default dates?
+    # TODO: B: provide more sensible default dates?  1 week, 2 weeks, start date + suggested duration
     if { [empty_string_p $send_start_note_date] } {
         set send_start_note_date [clock format [expr [clock seconds] + 2*$one_month] -format "%Y-%m-%d"]
     }
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-enrollment.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.adp	6 Jan 2004 18:36:28 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.adp	9 Jan 2004 14:40:03 -0000	1.2
@@ -1,3 +1,12 @@
+There are three ways for a user to be enrolled in a
+simulation:
+<ul>
+<li>You can set groups of users to be <b>automatically
+enrolled</b> TODO: link to Tab 5?
+<li>You can <b>invite</b> groups of users to join.  TODO: link to
+whereever this is.
+<li>You can allow <b>self-enrollment</b>
+</ul>
 <formtemplate id="simulation"></formtemplate>
 
 <p>TODO B: When switching from open enrollment to "by invitation only" and back, the dates are lost -- see if we can avoid that.</p>
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.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 16:27:35 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-enrollment.tcl	9 Jan 2004 14:40:03 -0000	1.4
@@ -13,11 +13,11 @@
 #set eligible_groups [simulation::casting_groups -workflow_id $workflow_id]
 
 ad_form -export { workflow_id } -name simulation -form {
-    {enroll_type:text(radio)
+    {enroll_type:text(checkbox)
         {label "Enrollment type"}
-        {options {{"By invitation only" closed} {Open open}}}
+        {options {{"Allow self-enrollment" closed}}}
             {html {onChange "javascript:acs_FormRefresh('simulation');"}}
-        {help_text "With <b>Open</b> enrollment, any user can join during the enrollment period.  You can still directly enroll users and send invitations.  <br><b>By Invitation Only</b> prevents users from joining unless invited; you can still directly enroll users. "}
+        {help_text "If self-enrollment is allowed, this simulation will be publicly listed on the Simulation home page and anybody can enroll themself."}
     }
     {enroll_start:date,to_sql(ansi),from_sql(ansi),optional
         {label "Enrollment start date"}
Index: openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/simulation-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl	6 Jan 2004 14:56:42 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-new.tcl	9 Jan 2004 14:40:03 -0000	1.4
@@ -25,7 +25,7 @@
     -no_data "No templates are ready for mapping" \
     -elements {
         pretty_name {
-            label "Template"
+            label "Templates Ready for Use"
             orderby upper(w.pretty_name)
         }
         suggested_duration {
@@ -37,13 +37,8 @@
             orderby number_of_roles
             html { align center }
         }
-        min_number_of_human_roles {
-            label "Min \# of players"
-            orderby min_number_of_human_roles
-            html { align center }
-        }
         map {
-            label "Begin"
+            label ""
             link_url_col map_url
             display_template {
                 Begin Development
@@ -58,10 +53,7 @@
        pretty_name,
        (select count(*)
         from workflow_roles
-        where workflow_id = w.workflow_id) as number_of_roles,
-       (select count(*)
-        from workflow_roles
-        where workflow_id = w.workflow_id) as min_number_of_human_roles
+        where workflow_id = w.workflow_id) as number_of_roles
   from sim_simulations ss,
        workflows w
  where ss.simulation_id = w.workflow_id
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.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	8 Jan 2004 14:24:44 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.adp	9 Jan 2004 14:40:03 -0000	1.4
@@ -1,24 +1,18 @@
-
-
+<UL>
+<li>Allow Registered users to self-enroll <input type="checkbox">
+</ul>
+<p>TODO: change invited/mandatory checkboxes to a single radio button
+set per row: invited/mandatory/none
 <formtemplate id="simulation">
 
   <listtemplate name="participants"></listtemplate>
-
-  <p>TODO: figure out when to execute auto-enrollment (and update the
-  help text below).  choices:
-<ul>
-<li>When Finish is clicked in the wizard
-<li>When Next is clicked on this page
-<li>When "Perform Auto-enroll" button on this page is selected
-<li>When enrollment end date is reached (issue: may not always exist)
-<li>When sim start time is reached
-</ul>
+<a href="@group_admin_url@" class="action">Manage groups</a>
   <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
   <b>invitations</b> are sent, when this wizard is completed and
-  casting begins.</p>
+  casting begins.  TODO: implement this.</p>
 
   <formwidget id="wizard_submit_back"> <formwidget id="wizard_submit_next">
 
 </formtemplate>
 
-<a href="@group_admin_url@" class="action">Manage groups</a>
+
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.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl	7 Jan 2004 12:22:40 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/simulation-participants.tcl	9 Jan 2004 14:40:03 -0000	1.3
@@ -4,13 +4,12 @@
     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 } }]
 
-
-
 set permission_group_name [simulation::permission_group_name]
 
 set subsite_group_id [application_group::group_id_from_package_id \
@@ -80,10 +79,9 @@
                 </else>
             }
             html { align center }
-            hide_p {[ad_decode $sim_template(enroll_type) "closed" 1 0]}
         }
         auto_enroll_p {
-            label "Auto-Enroll"
+            label "Mandatory Participation"
             display_template {
                 <if @participants.auto_enroll_p@ true>
                   <input name="__auto_enroll_@participants.group_id@" value="t" type="checkbox" checked>
@@ -95,7 +93,6 @@
             html { align center }
         }
     }
-
 #                <formwidget id="auto_enroll_@participants.group_id@">
 
 wizard submit simulation -buttons { back next }
Index: openacs-4/contrib/packages/simulation/www/siminst/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/wizard.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 16:27:35 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/siminst/wizard.adp	9 Jan 2004 14:40:03 -0000	1.5
@@ -49,4 +49,15 @@
 <li>missing attachments (link to tab 2)
 <li>missing dates (link to tab 3)
 <li>groups that aren't cast to any roles (link to tab 6)
+</ul>
+<p>TODO: make sure that we are generating all of the notifications
+that we should:
+<li>When a user is enrolled, if casting type is open or group, send a
+notification with a link to the casting page
+<li>When a user is invited, send a link to the enrollment page
+<li>When simulation notification date is reached, send an email saying
+that the simulation will start at date X.  Include a link to
+simplay/about-sim (?? this requires case id)
+<li>When the simulation starts, send an email with a link to simplay
+with case_id
 </ul>
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/wizard.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl	8 Jan 2004 15:54:01 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/siminst/wizard.tcl	9 Jan 2004 14:40:03 -0000	1.9
@@ -9,12 +9,11 @@
 permission::require_write_permission -object_id $workflow_id
 
 wizard create siminst -steps {
-    1 -label "Roles" -url "map-characters"
-    2 -label "Tasks" -url "map-tasks"
-    3 -label "Settings" -url "simulation-edit"
-    4 -label "Enrollment" -url "simulation-enrollment"
-    5 -label "Participants" -url "simulation-participants"
-    6 -label "Casting" -url "simulation-casting-3"
+    1 -label "Settings" -url "simulation-edit"
+    2 -label "Roles" -url "map-characters"
+    3 -label "Tasks" -url "map-tasks"
+    4 -label "Participants" -url "simulation-participants"
+    5 -label "Casting" -url "simulation-casting-3"
 } -params {
     workflow_id
 }
@@ -24,12 +23,11 @@
 # TODO: B: Refactor wizard so that it uses titles from child pages if this next section are blank
 
 array set title {
-    1 "Assign Characters to Roles"
-    2 "Populate Tasks"
-    3 "Simulation Settings"
-    4 "Define Enrollment"
-    5 "Select Participants"
-    6 "Define Casting Rules"
+    1 "Simulation Settings"
+    2 "Assign Characters to Roles"
+    3 "Populate Tasks"
+    4 "Select Participants"
+    5 "Define Casting Rules"
 }
 
 wizard set_param workflow_id $workflow_id
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.17 -r1.18
--- openacs-4/contrib/packages/simulation/www/simplay/index.adp	8 Jan 2004 14:24:44 -0000	1.17
+++ openacs-4/contrib/packages/simulation/www/simplay/index.adp	9 Jan 2004 14:40:03 -0000	1.18
@@ -22,3 +22,4 @@
 </if>
 
 <p>TODO: how can a player access completed cases?</p>
+<P>TODO: all of simplay should require role_id</p>
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/simplay/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/packages/simulation/www/simplay/message.adp	7 Jan 2004 16:00:37 -0000	1.6
+++ openacs-4/contrib/packages/simulation/www/simplay/message.adp	9 Jan 2004 14:40:03 -0000	1.7
@@ -4,6 +4,7 @@
   <property name="focus">@focus;noquote@</property>
   
 <formtemplate id="message"></formtemplate>
+<P>TODO: From should always be read-only and show the current role.
 <p>TODO: Task should be part of heading
 <p>TODO: description and "document"
 link should be inline before the message form instead of being part of
@@ -13,3 +14,5 @@
 <p>TODO: fix problem that To: is blank in view mode
 <p>TODO: make attachments be read-only links in display mode, instead
 of showing checkboxes
+<p>TODO: fix bug that you can't add an attachment
+<P>TODO: add "select all" javascript checkbox for To field
Index: openacs-4/packages/simulation/lib/sim-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-templates.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 11:52:41 -0000	1.14
+++ openacs-4/packages/simulation/lib/sim-templates.tcl	9 Jan 2004 14:40:03 -0000	1.15
@@ -53,7 +53,7 @@
                 }
             }
             name {
-                label "Name"
+                label "Template Name"
                 orderby upper(ot.pretty_name)
                 link_url_col view_url
             }
Index: openacs-4/packages/simulation/www/citybuild/object-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/object-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 11:52:41 -0000	1.6
+++ openacs-4/packages/simulation/www/citybuild/object-edit.adp	9 Jan 2004 14:40:03 -0000	1.7
@@ -6,6 +6,9 @@
 <formtemplate id="object"></formtemplate>
 TODO: Show on map should be read-only unless user has "sim_set_map_p"
 priv on package_id
+<p>TODO: modify content field to allow uploading of non-text documents
+(word, etc), after which point content field should display as a
+hyperlink and a delete button (applies to all types)
 <p>TODO: suppress HTML cut-paste text for stylesheets
 <p>TODO: default Show in Directory to No
 <p>TODO: "Associated with 1" should say "Associated With"
Index: openacs-4/packages/simulation/www/simbuild/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-edit.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 11:52:41 -0000	1.10
+++ openacs-4/packages/simulation/www/simbuild/task-edit.adp	9 Jan 2004 14:40:03 -0000	1.11
@@ -7,4 +7,5 @@
 TODO: If there are no states, show a message "This task cannot be
 fully developed because its workflow has no states" and link to add states
 <p>TODO: B: "add a state" option next to "next state" which adds a new
-state and selects it in the dropdown without losing form info
\ No newline at end of file
+state and selects it in the dropdown without losing form info
+<p>TODO: new task type: review documents.  (incomplete)
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simbuild/template-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/simulation/www/simbuild/template-edit.tcl	9 Jan 2004 09:37:50 -0000	1.18
+++ openacs-4/packages/simulation/www/simbuild/template-edit.tcl	9 Jan 2004 14:40:03 -0000	1.19
@@ -181,8 +181,6 @@
 
 set spec_url [export_vars -base template-spec { workflow_id }]
 
-
-
 if { [exists_and_equal sim_template_array(sim_type) "dev_template"] } {
     set mark_ready_url [export_vars -base "template-sim-type-update" { workflow_id }]
 }
Index: openacs-4/packages/simulation/www/siminst/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/simulation/www/siminst/index.adp	7 Jan 2004 12:22:40 -0000	1.14
+++ openacs-4/packages/simulation/www/siminst/index.adp	9 Jan 2004 14:40:03 -0000	1.15
@@ -7,13 +7,10 @@
 <listtemplate name="dev_sims"></listtemplate>
 <p></p>
 
-<h2>Simulations in Casting</h2>
-
-<listtemplate name="casting_sims"></listtemplate>
-<p></p>
-
 <a href="../simplay/" class="action">Live Simulations</a>
 
 
 <p>TODO: page for the admin to see the groups that are created, and change them
 <p>TODO: open enrollment UI for players
+<p>TODO: make sure dev_sims template shows all simulations, including
+those from Simulations in casting list
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/siminst/map-characters.adp	7 Jan 2004 16:27:35 -0000	1.7
+++ openacs-4/packages/simulation/www/siminst/map-characters.adp	9 Jan 2004 14:40:03 -0000	1.8
@@ -2,5 +2,5 @@
 <p>Select from existing characters or <a
 href="../citybuild/object-edit">add a new character</a> and refresh
 this page.  (TODO: make the link pre-set the form to character)
-<p><b>Template Description</b>: @description@
+<p><b>Template Description</b>: @description;noquote@
 
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.10 -r1.11
--- openacs-4/packages/simulation/www/siminst/map-characters.tcl	8 Jan 2004 16:14:04 -0000	1.10
+++ openacs-4/packages/simulation/www/siminst/map-characters.tcl	9 Jan 2004 14:40:03 -0000	1.11
@@ -26,6 +26,7 @@
         }
     }
 
+# 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/map-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-create.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/siminst/map-create.tcl	7 Jan 2004 12:22:40 -0000	1.7
+++ openacs-4/packages/simulation/www/siminst/map-create.tcl	9 Jan 2004 14:40:03 -0000	1.8
@@ -14,14 +14,14 @@
 set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name]
 acs_user::get -user_id $user_id -array user_array
 
-set name_default "New Simulation from template $old_name"
+set name_default "New Simulation based on $old_name"
 
 ad_form \
     -name template \
     -export { workflow_id } \
     -form {
         {pretty_name:text
-            {label "Template name"}
+            {label "Simulation name"}
             {value $name_default}
             {html {size 60}}
             {help_text "Please choose a new name for your new simulation"}
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.8 -r1.9
--- openacs-4/packages/simulation/www/siminst/map-tasks.tcl	7 Jan 2004 16:27:35 -0000	1.8
+++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl	9 Jan 2004 14:40:03 -0000	1.9
@@ -14,7 +14,7 @@
         {workflow_id:integer(hidden) {value $workflow_id}}
     }
 
-set prop_options [simulation::object::get_object_type_options -object_type "sim_prop"]
+set prop_options [simulation::object::get_object_type_options -object_type "sim_prop" -null_label "--Not Yet Selected--"]
 
 set actions [list]
 
Index: openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl	7 Jan 2004 16:27:35 -0000	1.15
+++ openacs-4/packages/simulation/www/siminst/simulation-casting-3.tcl	9 Jan 2004 14:40:03 -0000	1.16
@@ -8,15 +8,19 @@
     workflow_id:integer
 }
 
+# TODO: auto-check all boxes
+# TODO: if enroll-type is open, show all groups from the subsite in each role
+
 set page_title "Set user casting rules"
 set context [list [list "." "SimInst"] $page_title]
 
 set form [list]
 
 lappend form {casting_type:text(radio)
     {label "Casting type"}
-    {options {{Automatic auto} {Group group} {Open open}}}
+    {options {{"Participants are <b>automatically</b> assigned cases and roles" auto} {"Participants choose their own cases" group} {"Participants choose cases and roles" open}}}
     {section "Casting type"}
+    {help_text "If participants have not selected groups or roles by the simulation start time, they are automatically assigned.  TODO: implement this"}
 }
 
 
@@ -37,7 +41,7 @@
     }
 
     lappend form [list parties_${role_id}:text(checkbox),multiple,optional \
-                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> from these groups"] \
+                      [list label "Cast <b>\$role_${role_id}_pretty_name</b> only from these groups"] \
                       {options $eligible_groups} \
                       [list section "\$role_${role_id}_pretty_name"]
                      ]
Index: openacs-4/packages/simulation/www/siminst/simulation-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/simulation/www/siminst/simulation-edit.tcl	8 Jan 2004 14:24:44 -0000	1.5
+++ openacs-4/packages/simulation/www/siminst/simulation-edit.tcl	9 Jan 2004 14:40:03 -0000	1.6
@@ -5,6 +5,7 @@
 }
 
 # TODO: finish implementing description field (I cut-paste from template-edit.tcl and may have left out stuff)
+# TODO: pre-populate the description with the template description
 
 simulation::template::get -workflow_id $workflow_id -array sim_template
 
@@ -27,6 +28,7 @@
         {html {cols 60 rows 8}}
         {help_text "This description is visible to users during enrollment."}
     }
+
 } -edit_request {
     set description [template::util::richtext::create $simulation(description) $simulation(description_mime_type)]
 } -on_request {
@@ -43,7 +45,7 @@
     # Default values
     set one_month [expr 3600*24*31]
 
-    # TODO: provide more sensible default dates?
+    # TODO: B: provide more sensible default dates?  1 week, 2 weeks, start date + suggested duration
     if { [empty_string_p $send_start_note_date] } {
         set send_start_note_date [clock format [expr [clock seconds] + 2*$one_month] -format "%Y-%m-%d"]
     }
Index: openacs-4/packages/simulation/www/siminst/simulation-enrollment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/simulation-enrollment.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/siminst/simulation-enrollment.adp	6 Jan 2004 18:36:28 -0000	1.1
+++ openacs-4/packages/simulation/www/siminst/simulation-enrollment.adp	9 Jan 2004 14:40:03 -0000	1.2
@@ -1,3 +1,12 @@
+There are three ways for a user to be enrolled in a
+simulation:
+<ul>
+<li>You can set groups of users to be <b>automatically
+enrolled</b> TODO: link to Tab 5?
+<li>You can <b>invite</b> groups of users to join.  TODO: link to
+whereever this is.
+<li>You can allow <b>self-enrollment</b>
+</ul>
 <formtemplate id="simulation"></formtemplate>
 
 <p>TODO B: When switching from open enrollment to "by invitation only" and back, the dates are lost -- see if we can avoid that.</p>
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.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	7 Jan 2004 16:27:35 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/simulation-enrollment.tcl	9 Jan 2004 14:40:03 -0000	1.4
@@ -13,11 +13,11 @@
 #set eligible_groups [simulation::casting_groups -workflow_id $workflow_id]
 
 ad_form -export { workflow_id } -name simulation -form {
-    {enroll_type:text(radio)
+    {enroll_type:text(checkbox)
         {label "Enrollment type"}
-        {options {{"By invitation only" closed} {Open open}}}
+        {options {{"Allow self-enrollment" closed}}}
             {html {onChange "javascript:acs_FormRefresh('simulation');"}}
-        {help_text "With <b>Open</b> enrollment, any user can join during the enrollment period.  You can still directly enroll users and send invitations.  <br><b>By Invitation Only</b> prevents users from joining unless invited; you can still directly enroll users. "}
+        {help_text "If self-enrollment is allowed, this simulation will be publicly listed on the Simulation home page and anybody can enroll themself."}
     }
     {enroll_start:date,to_sql(ansi),from_sql(ansi),optional
         {label "Enrollment start date"}
Index: openacs-4/packages/simulation/www/siminst/simulation-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/simulation-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/simulation-new.tcl	6 Jan 2004 14:56:42 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/simulation-new.tcl	9 Jan 2004 14:40:03 -0000	1.4
@@ -25,7 +25,7 @@
     -no_data "No templates are ready for mapping" \
     -elements {
         pretty_name {
-            label "Template"
+            label "Templates Ready for Use"
             orderby upper(w.pretty_name)
         }
         suggested_duration {
@@ -37,13 +37,8 @@
             orderby number_of_roles
             html { align center }
         }
-        min_number_of_human_roles {
-            label "Min \# of players"
-            orderby min_number_of_human_roles
-            html { align center }
-        }
         map {
-            label "Begin"
+            label ""
             link_url_col map_url
             display_template {
                 Begin Development
@@ -58,10 +53,7 @@
        pretty_name,
        (select count(*)
         from workflow_roles
-        where workflow_id = w.workflow_id) as number_of_roles,
-       (select count(*)
-        from workflow_roles
-        where workflow_id = w.workflow_id) as min_number_of_human_roles
+        where workflow_id = w.workflow_id) as number_of_roles
   from sim_simulations ss,
        workflows w
  where ss.simulation_id = w.workflow_id
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.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/simulation-participants.adp	8 Jan 2004 14:24:44 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.adp	9 Jan 2004 14:40:03 -0000	1.4
@@ -1,24 +1,18 @@
-
-
+<UL>
+<li>Allow Registered users to self-enroll <input type="checkbox">
+</ul>
+<p>TODO: change invited/mandatory checkboxes to a single radio button
+set per row: invited/mandatory/none
 <formtemplate id="simulation">
 
   <listtemplate name="participants"></listtemplate>
-
-  <p>TODO: figure out when to execute auto-enrollment (and update the
-  help text below).  choices:
-<ul>
-<li>When Finish is clicked in the wizard
-<li>When Next is clicked on this page
-<li>When "Perform Auto-enroll" button on this page is selected
-<li>When enrollment end date is reached (issue: may not always exist)
-<li>When sim start time is reached
-</ul>
+<a href="@group_admin_url@" class="action">Manage groups</a>
   <p class="form-help-text"><b>Auto-Enroll</b> takes effect, and
   <b>invitations</b> are sent, when this wizard is completed and
-  casting begins.</p>
+  casting begins.  TODO: implement this.</p>
 
   <formwidget id="wizard_submit_back"> <formwidget id="wizard_submit_next">
 
 </formtemplate>
 
-<a href="@group_admin_url@" class="action">Manage groups</a>
+
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.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/simulation-participants.tcl	7 Jan 2004 12:22:40 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/simulation-participants.tcl	9 Jan 2004 14:40:03 -0000	1.3
@@ -4,13 +4,12 @@
     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 } }]
 
-
-
 set permission_group_name [simulation::permission_group_name]
 
 set subsite_group_id [application_group::group_id_from_package_id \
@@ -80,10 +79,9 @@
                 </else>
             }
             html { align center }
-            hide_p {[ad_decode $sim_template(enroll_type) "closed" 1 0]}
         }
         auto_enroll_p {
-            label "Auto-Enroll"
+            label "Mandatory Participation"
             display_template {
                 <if @participants.auto_enroll_p@ true>
                   <input name="__auto_enroll_@participants.group_id@" value="t" type="checkbox" checked>
@@ -95,7 +93,6 @@
             html { align center }
         }
     }
-
 #                <formwidget id="auto_enroll_@participants.group_id@">
 
 wizard submit simulation -buttons { back next }
Index: openacs-4/packages/simulation/www/siminst/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/wizard.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/siminst/wizard.adp	7 Jan 2004 16:27:35 -0000	1.4
+++ openacs-4/packages/simulation/www/siminst/wizard.adp	9 Jan 2004 14:40:03 -0000	1.5
@@ -49,4 +49,15 @@
 <li>missing attachments (link to tab 2)
 <li>missing dates (link to tab 3)
 <li>groups that aren't cast to any roles (link to tab 6)
+</ul>
+<p>TODO: make sure that we are generating all of the notifications
+that we should:
+<li>When a user is enrolled, if casting type is open or group, send a
+notification with a link to the casting page
+<li>When a user is invited, send a link to the enrollment page
+<li>When simulation notification date is reached, send an email saying
+that the simulation will start at date X.  Include a link to
+simplay/about-sim (?? this requires case id)
+<li>When the simulation starts, send an email with a link to simplay
+with case_id
 </ul>
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/wizard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/wizard.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/www/siminst/wizard.tcl	8 Jan 2004 15:54:01 -0000	1.8
+++ openacs-4/packages/simulation/www/siminst/wizard.tcl	9 Jan 2004 14:40:03 -0000	1.9
@@ -9,12 +9,11 @@
 permission::require_write_permission -object_id $workflow_id
 
 wizard create siminst -steps {
-    1 -label "Roles" -url "map-characters"
-    2 -label "Tasks" -url "map-tasks"
-    3 -label "Settings" -url "simulation-edit"
-    4 -label "Enrollment" -url "simulation-enrollment"
-    5 -label "Participants" -url "simulation-participants"
-    6 -label "Casting" -url "simulation-casting-3"
+    1 -label "Settings" -url "simulation-edit"
+    2 -label "Roles" -url "map-characters"
+    3 -label "Tasks" -url "map-tasks"
+    4 -label "Participants" -url "simulation-participants"
+    5 -label "Casting" -url "simulation-casting-3"
 } -params {
     workflow_id
 }
@@ -24,12 +23,11 @@
 # TODO: B: Refactor wizard so that it uses titles from child pages if this next section are blank
 
 array set title {
-    1 "Assign Characters to Roles"
-    2 "Populate Tasks"
-    3 "Simulation Settings"
-    4 "Define Enrollment"
-    5 "Select Participants"
-    6 "Define Casting Rules"
+    1 "Simulation Settings"
+    2 "Assign Characters to Roles"
+    3 "Populate Tasks"
+    4 "Select Participants"
+    5 "Define Casting Rules"
 }
 
 wizard set_param workflow_id $workflow_id
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.17 -r1.18
--- openacs-4/packages/simulation/www/simplay/index.adp	8 Jan 2004 14:24:44 -0000	1.17
+++ openacs-4/packages/simulation/www/simplay/index.adp	9 Jan 2004 14:40:03 -0000	1.18
@@ -22,3 +22,4 @@
 </if>
 
 <p>TODO: how can a player access completed cases?</p>
+<P>TODO: all of simplay should require role_id</p>
\ No newline at end of file
Index: openacs-4/packages/simulation/www/simplay/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simulation/www/simplay/message.adp	7 Jan 2004 16:00:37 -0000	1.6
+++ openacs-4/packages/simulation/www/simplay/message.adp	9 Jan 2004 14:40:03 -0000	1.7
@@ -4,6 +4,7 @@
   <property name="focus">@focus;noquote@</property>
   
 <formtemplate id="message"></formtemplate>
+<P>TODO: From should always be read-only and show the current role.
 <p>TODO: Task should be part of heading
 <p>TODO: description and "document"
 link should be inline before the message form instead of being part of
@@ -13,3 +14,5 @@
 <p>TODO: fix problem that To: is blank in view mode
 <p>TODO: make attachments be read-only links in display mode, instead
 of showing checkboxes
+<p>TODO: fix bug that you can't add an attachment
+<P>TODO: add "select all" javascript checkbox for To field