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.9 -r1.10
--- openacs-4/contrib/packages/simulation/www/siminst/index.tcl	11 Dec 2003 15:48:32 -0000	1.9
+++ openacs-4/contrib/packages/simulation/www/siminst/index.tcl	12 Dec 2003 11:22:19 -0000	1.10
@@ -27,18 +27,22 @@
             orderby upper(w.pretty_name)
         }
         role_count {
-            link_url_col map_roles_url
             label "Roles"
+            link_url_col map_roles_url
+            display_template {
+                @dev_sims.role_count@ <if @dev_sims.role_empty_count@ gt 0>(@dev_sims.role_empty_count@ incomplete)</if>
+            }
         }
-        role_empty_count {
-            label "Roles without Characters"
-        }
         prop_count {
-            link_url_col map_tasks_url
             label "Props"
+            link_url_col map_props_url
+            display_template {
+                @dev_sims.prop_count@ <if @dev_sims.prop_empty_count@ gt 0>(@dev_sims.prop_empty_count@ incomplete)</if>
+            }
         }
-        prop_empty_count {
-            label "Missing props"
+        tasks {
+            label "Tasks"
+            link_url_col sim_tasks_url
         }
         delete {
             sub_class narrow
@@ -67,7 +71,7 @@
     set sim_in_dev_filter_sql "and ao.creation_user = :user_id"
 }
 
-db_multirow -extend { cast_url map_roles_url map_tasks_url delete_url } dev_sims select_dev_sims "
+db_multirow -extend { cast_url map_roles_url map_props_url sim_tasks_url delete_url } dev_sims select_dev_sims "
     select w.workflow_id,
            w.pretty_name,
            (select count(*) 
@@ -91,7 +95,10 @@
                    workflow_actions wa
              where stom.task_id = wa.action_id
                and wa.workflow_id = w.workflow_id
-               and stom.object_id is null) as prop_empty_count
+               and stom.object_id is null) as prop_empty_count,
+           (select count(*)
+              from workflow_actions wa
+             where wa.workflow_id = w.workflow_id) as tasks
       from workflows w,
            sim_simulations ss,
            acs_objects ao
@@ -103,7 +110,8 @@
 " {
     set cast_url [export_vars -base "${base_url}siminst/simulation-casting" { workflow_id }]
     set map_roles_url [export_vars -base "${base_url}siminst/map-characters" { workflow_id }]
-    set map_tasks_url [export_vars -base "${base_url}siminst/map-tasks" { workflow_id }]
+    set map_props_url [export_vars -base "${base_url}siminst/map-tasks" { workflow_id }]
+    set sim_tasks_url [export_vars -base "${base_url}siminst/sim-tasks" { workflow_id }]
     set delete_url [export_vars -base "${base_url}siminst/simulation-delete" { workflow_id }]
 }
 
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.3 -r1.4
--- openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl	11 Dec 2003 15:48:08 -0000	1.3
+++ openacs-4/contrib/packages/simulation/www/siminst/map-create.tcl	12 Dec 2003 11:22:19 -0000	1.4
@@ -9,12 +9,12 @@
 
 set user_id [auth::require_login]
 
-set page_title "Create Mapped Template"
+set page_title "Create Simulation from Template"
 set context [list [list "." "SimInst"] $page_title]
 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 "$old_name mapped by $user_array(name)"
+set name_default "New Simulation from template $old_name"
 
 ad_form \
     -name template \
Index: openacs-4/contrib/packages/simulation/www/siminst/sim-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/sim-tasks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/sim-tasks.adp	12 Dec 2003 11:22:19 -0000	1.1
@@ -0,0 +1,15 @@
+<master src="/packages/simulation/www/simulation-master">
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">template.pretty_name</property>
+
+TODO:
+<table border=1>
+<tr><td>Task1 name</td><td>Task 1 description field <br>text/html
+widget<br>spellcheck</td>
+</tr>
+<tr><td>Task2 name</td><td>Task 2 description field <br>text/html
+widget<br>spellcheck</td>
+</tr>
+</table>
+OK
\ No newline at end of file
Index: openacs-4/contrib/packages/simulation/www/siminst/sim-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/sim-tasks.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/siminst/sim-tasks.tcl	12 Dec 2003 11:22:20 -0000	1.1
@@ -0,0 +1,31 @@
+ad_page_contract {
+    Show all task descriptions for editing.
+
+    @author Joel Aufrecht
+} {
+    workflow_id:integer
+}
+
+set user_id [auth::require_login]
+
+set page_title "Edit Task Descriptions"
+set context [list [list "." "SimInst"] $page_title]
+set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name]
+acs_user::get -user_id $user_id -array user_array
+
+######################################################################
+#
+# tasks
+#
+# a form showing description for all tasks in a sim
+#
+# TODO: display mode doesn't exist yet - all display is through edit mode
+#
+######################################################################
+
+#---------------------------------------------------------------------
+# tasks form
+#---------------------------------------------------------------------
+
+
+
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?
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.9 -r1.10
--- openacs-4/packages/simulation/www/siminst/index.tcl	11 Dec 2003 15:48:32 -0000	1.9
+++ openacs-4/packages/simulation/www/siminst/index.tcl	12 Dec 2003 11:22:19 -0000	1.10
@@ -27,18 +27,22 @@
             orderby upper(w.pretty_name)
         }
         role_count {
-            link_url_col map_roles_url
             label "Roles"
+            link_url_col map_roles_url
+            display_template {
+                @dev_sims.role_count@ <if @dev_sims.role_empty_count@ gt 0>(@dev_sims.role_empty_count@ incomplete)</if>
+            }
         }
