Index: openacs-4/contrib/packages/simulation/www/siminst/cast-actors.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-actors.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-actors.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,66 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<center>
+(this is just a mockup)
+<table width="60%">
+<tr><th>Role</th><th>Character</th><th>Actor(s)</th><th>In groups of</th></tr>
+<tr><td>Plaintiff</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</select>
+</td>
+</tr>
+<tr><td>Defendent</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+<tr><td>Judge</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+</table>
+</center>
+
+
+<p>
+  <a href="cast-complete?workflow_id=@workflow_id@">Instantiate</a>
+</p>
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-actors.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-actors.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-actors.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page where actors are chosen for the different
+    roles of a simulation. Part of the casting step
+    in the instantiation process.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Choose actors"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-complete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,25 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  Simulation instantiated.
+</p>
+
+<p>
+TODO:
+  <ul>
+    <li>For each valid entry in the csv list of users, create a record
+  in sim_party_sim_map.
+  <li>If we are auto-casting, call the auto-cast function to assign
+    all users to available roles.
+  <li>redirect to ../simplay/sim-case-list</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="../simplay/sim-case-list">Go to SimPlay list</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href=".">Return to SimInst start page</a>
+</p>
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-complete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-complete.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-complete.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page confirming that the casting step of
+    an instantiation is complete. The simulation
+    and simulation cases have been created.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Simulation Instantiated"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-edit.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+
+<formtemplate id="simulation"></formtemplate>
+
+<a href="cast-actors?workflow_id=@workflow_id@">choose actors</a>
Index: openacs-4/contrib/packages/simulation/www/siminst/cast-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/cast-edit.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/cast-edit.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,41 @@
+ad_page_contract {
+    Create/edit a simulation
+} {
+    workflow_id:integer
+}
+
+set page_title "Create/edit simulation"
+set context [list $page_title]
+set package_id [ad_conn package_id]
+
+ad_form -export { workflow_id } -name simulation \
+    -form {
+        {enroll_start 
+            {label "Enrollment start date"}
+        }
+        {enroll_end 
+            {label "Enrollment end date"}
+        }
+        {notification_date
+            {label "Date to send start notification"}
+        }
+        {case_start 
+            {label "Simulation start date"}
+        }
+        {case_end
+            {label "Simulation end date"}
+        }
+        {enroll_type
+            {label "Open Enrollment?"}
+        }
+        {casting_type
+            {label "Open casting?"}
+        }
+        {tools
+            {label "tools for enrollment and casting. (upload of user list csv, ... others?) TODO..."}
+        }    
+    } -on_submit {
+        # TODO (clone the template and create a new simulation record)
+        ad_returnredirect simulation-casting
+        ad_script_abort
+    }
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.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/siminst/index.adp	20 Nov 2003 12:57:00 -0000	1.5
+++ openacs-4/contrib/packages/simulation/www/siminst/index.adp	27 Nov 2003 16:43:36 -0000	1.6
@@ -2,9 +2,53 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<h4>Instantiate a template</h4>
-<listtemplate name="avail_templates"></listtemplate>
-<p><a href="simulation-edit">Mockup of next step</a>
+<h2>Templates Ready for Mapping</h2>
 
-<h4>Current simulations</h4>
-<include src="/packages/simulation/lib/simulations"/>
+<p>
+  <listtemplate name="avail_templates"></listtemplate>
+</p>
+
+<h2>Mapped Templates</h2>
+
+TODO...
+
+<h2>Current Simulations</h2>
+<p>
+  <include src="/packages/simulation/lib/simulations"/>
+</p>
+
+<h2>Help</h2>
+
+<p>
+  The process of creating a simulation form a simulation template is referred to as instantiation. The
+  instantiation process is divided into two steps:
+
+  <ol>
+
+    <p>
+      <li>
+
+        <b>Mapping</b> (Ready Template -> Mapped Template). Starting with
+      a ready (complete) simulation template, a copy (clone) is
+      created. This new template is then mapped to objects in the
+      CityBuild world, such as characters and properties.
+
+      </li>
+    </p>
+
+   <p>
+     <li>
+
+      <b>Casting</b> (Mapped Template -> Simulation). From a mapped simulation template, a copy (clone) is created,
+      and this new template becomes a simulation once it is connected to users in 
+      the real world and time frame and other properties of the simulation are specified. 
+      A simulation is subdivided into one or more simulation cases
+      that each have their own set of users and will execute independently of
+      eachother. A large class can thus be divided into smaller groups where each group
+      has its own simulation case to play in.
+
+     </li>
+   </p>
+
+  </ol>
+</p>
Index: openacs-4/contrib/packages/simulation/www/siminst/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/siminst/index.tcl	18 Nov 2003 12:19:39 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/siminst/index.tcl	27 Nov 2003 16:43:36 -0000	1.3
@@ -1,8 +1,8 @@
 ad_page_contract {
-    List active simulations.
+    The index page for SimInst
 }
 
