Index: openacs-4/contrib/packages/simulation/lib/sim-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-objects.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 11 Dec 2003 13:21:52 -0000 1.10 +++ openacs-4/contrib/packages/simulation/lib/sim-objects.tcl 5 Jan 2004 10:31:40 -0000 1.11 @@ -9,6 +9,12 @@ allowed_values {edit display} default_value display } + orderby { + required_p 0 + } + type { + required_p 0 + } size { allowed_values {short long} default_value long @@ -61,7 +67,7 @@ set elements { object_type_pretty { label "Type" - orderby upper(ot.pretty_name) + orderby lower(ot.pretty_name) } title { label "Name" @@ -123,7 +129,10 @@ -name objects \ -multirow objects \ -actions $actions \ - -elements $elements + -elements $elements \ + -orderby { + default_value title,asc + } #--------------------------------------------------------------------- # database query Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.adp,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp 12 Nov 2003 14:51:16 -0000 1.3 +++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.adp 5 Jan 2004 10:31:40 -0000 1.4 @@ -1,2 +1,2 @@ -

+ Index: openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-tasks.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 17 Dec 2003 19:35:23 -0000 1.15 +++ openacs-4/contrib/packages/simulation/lib/sim-template-tasks.tcl 5 Jan 2004 10:31:40 -0000 1.16 @@ -53,7 +53,7 @@ } } lappend elements initialize { - label "Initialize" + label "Init" display_template { Initial action @@ -63,6 +63,7 @@ } html { align center } + sub_class narrow } lappend elements name { label "Name" @@ -114,18 +115,20 @@ lappend states $state_id } -lappend elements add_state { - label { -
- [export_vars -form { workflow_id}] - -
+# LARS: Add state button in header removed +if 0 { + lappend elements add_state { + label { +
+ [export_vars -form { workflow_id}] + +
+ } + display_template { } } - display_template { } } - lappend elements delete { sub_class narrow hide_p {[ad_decode $display_mode edit 0 1]} @@ -140,6 +143,7 @@ -name tasks \ -multirow tasks \ -no_data "No tasks in this Simulation Template" \ + -sub_class narrow \ -actions $actions \ -elements $elements Index: openacs-4/contrib/packages/simulation/www/citybuild/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/www/citybuild/index.adp 15 Dec 2003 15:28:21 -0000 1.4 +++ openacs-4/contrib/packages/simulation/www/citybuild/index.adp 5 Jan 2004 10:31:40 -0000 1.5 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ - +

@@ -12,11 +12,6 @@ @notification_widget;noquote@

-

- » View Map XML -

- -

- » Generate Map XML file and send notifications -

+ View Map XML + Generate Map XML file and send notifications
Index: openacs-4/contrib/packages/simulation/www/citybuild/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 17:24:32 -0000 1.4 +++ openacs-4/contrib/packages/simulation/www/citybuild/index.tcl 5 Jan 2004 10:31:41 -0000 1.5 @@ -4,8 +4,8 @@ @cvs-id $Id$ } { parent_id:optional - {orderby "title,asc"} - {type:optional} + orderby:optional + type:optional } set page_title "CityBuild" Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.adp,v diff -u -r1.12 -r1.13 --- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp 17 Dec 2003 19:24:45 -0000 1.12 +++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp 5 Jan 2004 10:31:41 -0000 1.13 @@ -7,9 +7,7 @@ -

- » Delete this template -

+ Delete this template

Roles

@@ -21,16 +19,12 @@

TODO: Allow reordering of roles, states, tasks.

-

TODO: should be only one Add a state button

TODO: Instead of initialize column and special task, UI should show an "initial state" radio button. The special initialize task should not appear in this list. -

- » Download a specification for this template -

- -

- » Start a simulation with this template -

+ + Download a specification for this template + + Start a simulation with this template +
-
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.12 -r1.13 --- openacs-4/contrib/packages/simulation/www/siminst/index.adp 18 Dec 2003 09:58:28 -0000 1.12 +++ openacs-4/contrib/packages/simulation/www/siminst/index.adp 5 Jan 2004 10:31:41 -0000 1.13 @@ -6,12 +6,12 @@

Simulations in Casting

-

- -

-

-Live Simulations + +

+Live Simulations + +

TODO: page for the admin to see the groups that are created, and change them

