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 @@ -
- » View Map XML -
- - + View Map XML + Generate Map XML file and send notifications- » Delete this template -
+ Delete this templateTODO: 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 +
-
-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 @@
- » View Map XML -
- - + View Map XML + Generate Map XML file and send notifications- » Delete this template -
+ Delete this templateTODO: 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 +
-
-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 @@