-set page_title "Template Instantiation"
+set page_title "SimInst"
 set context [list $page_title]
 set package_id [ad_conn package_id]
 
@@ -36,9 +36,9 @@
         orderby min_number_of_human_roles
     }
     instantiate {
+        link_url_col inst_url
         display_template {
-            "Instantiate"
-            link_url_col inst_url
+            Start mapping process
         }
     }
 }
@@ -53,6 +53,7 @@
 # avail_templates multirow
 #---------------------------------------------------------------------
 
+# TODO: number_of_roles, min_number_of_human_roles
 db_multirow -extend {inst_url} avail_templates select_avail_templates "
 select workflow_id,
        suggested_duration,
@@ -62,8 +63,8 @@
   from sim_simulations ss,
        workflows w
  where ss.simulation_id = w.workflow_id
-   and w.package_key = :package_id
+   and w.object_id = :package_id
    and ready_p = 't'
 " {
-    set inst_url [export_vars -base "simulation-edit" { simulation_id }]
-}
\ No newline at end of file
+    set inst_url [export_vars -base "map-characters" { workflow_id }]
+}
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,65 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<center>
+(this is just a mockup)
+<table width="60%">
+<tr><th>Role</th><th>Character</th><th>Actor(s)</th><th>In groups of</th></tr>
+<tr><td>Plaintiff</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</select>
+</td>
+</tr>
+<tr><td>Defendent</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+<tr><td>Judge</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+</table>
+</center>
+
+<p>
+  <a href="map-tasks?workflow_id=@workflow_id@">Map to tasks</a>
+</p>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page for mapping roles of a simulation template
+    to characters in the CityBuild world. First page
+    of the mapping step.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Map to Characters"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/contrib/packages/simulation/www/siminst/map-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-complete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,11 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  <b>&raquo;</b> <a href="cast-edit?workflow_id=@workflow_id@">Proceed to Casting</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href=".">Finish and return to start page</a>
+</p>
Index: openacs-4/contrib/packages/simulation/www/siminst/map-complete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-complete.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-complete.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    Page confirming that the mapping - step one of the instantiation
+    process - has been completed. Ther user can proceed with
+    casting or finish at this point.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Mapping Completed"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  <a href="map-complete?workflow_id=@workflow_id@">Complete mapping</a>
+</p>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,10 @@
+ad_page_contract {
+    TODO...explain what this page is about
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Map to Tasks"
+set context [list [list "." "SimInst" ] $page_title]
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/siminst/simulation-casting-2.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/siminst/simulation-casting-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/contrib/packages/simulation/www/siminst/simulation-casting.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/siminst/simulation-casting.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/siminst/simulation-edit.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/siminst/simulation-edit.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/simulation/www/siminst/cast-actors.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-actors.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-actors.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,66 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<center>
+(this is just a mockup)
+<table width="60%">
+<tr><th>Role</th><th>Character</th><th>Actor(s)</th><th>In groups of</th></tr>
+<tr><td>Plaintiff</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</select>
+</td>
+</tr>
+<tr><td>Defendent</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+<tr><td>Judge</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+</table>
+</center>
+
+
+<p>
+  <a href="cast-complete?workflow_id=@workflow_id@">Instantiate</a>
+</p>
Index: openacs-4/packages/simulation/www/siminst/cast-actors.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-actors.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-actors.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page where actors are chosen for the different
+    roles of a simulation. Part of the casting step
+    in the instantiation process.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Choose actors"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/packages/simulation/www/siminst/cast-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-complete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,25 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  Simulation instantiated.
+</p>
+
+<p>
+TODO:
+  <ul>
+    <li>For each valid entry in the csv list of users, create a record
+  in sim_party_sim_map.
+  <li>If we are auto-casting, call the auto-cast function to assign
+    all users to available roles.
+  <li>redirect to ../simplay/sim-case-list</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="../simplay/sim-case-list">Go to SimPlay list</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href=".">Return to SimInst start page</a>
+</p>
Index: openacs-4/packages/simulation/www/siminst/cast-complete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-complete.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-complete.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page confirming that the casting step of
+    an instantiation is complete. The simulation
+    and simulation cases have been created.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Simulation Instantiated"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/packages/simulation/www/siminst/cast-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-edit.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+
+<formtemplate id="simulation"></formtemplate>
+
+<a href="cast-actors?workflow_id=@workflow_id@">choose actors</a>
Index: openacs-4/packages/simulation/www/siminst/cast-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/cast-edit.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/cast-edit.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,41 @@
+ad_page_contract {
+    Create/edit a simulation
+} {
+    workflow_id:integer
+}
+
+set page_title "Create/edit simulation"
+set context [list $page_title]
+set package_id [ad_conn package_id]
+
+ad_form -export { workflow_id } -name simulation \
+    -form {
+        {enroll_start 
+            {label "Enrollment start date"}
+        }
+        {enroll_end 
+            {label "Enrollment end date"}
+        }
+        {notification_date
+            {label "Date to send start notification"}
+        }
+        {case_start 
+            {label "Simulation start date"}
+        }
+        {case_end
+            {label "Simulation end date"}
+        }
+        {enroll_type
+            {label "Open Enrollment?"}
+        }
+        {casting_type
+            {label "Open casting?"}
+        }
+        {tools
+            {label "tools for enrollment and casting. (upload of user list csv, ... others?) TODO..."}
+        }    
+    } -on_submit {
+        # TODO (clone the template and create a new simulation record)
+        ad_returnredirect simulation-casting
+        ad_script_abort
+    }
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.5 -r1.6
--- openacs-4/packages/simulation/www/siminst/index.adp	20 Nov 2003 12:57:00 -0000	1.5
+++ openacs-4/packages/simulation/www/siminst/index.adp	27 Nov 2003 16:43:36 -0000	1.6
@@ -2,9 +2,53 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<h4>Instantiate a template</h4>
-<listtemplate name="avail_templates"></listtemplate>
-<p><a href="simulation-edit">Mockup of next step</a>
+<h2>Templates Ready for Mapping</h2>
 
-<h4>Current simulations</h4>
-<include src="/packages/simulation/lib/simulations"/>
+<p>
+  <listtemplate name="avail_templates"></listtemplate>
+</p>
+
+<h2>Mapped Templates</h2>
+
+TODO...
+
+<h2>Current Simulations</h2>
+<p>
+  <include src="/packages/simulation/lib/simulations"/>
+</p>
+
+<h2>Help</h2>
+
+<p>
+  The process of creating a simulation form a simulation template is referred to as instantiation. The
+  instantiation process is divided into two steps:
+
+  <ol>
+
+    <p>
+      <li>
+
+        <b>Mapping</b> (Ready Template -> Mapped Template). Starting with
+      a ready (complete) simulation template, a copy (clone) is
+      created. This new template is then mapped to objects in the
+      CityBuild world, such as characters and properties.
+
+      </li>
+    </p>
+
+   <p>
+     <li>
+
+      <b>Casting</b> (Mapped Template -> Simulation). From a mapped simulation template, a copy (clone) is created,
+      and this new template becomes a simulation once it is connected to users in 
+      the real world and time frame and other properties of the simulation are specified. 
+      A simulation is subdivided into one or more simulation cases
+      that each have their own set of users and will execute independently of
+      eachother. A large class can thus be divided into smaller groups where each group
+      has its own simulation case to play in.
+
+     </li>
+   </p>
+
+  </ol>
+</p>
Index: openacs-4/packages/simulation/www/siminst/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/siminst/index.tcl	18 Nov 2003 12:19:39 -0000	1.2
+++ openacs-4/packages/simulation/www/siminst/index.tcl	27 Nov 2003 16:43:36 -0000	1.3
@@ -1,8 +1,8 @@
 ad_page_contract {
-    List active simulations.
+    The index page for SimInst
 }
 
-set page_title "Template Instantiation"
+set page_title "SimInst"
 set context [list $page_title]
 set package_id [ad_conn package_id]
 
@@ -36,9 +36,9 @@
         orderby min_number_of_human_roles
     }
     instantiate {
+        link_url_col inst_url
         display_template {
-            "Instantiate"
-            link_url_col inst_url
+            Start mapping process
         }
     }
 }
