Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 31 Jul 2003 20:11:41 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 2 Aug 2003 00:26:28 -0000 1.5 @@ -107,17 +107,17 @@ set peeraddr [ad_conn peeraddr] } -new_data { - db_exec_plsql new_project_item { *SQL* } + set project_id [db_exec_plsql new_project_item { *SQL* }] - ad_returnredirect "." + ad_returnredirect "one?[export_url_vars project_id]" ad_script_abort } -edit_data { - db_exec_plsql new_project_revision { *SQL* } + set project_id [db_exec_plsql new_project_revision { *SQL* }] } -after_submit { - ad_returnredirect "index" + ad_returnredirect "one?[export_url_vars project_id]" ad_script_abort } Index: openacs-4/contrib/packages/project-manager/www/one-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 30 Jul 2003 20:42:05 -0000 1.1 +++ openacs-4/contrib/packages/project-manager/www/one-postgresql.xql 2 Aug 2003 00:26:28 -0000 1.2 @@ -1,5 +1,16 @@ + + + SELECT + p.item_id + FROM + pm_projectsx p + WHERE + p.project_id = :project_id + + + SELECT @@ -12,15 +23,41 @@ p.deadline_scheduling, to_char(p.planned_start_date,'MM/DD/YYYY') as planned_start_date, to_char(p.planned_end_date,'MM/DD/YYYY') as planned_end_date, - p.ongoing_p + p.ongoing_p, + i.live_revision FROM - pm_projectsx p + pm_projectsx p, cr_items i WHERE p.item_id = :item_id and - p.project_id = :project_id + p.project_id = :project_id and + p.item_id = i.item_id + + + SELECT + p.item_id, + p.project_id, + p.project_name, + p.project_code, + p.goal, + p.description, + p.deadline_scheduling, + to_char(p.planned_start_date,'MM/DD/YYYY') as planned_start_date, + to_char(p.planned_end_date,'MM/DD/YYYY') as planned_end_date, + p.ongoing_p, + i.live_revision + FROM + pm_projectsx p, cr_items i + WHERE + p.item_id = :item_id and + p.item_id = i.item_id + ORDER BY + p.project_id desc + + + SELECT Index: openacs-4/contrib/packages/project-manager/www/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.adp,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/project-manager/www/one.adp 1 Aug 2003 20:51:04 -0000 1.5 +++ openacs-4/contrib/packages/project-manager/www/one.adp 2 Aug 2003 00:26:28 -0000 1.6 @@ -7,6 +7,14 @@ Add sub-project
Edit project + +

@project_name@

+ + +

(not current version, select live version below)

+ + + @@ -99,3 +107,37 @@
Tasks
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Version IDProjectCodeGoalDescriptionStart date (planned)End date (planned)Ongoing?
@versions.project_id@@versions.project_id@@versions.project_name@@versions.project_code@@versions.goal@@versions.description@@versions.planned_start_date@@versions.planned_end_date@@versions.ongoing_p@
Index: openacs-4/contrib/packages/project-manager/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/project-manager/www/one.tcl 31 Jul 2003 20:11:41 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/www/one.tcl 2 Aug 2003 00:26:28 -0000 1.5 @@ -5,6 +5,10 @@ @creation-date 2003-05-15 @cvs-id $Id$ + @return context_bar Context bar. + @return versions a multirow holding versions of the project + @return live_revision the project_id of the live_revision + @param project_name @param project_code @param project_folder_id @@ -17,14 +21,15 @@ } { - item_id:integer + item_id:integer,optional project_id:integer } -properties { context_bar:onevalue project_name:onevalue project_code:onevalue project_id:onevalue + live_revision:onevalue goal:onevalue description:onevalue deadline_scheduling:onevalue @@ -34,6 +39,13 @@ tasks:multirow write_p:onevalue create_p:onevalue + versions:multirow +} -validate { + item_id_exists { + if {![info exists item_id]} { + set item_id [db_string get_item_id { }] + } + } } # --------------------------------------------------------------- # @@ -55,6 +67,7 @@ db_multirow tasks project_tasks_query { } db_1row project_query { } +db_multirow versions project_versions { } ad_return_template Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 1 Aug 2003 20:51:04 -0000 1.4 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 2 Aug 2003 00:26:28 -0000 1.5 @@ -1,6 +1,6 @@ ad_page_contract { - Simple add/edit form for tasks + Add/edit form for tasks @author jader@bread.com @creation-date 2003-07-28 @@ -62,7 +62,11 @@ template::multirow append num $i } -set user_id [ad_maybe_redirect_for_registration] +#if {[info exists start_date]} { +# for {set i 1} {$i <= $number} {incr i} { +# ns_log Notice "Start_date: $start_date($i)" +# } +#} # the unique identifier for this package set package_id [ad_conn package_id] @@ -96,8 +100,6 @@ {value $number} } -} -select_query { - } -on_submit { set user_id [ad_conn user_id]