-        role_empty_count {
-            label "Roles without Characters"
-        }
         prop_count {
-            link_url_col map_tasks_url
             label "Props"
+            link_url_col map_props_url
+            display_template {
+                @dev_sims.prop_count@ <if @dev_sims.prop_empty_count@ gt 0>(@dev_sims.prop_empty_count@ incomplete)</if>
+            }
         }
-        prop_empty_count {
-            label "Missing props"
+        tasks {
+            label "Tasks"
+            link_url_col sim_tasks_url
         }
         delete {
             sub_class narrow
@@ -67,7 +71,7 @@
     set sim_in_dev_filter_sql "and ao.creation_user = :user_id"
 }
 
-db_multirow -extend { cast_url map_roles_url map_tasks_url delete_url } dev_sims select_dev_sims "
+db_multirow -extend { cast_url map_roles_url map_props_url sim_tasks_url delete_url } dev_sims select_dev_sims "
     select w.workflow_id,
            w.pretty_name,
            (select count(*) 
@@ -91,7 +95,10 @@
                    workflow_actions wa
              where stom.task_id = wa.action_id
                and wa.workflow_id = w.workflow_id
-               and stom.object_id is null) as prop_empty_count
+               and stom.object_id is null) as prop_empty_count,
+           (select count(*)
+              from workflow_actions wa
+             where wa.workflow_id = w.workflow_id) as tasks
       from workflows w,
            sim_simulations ss,
            acs_objects ao
@@ -103,7 +110,8 @@
 " {
     set cast_url [export_vars -base "${base_url}siminst/simulation-casting" { workflow_id }]
     set map_roles_url [export_vars -base "${base_url}siminst/map-characters" { workflow_id }]
-    set map_tasks_url [export_vars -base "${base_url}siminst/map-tasks" { workflow_id }]
+    set map_props_url [export_vars -base "${base_url}siminst/map-tasks" { workflow_id }]
+    set sim_tasks_url [export_vars -base "${base_url}siminst/sim-tasks" { workflow_id }]
     set delete_url [export_vars -base "${base_url}siminst/simulation-delete" { workflow_id }]
 }
 
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.3 -r1.4
--- openacs-4/packages/simulation/www/siminst/map-create.tcl	11 Dec 2003 15:48:08 -0000	1.3
+++ openacs-4/packages/simulation/www/siminst/map-create.tcl	12 Dec 2003 11:22:19 -0000	1.4
@@ -9,12 +9,12 @@
 
 set user_id [auth::require_login]
 
-set page_title "Create Mapped Template"
+set page_title "Create Simulation from Template"
 set context [list [list "." "SimInst"] $page_title]
 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 "$old_name mapped by $user_array(name)"
+set name_default "New Simulation from template $old_name"
 
 ad_form \
     -name template \
Index: openacs-4/packages/simulation/www/siminst/sim-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/sim-tasks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/sim-tasks.adp	12 Dec 2003 11:22:19 -0000	1.1
@@ -0,0 +1,15 @@
+<master src="/packages/simulation/www/simulation-master">
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">template.pretty_name</property>
+
+TODO:
+<table border=1>
+<tr><td>Task1 name</td><td>Task 1 description field <br>text/html
+widget<br>spellcheck</td>
+</tr>
+<tr><td>Task2 name</td><td>Task 2 description field <br>text/html
+widget<br>spellcheck</td>
+</tr>
+</table>
+OK
\ No newline at end of file
Index: openacs-4/packages/simulation/www/siminst/sim-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/Attic/sim-tasks.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/siminst/sim-tasks.tcl	12 Dec 2003 11:22:20 -0000	1.1
@@ -0,0 +1,31 @@
+ad_page_contract {
+    Show all task descriptions for editing.
+
+    @author Joel Aufrecht
+} {
+    workflow_id:integer
+}
+
+set user_id [auth::require_login]
+
+set page_title "Edit Task Descriptions"
+set context [list [list "." "SimInst"] $page_title]
+set old_name [workflow::get_element -workflow_id $workflow_id -element pretty_name]
+acs_user::get -user_id $user_id -array user_array
+
+######################################################################
+#
+# tasks
+#
+# a form showing description for all tasks in a sim
+#
+# TODO: display mode doesn't exist yet - all display is through edit mode
+#
+######################################################################
+
+#---------------------------------------------------------------------
+# tasks form
+#---------------------------------------------------------------------
+
+
+
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?