@@ -53,6 +53,7 @@
 # avail_templates multirow
 #---------------------------------------------------------------------
 
+# TODO: number_of_roles, min_number_of_human_roles
 db_multirow -extend {inst_url} avail_templates select_avail_templates "
 select workflow_id,
        suggested_duration,
@@ -62,8 +63,8 @@
   from sim_simulations ss,
        workflows w
  where ss.simulation_id = w.workflow_id
-   and w.package_key = :package_id
+   and w.object_id = :package_id
    and ready_p = 't'
 " {
-    set inst_url [export_vars -base "simulation-edit" { simulation_id }]
-}
\ No newline at end of file
+    set inst_url [export_vars -base "map-characters" { workflow_id }]
+}
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-characters.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,65 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<center>
+(this is just a mockup)
+<table width="60%">
+<tr><th>Role</th><th>Character</th><th>Actor(s)</th><th>In groups of</th></tr>
+<tr><td>Plaintiff</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</select>
+</td>
+</tr>
+<tr><td>Defendent</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Automatic Agent</option>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+<tr><td>Judge</td><td>
+<select>
+  <option>Bob</option>
+  <option>Jianing (Lawfirm X)</option>
+  <option>Larry (Lawfirm Y)</option>
+</select>
+</td>
+<td><select>
+  <option>Student</option>
+  <option>TA</option>
+  <option>Professor</option>
+</select>
+</td>
+<td><input type="text" size="2" value="1"></input>
+</td>
+</tr>
+</table>
+</center>
+
+<p>
+  <a href="map-tasks?workflow_id=@workflow_id@">Map to tasks</a>
+</p>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-characters.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    The page for mapping roles of a simulation template
+    to characters in the CityBuild world. First page
+    of the mapping step.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Map to Characters"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/packages/simulation/www/siminst/map-complete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/map-complete.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-complete.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,11 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  <b>&raquo;</b> <a href="cast-edit?workflow_id=@workflow_id@">Proceed to Casting</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href=".">Finish and return to start page</a>
+</p>
Index: openacs-4/packages/simulation/www/siminst/map-complete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/map-complete.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-complete.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    Page confirming that the mapping - step one of the instantiation
+    process - has been completed. Ther user can proceed with
+    casting or finish at this point.
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Mapping Completed"
+set context [list [list "." "SimInst"] $page_title]
Index: openacs-4/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-tasks.adp	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<p>
+  <a href="map-complete?workflow_id=@workflow_id@">Complete mapping</a>
+</p>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl	27 Nov 2003 16:43:36 -0000	1.1
@@ -0,0 +1,10 @@
+ad_page_contract {
+    TODO...explain what this page is about
+
+    @author Peter Marklund
+} {
+    workflow_id:integer
+}
+
+set page_title "Map to Tasks"
+set context [list [list "." "SimInst" ] $page_title]
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/siminst/simulation-casting-2.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/siminst/simulation-casting-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/simulation/www/siminst/simulation-casting.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/siminst/simulation-casting.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/siminst/simulation-edit.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/siminst/simulation-edit.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?