TODO: open enrollment UI for players 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.22 -r1.23 --- openacs-4/contrib/packages/simulation/www/siminst/index.tcl 19 Dec 2003 13:03:21 -0000 1.22 +++ openacs-4/contrib/packages/simulation/www/siminst/index.tcl 5 Jan 2004 10:31:41 -0000 1.23 @@ -20,6 +20,7 @@ -multirow dev_sims \ -actions "{New Simulation From Template} $add_url" \ -no_data "No Simulations are in Development" \ + -sub_class "narrow" \ -elements { pretty_name { link_url_col edit_url @@ -28,9 +29,7 @@ } description { label "Description" - display_template { - TODO: Description column - } + display_template {@dev_sims.description;noquote@} } role_count { @@ -81,6 +80,8 @@ db_multirow -extend { cast_url map_roles_url map_props_url sim_tasks_url delete_url prop_empty_count } dev_sims select_dev_sims " select w.workflow_id, w.pretty_name, + w.description, + w.description_mime_type, (select count(*) from sim_roles sr, workflow_roles wr @@ -114,6 +115,7 @@ and ss.sim_type = 'dev_sim' $sim_in_dev_filter_sql " { + set description [ad_html_text_convert -from $description_mime_type -maxlen 200 -- $description] set prop_empty_count [expr $prop_count - $prop_not_empty_count] if { [simulation::template::ready_for_casting_p -role_empty_count $role_empty_count -prop_empty_count $prop_empty_count] } { set cast_url [export_vars -base "${base_url}siminst/simulation-casting" { workflow_id return_url {[ad_return_url]}}] 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 -r1.5 -r1.6 --- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp 16 Dec 2003 14:16:30 -0000 1.5 +++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp 5 Jan 2004 10:31:41 -0000 1.6 @@ -4,4 +4,8 @@ +

+Back to simulation list + + 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.4 -r1.5 --- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl 19 Dec 2003 14:00:39 -0000 1.4 +++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.tcl 5 Jan 2004 10:31:41 -0000 1.5 @@ -24,13 +24,12 @@ sim_tasks st where a.workflow_id = :workflow_id and st.task_id = a.action_id + order by a.sort_order } { set description_html [ad_html_text_convert -maxlen 100 -from $description_mime_type -- $description] set prop_missing_count [expr $attachment_num - $prop_not_empty_count] } -# TODO: Honor description_mime_type, fancy truncate - template::list::create \ -name "tasks" \ -elements { @@ -45,9 +44,12 @@ attachment_num { label "Number of attachments" display_template {@tasks.attachment_num@} + hide_p 1 + html { align right } } prop_missing_count { label "Missing attachments" display_template {@tasks.prop_missing_count@} + html { align center } } } Index: openacs-4/packages/simulation/lib/sim-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-objects.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/simulation/lib/sim-objects.tcl 11 Dec 2003 13:21:52 -0000 1.10 +++ openacs-4/packages/simulation/lib/sim-objects.tcl 5 Jan 2004 10:31:40 -0000 1.11 @@ -9,6 +9,12 @@ allowed_values {edit display} default_value display } + orderby { + required_p 0 + } + type { + required_p 0 + } size { allowed_values {short long} default_value long @@ -61,7 +67,7 @@ set elements { object_type_pretty { label "Type" - orderby upper(ot.pretty_name) + orderby lower(ot.pretty_name) } title { label "Name" @@ -123,7 +129,10 @@ -name objects \ -multirow objects \ -actions $actions \ - -elements $elements + -elements $elements \ + -orderby { + default_value title,asc + } #--------------------------------------------------------------------- # database query Index: openacs-4/packages/simulation/lib/sim-template-tasks.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/simulation/lib/sim-template-tasks.adp 12 Nov 2003 14:51:16 -0000 1.3 +++ openacs-4/packages/simulation/lib/sim-template-tasks.adp 5 Jan 2004 10:31:40 -0000 1.4 @@ -1,2 +1,2 @@ -

+ Index: openacs-4/packages/simulation/lib/sim-template-tasks.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-tasks.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/simulation/lib/sim-template-tasks.tcl 17 Dec 2003 19:35:23 -0000 1.15 +++ openacs-4/packages/simulation/lib/sim-template-tasks.tcl 5 Jan 2004 10:31:40 -0000 1.16 @@ -53,7 +53,7 @@ } } lappend elements initialize { - label "Initialize" + label "Init" display_template { Initial action @@ -63,6 +63,7 @@ } html { align center } + sub_class narrow } lappend elements name { label "Name" @@ -114,18 +115,20 @@ lappend states $state_id } -lappend elements add_state { - label { -
- [export_vars -form { workflow_id}] - -
+# LARS: Add state button in header removed +if 0 { + lappend elements add_state { + label { +
+ [export_vars -form { workflow_id}] + +
+ } + display_template { } } - display_template { } } - lappend elements delete { sub_class narrow hide_p {[ad_decode $display_mode edit 0 1]} @@ -140,6 +143,7 @@ -name tasks \ -multirow tasks \ -no_data "No tasks in this Simulation Template" \ + -sub_class narrow \ -actions $actions \ -elements $elements Index: openacs-4/packages/simulation/www/citybuild/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simulation/www/citybuild/index.adp 15 Dec 2003 15:28:21 -0000 1.4 +++ openacs-4/packages/simulation/www/citybuild/index.adp 5 Jan 2004 10:31:40 -0000 1.5 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ - +

@@ -12,11 +12,6 @@ @notification_widget;noquote@

-

- » View Map XML -

- -

- » Generate Map XML file and send notifications -

+ View Map XML + Generate Map XML file and send notifications
Index: openacs-4/packages/simulation/www/citybuild/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/simulation/www/citybuild/index.tcl 2 Dec 2003 17:24:32 -0000 1.4 +++ openacs-4/packages/simulation/www/citybuild/index.tcl 5 Jan 2004 10:31:41 -0000 1.5 @@ -4,8 +4,8 @@ @cvs-id $Id$ } { parent_id:optional - {orderby "title,asc"} - {type:optional} + orderby:optional + type:optional } set page_title "CityBuild" Index: openacs-4/packages/simulation/www/simbuild/template-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/simulation/www/simbuild/template-edit.adp 17 Dec 2003 19:24:45 -0000 1.12 +++ openacs-4/packages/simulation/www/simbuild/template-edit.adp 5 Jan 2004 10:31:41 -0000 1.13 @@ -7,9 +7,7 @@ -

