Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:14:36 -0000	1.12
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:37:28 -0000	1.13
@@ -1,7 +1,9 @@
 You are <a href="@role.character_url@">@role.character_title@</a>
 (@role.role_pretty@)
 
-<img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
+<if @role.thumbnail_url@ not nil>
+  <img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
+</if>
 
 <p>
 
Index: openacs-4/contrib/packages/simulation/www/simplay/document-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/document-upload.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/simulation/www/simplay/document-upload.adp	5 Jan 2004 12:33:41 -0000	1.2
+++ openacs-4/contrib/packages/simulation/www/simplay/document-upload.adp	12 Jan 2004 15:37:28 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="/packages/simulation/www/simulation-master">
+<master src="play-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">@focus;noquote@</property>
Index: openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/document-upload.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl	12 Jan 2004 13:43:14 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/simplay/document-upload.tcl	12 Jan 2004 15:37:28 -0000	1.5
@@ -22,17 +22,7 @@
     {item_id:key}
 }
 
-if { [llength $role_options] > 1 } {
-    ad_form -extend -name document -form {
-        {role_id:text(select)
-            {label "Role"}
-            {options $role_options}
-        }
-    }
-    set focus "document.role_id"
-} else {
-    set focus "document.document_file"
-}
+set focus "document.document_file"
 
 ad_form -extend -name document -form {
     {document_file:file(file)
@@ -76,10 +66,6 @@
             -revision_id $revision_id \
             -status "live"
 
-        if { ![exists_and_not_null role_id] } {
-            set role_id [lindex [lindex $role_options 0] 1]
-        }
-
         set relation_tag "portfolio"
         db_dml add_document_to_portfolio {
             insert into sim_case_role_object_map
Index: openacs-4/contrib/packages/simulation/www/simplay/enroll.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/enroll.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/simulation/www/simplay/enroll.tcl	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/contrib/packages/simulation/www/simplay/enroll.tcl	12 Jan 2004 15:37:28 -0000	1.2
@@ -7,11 +7,11 @@
 }
 
 auth::require_login
-#TODO integrate sim title into page title
+# TODO (.25h): integrate sim title into page title
 set page_title "Enrollment complete"
 set context [list [list "." "SimPlay"] $page_title]
 
-# TODO: implement the pseudocode in this page
+# TODO (5h): implement the pseudocode in this page
 
 # verify that the user has permission to enroll:
 #    simulation is open enrollment OR
@@ -28,4 +28,4 @@
 #   :group casting
 #     redirect to cast
 #   :open casting
-#     redirect to cast
\ No newline at end of file
+#     redirect to cast
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.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/simplay/message.adp	12 Jan 2004 15:14:36 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/simplay/message.adp	12 Jan 2004 15:37:28 -0000	1.9
@@ -5,4 +5,4 @@
   
 <formtemplate id="message"></formtemplate>
 
-<P>TODO: add "select all" javascript checkbox for To field
+<P>TODO (0.5h): add "select all" javascript checkbox for To field -- add as separate 'inform' form element.</p>
Index: openacs-4/contrib/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/message.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/contrib/packages/simulation/www/simplay/message.tcl	12 Jan 2004 15:14:36 -0000	1.18
+++ openacs-4/contrib/packages/simulation/www/simplay/message.tcl	12 Jan 2004 15:37:28 -0000	1.19
@@ -10,7 +10,7 @@
     body_mime_type:optional
 }
 
-# TODO: store messages in a folder specific to the case
+# TODO (1h): Message should have parent_id be the object of the case, just like the workflow-case-log comments do
 
 set page_title "Message"
 set context [list [list "." "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] $page_title]
@@ -69,7 +69,6 @@
 ad_form \
     -name message \
     -edit_buttons { { Send ok } } \
-    -actions { { Reply reply } } \
     -export { case_id role_id } \
     -mode $form_mode \
     -form {
@@ -83,8 +82,6 @@
 
 if { [ad_form_new_p -key item_id] } {
     if { [llength $to_role_options] == 1 } {
-        set recipient_role_id [lindex [lindex $to_role_options 0] 1]
-
         ad_form -extend -name message -form {
             {recipient_role_id_inform:text(inform)
                 {label "To"}
@@ -170,6 +167,13 @@
     set subject $content(title)
     set body [template::util::richtext::create $content(text) $content(mime_type)]
 
+    if { $recipient_role_id == $role_id } {
+        form set_properties message -actions { { Reply reply } }
+    } else {
+        form set_properties message -actions { }
+    }
+
+
     set attachments_set_list [bcms::item::list_related_items \
                                   -revision live \
                                   -item_id $item_id \
Index: openacs-4/contrib/packages/simulation/www/simplay/messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/messages.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/simulation/www/simplay/messages.adp	12 Jan 2004 15:14:36 -0000	1.11
+++ openacs-4/contrib/packages/simulation/www/simplay/messages.adp	12 Jan 2004 15:37:28 -0000	1.12
@@ -4,7 +4,5 @@
 
 <include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
 
-<p>TODO: show sent messages as well
-
-<p>TODO: automatically create a Notification entry for each user per
+<p>TODO (1h): automatically create a Notification entry for each user per
 role, and show an add/remove link here
Index: openacs-4/contrib/packages/simulation/www/simplay/portfolio.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/portfolio.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/simulation/www/simplay/portfolio.adp	12 Jan 2004 15:14:36 -0000	1.4
+++ openacs-4/contrib/packages/simulation/www/simplay/portfolio.adp	12 Jan 2004 15:37:28 -0000	1.5
@@ -4,7 +4,3 @@
 
 <include src="/packages/simulation/lib/portfolio" case_id="@case_id@" role_id="@role_id@">
 
-<p>TODO: since simplay/case provides a list of portfolio items, this
-page is probably the detail page for a single item, or for adding an
-item.
-
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	12 Jan 2004 15:14:36 -0000	1.5
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	12 Jan 2004 15:37:28 -0000	1.6
@@ -6,9 +6,9 @@
 
 <formtemplate id="action"></formtemplate>
 
-<p>TODO: Task should be part of heading
+<p>TODO (0.25h): Task should be part of heading
 
-<p>TODO: description and "document"
+<p>TODO (0.5h): description and "document"
 link should be inline before the message form instead of being part of
 the form
 
Index: openacs-4/contrib/packages/simulation/www/simplay/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/tasks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/simulation/www/simplay/tasks.adp	12 Jan 2004 15:14:36 -0000	1.7
+++ openacs-4/contrib/packages/simulation/www/simplay/tasks.adp	12 Jan 2004 15:37:28 -0000	1.8
@@ -4,6 +4,6 @@
 
 <include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@">
 
-TODO: make sure to show all completed tasks (one reason is that this
+TODO (1h): make sure to show all completed tasks (one reason is that this
 is the only way to see documents that are part of tasks)
 
Index: openacs-4/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:14:36 -0000	1.12
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:37:28 -0000	1.13
@@ -1,7 +1,9 @@
 You are <a href="@role.character_url@">@role.character_title@</a>
 (@role.role_pretty@)
 
-<img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
+<if @role.thumbnail_url@ not nil>
+  <img src="@role.thumbnail_url@" width="@role.thumbnail_width@" height="@role.thumbnail_height@">
+</if>
 
 <p>
 
Index: openacs-4/packages/simulation/www/simplay/document-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/document-upload.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simulation/www/simplay/document-upload.adp	5 Jan 2004 12:33:41 -0000	1.2
+++ openacs-4/packages/simulation/www/simplay/document-upload.adp	12 Jan 2004 15:37:28 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="/packages/simulation/www/simulation-master">
+<master src="play-master">
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
   <property name="focus">@focus;noquote@</property>
Index: openacs-4/packages/simulation/www/simplay/document-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/document-upload.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/simplay/document-upload.tcl	12 Jan 2004 13:43:14 -0000	1.4
+++ openacs-4/packages/simulation/www/simplay/document-upload.tcl	12 Jan 2004 15:37:28 -0000	1.5
@@ -22,17 +22,7 @@
     {item_id:key}
 }
 
-if { [llength $role_options] > 1 } {
-    ad_form -extend -name document -form {
-        {role_id:text(select)
-            {label "Role"}
-            {options $role_options}
-        }
-    }
-    set focus "document.role_id"
-} else {
-    set focus "document.document_file"
-}
+set focus "document.document_file"
 
 ad_form -extend -name document -form {
     {document_file:file(file)
@@ -76,10 +66,6 @@
             -revision_id $revision_id \
             -status "live"
 
-        if { ![exists_and_not_null role_id] } {
-            set role_id [lindex [lindex $role_options 0] 1]
-        }
-
         set relation_tag "portfolio"
         db_dml add_document_to_portfolio {
             insert into sim_case_role_object_map
Index: openacs-4/packages/simulation/www/simplay/enroll.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/enroll.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simulation/www/simplay/enroll.tcl	8 Jan 2004 14:27:56 -0000	1.1
+++ openacs-4/packages/simulation/www/simplay/enroll.tcl	12 Jan 2004 15:37:28 -0000	1.2
@@ -7,11 +7,11 @@
 }
 
 auth::require_login
-#TODO integrate sim title into page title
+# TODO (.25h): integrate sim title into page title
 set page_title "Enrollment complete"
 set context [list [list "." "SimPlay"] $page_title]
 
-# TODO: implement the pseudocode in this page
+# TODO (5h): implement the pseudocode in this page
 
 # verify that the user has permission to enroll:
 #    simulation is open enrollment OR
@@ -28,4 +28,4 @@
 #   :group casting
 #     redirect to cast
 #   :open casting
-#     redirect to cast
\ No newline at end of file
+#     redirect to cast
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.8 -r1.9
--- openacs-4/packages/simulation/www/simplay/message.adp	12 Jan 2004 15:14:36 -0000	1.8
+++ openacs-4/packages/simulation/www/simplay/message.adp	12 Jan 2004 15:37:28 -0000	1.9
@@ -5,4 +5,4 @@
   
 <formtemplate id="message"></formtemplate>
 
-<P>TODO: add "select all" javascript checkbox for To field
+<P>TODO (0.5h): add "select all" javascript checkbox for To field -- add as separate 'inform' form element.</p>
Index: openacs-4/packages/simulation/www/simplay/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/message.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/simulation/www/simplay/message.tcl	12 Jan 2004 15:14:36 -0000	1.18
+++ openacs-4/packages/simulation/www/simplay/message.tcl	12 Jan 2004 15:37:28 -0000	1.19
@@ -10,7 +10,7 @@
     body_mime_type:optional
 }
 
-# TODO: store messages in a folder specific to the case
+# TODO (1h): Message should have parent_id be the object of the case, just like the workflow-case-log comments do
 
 set page_title "Message"
 set context [list [list "." "SimPlay"] [list [export_vars -base case { case_id role_id }] "Case"] $page_title]
@@ -69,7 +69,6 @@
 ad_form \
     -name message \
     -edit_buttons { { Send ok } } \
-    -actions { { Reply reply } } \
     -export { case_id role_id } \
     -mode $form_mode \
     -form {
@@ -83,8 +82,6 @@
 
 if { [ad_form_new_p -key item_id] } {
     if { [llength $to_role_options] == 1 } {
-        set recipient_role_id [lindex [lindex $to_role_options 0] 1]
-
         ad_form -extend -name message -form {
             {recipient_role_id_inform:text(inform)
                 {label "To"}
@@ -170,6 +167,13 @@
     set subject $content(title)
     set body [template::util::richtext::create $content(text) $content(mime_type)]
 
+    if { $recipient_role_id == $role_id } {
+        form set_properties message -actions { { Reply reply } }
+    } else {
+        form set_properties message -actions { }
+    }
+
+
     set attachments_set_list [bcms::item::list_related_items \
                                   -revision live \
                                   -item_id $item_id \
Index: openacs-4/packages/simulation/www/simplay/messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/messages.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/simulation/www/simplay/messages.adp	12 Jan 2004 15:14:36 -0000	1.11
+++ openacs-4/packages/simulation/www/simplay/messages.adp	12 Jan 2004 15:37:28 -0000	1.12
@@ -4,7 +4,5 @@
 
 <include src="/packages/simulation/lib/messages" user_id="@user_id@" case_id="@case_id@" role_id="@role_id@">
 
-<p>TODO: show sent messages as well
-
-<p>TODO: automatically create a Notification entry for each user per
+<p>TODO (1h): automatically create a Notification entry for each user per
 role, and show an add/remove link here
Index: openacs-4/packages/simulation/www/simplay/portfolio.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/portfolio.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simulation/www/simplay/portfolio.adp	12 Jan 2004 15:14:36 -0000	1.4
+++ openacs-4/packages/simulation/www/simplay/portfolio.adp	12 Jan 2004 15:37:28 -0000	1.5
@@ -4,7 +4,3 @@
 
 <include src="/packages/simulation/lib/portfolio" case_id="@case_id@" role_id="@role_id@">
 
-<p>TODO: since simplay/case provides a list of portfolio items, this
-page is probably the detail page for a single item, or for adding an
-item.
-
Index: openacs-4/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/simulation/www/simplay/task-detail.adp	12 Jan 2004 15:14:36 -0000	1.5
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp	12 Jan 2004 15:37:28 -0000	1.6
@@ -6,9 +6,9 @@
 
 <formtemplate id="action"></formtemplate>
 
-<p>TODO: Task should be part of heading
+<p>TODO (0.25h): Task should be part of heading
 
-<p>TODO: description and "document"
+<p>TODO (0.5h): description and "document"
 link should be inline before the message form instead of being part of
 the form
 
Index: openacs-4/packages/simulation/www/simplay/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/simulation/www/simplay/tasks.adp	12 Jan 2004 15:14:36 -0000	1.7
+++ openacs-4/packages/simulation/www/simplay/tasks.adp	12 Jan 2004 15:37:28 -0000	1.8
@@ -4,6 +4,6 @@
 
 <include src="/packages/simulation/lib/tasks" user_id="@user_id@" case_id="@case_id@">
 
-TODO: make sure to show all completed tasks (one reason is that this
+TODO (1h): make sure to show all completed tasks (one reason is that this
 is the only way to see documents that are part of tasks)