- » Delete this template -

+ Delete this template

Roles

@@ -21,16 +19,12 @@

TODO: Allow reordering of roles, states, tasks.

-

TODO: should be only one Add a state button

TODO: Instead of initialize column and special task, UI should show an "initial state" radio button. The special initialize task should not appear in this list. -

- » Download a specification for this template -

- -

- » Start a simulation with this template -

+ + Download a specification for this template + + Start a simulation with this template +
-
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.12 -r1.13 --- openacs-4/packages/simulation/www/siminst/index.adp 18 Dec 2003 09:58:28 -0000 1.12 +++ openacs-4/packages/simulation/www/siminst/index.adp 5 Jan 2004 10:31:41 -0000 1.13 @@ -6,12 +6,12 @@

Simulations in Casting

-

- -

-

-Live Simulations + +

+Live Simulations + +

TODO: page for the admin to see the groups that are created, and change them

TODO: open enrollment UI for players 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.22 -r1.23 --- openacs-4/packages/simulation/www/siminst/index.tcl 19 Dec 2003 13:03:21 -0000 1.22 +++ openacs-4/packages/simulation/www/siminst/index.tcl 5 Jan 2004 10:31:41 -0000 1.23 @@ -20,6 +20,7 @@ -multirow dev_sims \ -actions "{New Simulation From Template} $add_url" \ -no_data "No Simulations are in Development" \ + -sub_class "narrow" \ -elements { pretty_name { link_url_col edit_url @@ -28,9 +29,7 @@ } description { label "Description" - display_template { - TODO: Description column - } + display_template {@dev_sims.description;noquote@} } role_count { @@ -81,6 +80,8 @@ db_multirow -extend { cast_url map_roles_url map_props_url sim_tasks_url delete_url prop_empty_count } dev_sims select_dev_sims " select w.workflow_id, w.pretty_name, + w.description, + w.description_mime_type, (select count(*) from sim_roles sr, workflow_roles wr @@ -114,6 +115,7 @@ and ss.sim_type = 'dev_sim' $sim_in_dev_filter_sql " { + set description [ad_html_text_convert -from $description_mime_type -maxlen 200 -- $description] set prop_empty_count [expr $prop_count - $prop_not_empty_count] if { [simulation::template::ready_for_casting_p -role_empty_count $role_empty_count -prop_empty_count $prop_empty_count] } { set cast_url [export_vars -base "${base_url}siminst/simulation-casting" { workflow_id return_url {[ad_return_url]}}] 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 -r1.5 -r1.6 --- openacs-4/packages/simulation/www/siminst/map-tasks.adp 16 Dec 2003 14:16:30 -0000 1.5 +++ openacs-4/packages/simulation/www/siminst/map-tasks.adp 5 Jan 2004 10:31:41 -0000 1.6 @@ -4,4 +4,8 @@ +

+Back to simulation list + + 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.4 -r1.5 --- openacs-4/packages/simulation/www/siminst/map-tasks.tcl 19 Dec 2003 14:00:39 -0000 1.4 +++ openacs-4/packages/simulation/www/siminst/map-tasks.tcl 5 Jan 2004 10:31:41 -0000 1.5 @@ -24,13 +24,12 @@ sim_tasks st where a.workflow_id = :workflow_id and st.task_id = a.action_id + order by a.sort_order } { set description_html [ad_html_text_convert -maxlen 100 -from $description_mime_type -- $description] set prop_missing_count [expr $attachment_num - $prop_not_empty_count] } -# TODO: Honor description_mime_type, fancy truncate - template::list::create \ -name "tasks" \ -elements { @@ -45,9 +44,12 @@ attachment_num { label "Number of attachments" display_template {@tasks.attachment_num@} + hide_p 1 + html { align right } } prop_missing_count { label "Missing attachments" display_template {@tasks.prop_missing_count@} + html { align center } } }