Index: openacs-4/contrib/packages/project-manager/www/add-edit-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-oracle.xql,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/contrib/packages/project-manager/www/add-edit-oracle.xql 22 Oct 2004 04:28:37 -0000 1.1.2.1 +++ openacs-4/contrib/packages/project-manager/www/add-edit-oracle.xql 16 Dec 2004 16:24:04 -0000 1.1.2.2 @@ -12,8 +12,8 @@ p.customer_id, p.status_id, p.logger_project, - to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date, - to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date, + to_char(p.planned_start_date,'YYYY-MM-DD') as planned_start_date, + to_char(p.planned_end_date,'YYYY-MM-DD') as planned_end_date, p.ongoing_p FROM pm_projectsx p WHERE p.item_id = :project_item_id and Index: openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit-postgresql.xql,v diff -u -N -r1.12 -r1.12.2.1 --- openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 12 Mar 2004 13:44:44 -0000 1.12 +++ openacs-4/contrib/packages/project-manager/www/add-edit-postgresql.xql 16 Dec 2004 16:24:04 -0000 1.12.2.1 @@ -13,8 +13,8 @@ p.customer_id, p.status_id, p.logger_project, - to_char(p.planned_start_date,'YYYY MM DD') as planned_start_date, - to_char(p.planned_end_date,'YYYY MM DD') as planned_end_date, + to_char(p.planned_start_date,'YYYY-MM-DD') as planned_start_date, + to_char(p.planned_end_date,'YYYY-MM-DD') as planned_end_date, p.ongoing_p FROM pm_projectsx p 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 -N -r1.16.2.4 -r1.16.2.5 --- openacs-4/contrib/packages/project-manager/www/add-edit.tcl 16 Sep 2004 19:35:52 -0000 1.16.2.4 +++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl 16 Dec 2004 16:22:53 -0000 1.16.2.5 @@ -112,19 +112,20 @@ {options {{"--- TBD ---" ""} [db_list_of_lists get_customer "select o.name, o.organization_id from organizations o order by o.name"]}} } - {planned_start_date:date,to_sql(linear_date) + {planned_start_date:text(text) {label "Starts"} - {value $planned_start_date} - {today} - {help} + {html {id sel1}} + {after_html { \[y-m-d \] + }} } - {planned_end_date:date,to_sql(linear_date) + {planned_end_date:text(text) {label "Deadline"} - {value $planned_end_date} - {today} - {help} + {html {id sel2}} + {after_html { \[y-m-d \] + }} } + {ongoing_p:text(select) {label "Project is ongoing?"} @@ -204,9 +205,13 @@ } set planned_end_date [util::date acquire clock [clock scan $planned_end_date]] - + set planned_end_date "[lindex $planned_end_date 0]-[lindex $planned_end_date 1]-[lindex $planned_end_date 2]" set planned_start_date [util::date acquire clock [clock scan $planned_start_date]] - + set planned_start_date "[lindex $planned_start_date 0]-[lindex $planned_start_date 1]-[lindex $planned_start_date 2]" + + + + } \ -new_data { @@ -264,7 +269,7 @@ # the new revision will not have any of the custom values in # it until it is edited. So we need to pull in these values set old_project_id $project_id - + set project_id [pm::project::edit \ -project_item_id $project_item_id \ -project_name $project_name \ Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-2.tcl,v diff -u -N -r1.1.2.5 -r1.1.2.6 --- openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 25 Nov 2004 01:16:07 -0000 1.1.2.5 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit-2.tcl 16 Dec 2004 16:22:53 -0000 1.1.2.6 @@ -41,8 +41,10 @@ {log_month:multiple ""} {log_day:multiple ""} {log_year:multiple ""} + {log_date:multiple ""} {log:array ""} {logger_variable:array ""} + {date:multiple ""} } -properties { } -validate { } -errors { @@ -61,20 +63,23 @@ set use_days_p [parameter::get -parameter "UseDayInsteadOfHour" -default "t"] foreach i $number { - - # set the dates correctly - set end_date_${i}(day) [lindex $end_date_day [expr $i -1]] - set end_date_${i}(month) [lindex $end_date_month [expr $i -1]] - set end_date_${i}(year) [lindex $end_date_year [expr $i - 1]] + set date_$i [split [lindex $date [expr $i-1]] "-"] + set end_date_${i}(day) [lindex [set date_$i] 2] + set end_date_${i}(month) [lindex [set date_$i] 1] + set end_date_${i}(year) [lindex [set date_$i] 0] set end_date_${i}(format) "" ad_page_contract_filter_proc_date end_date_$i end_date_$i - set log_date_${i}(day) [lindex $log_day [expr $i -1]] - set log_date_${i}(month) [lindex $log_month [expr $i -1]] - set log_date_${i}(year) [lindex $log_year [expr $i - 1]] - set log_date_${i}(format) "" + set log_date_$i [split [lindex $log_date [expr $i-1]] "-"] + + set log_date_${i}_day [lindex [set log_date_$i] 2] + set log_date_${i}_month [lindex [set log_date_$i] 1] + set log_date_${i}_year [lindex [set log_date_$i] 0] + set log_date_${i}_format "" + + ad_page_contract_filter_proc_date log_date_$i log_date_$i if {[string is true $use_days_p]} { @@ -173,7 +178,7 @@ -project_item_id $project_item_id($num) \ -update_status_p f \ -party_id $user_id \ - -timestamp_ansi [set log_date_${num}(date)] + -timestamp_ansi "[set log_date_${num}_year]-[set log_date_${num}_month]-[set log_date_${num}_day]" } # --------- @@ -187,7 +192,7 @@ -title $task_title($num) \ -description $description($num) \ -mime_type $description_mime_type($num) \ - -end_date [set end_date_${num}(date)] \ + -end_date "[set end_date_${num}(year)]-[set end_date_${num}(month)]-[set end_date_${num}(day)]"\ -percent_complete $percent_complete($num) \ -estimated_hours_work $estimated_hours_work($num) \ -estimated_hours_work_min $estimated_hours_work_min($num) \ @@ -288,7 +293,7 @@ -title $task_title($num) \ -description $description($num) \ -mime_type $description_mime_type($num) \ - -end_date [set end_date_${num}(date)] \ + -end_date "[set end_date_${num}(year)]-[set end_date_${num}(month)]-[set end_date_${num}(day)]"\ -percent_complete $percent_complete($num) \ -estimated_hours_work $estimated_hours_work($num) \ -estimated_hours_work_min $estimated_hours_work_min($num) \ Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.adp,v diff -u -N -r1.12.2.9 -r1.12.2.10 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 25 Nov 2004 01:16:07 -0000 1.12.2.9 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.adp 16 Dec 2004 16:22:53 -0000 1.12.2.10 @@ -219,7 +219,7 @@ Date: - @today_html;noquote@ + <%= [set today_html@tasks.task_item_id@] %> @@ -292,7 +292,6 @@   - 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 -N -r1.27.2.17 -r1.27.2.18 --- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 25 Nov 2004 01:16:07 -0000 1.27.2.17 +++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl 16 Dec 2004 16:22:53 -0000 1.27.2.18 @@ -35,6 +35,7 @@ } -errors { } + # --------------------------------------------------------------- # Set up # --------------------------------------------------------------- @@ -159,18 +160,21 @@ if {[string is true $edit_p]} { - set today_html [pm::task::today_html \ - -month_target log_month \ - -day_target log_day \ - -year_target log_year] +# set today_html [pm::task::today_html \ + \# -month_target log_month \ + \# -day_target log_day \ + \# -year_target log_year] + # ------- # EDITING # ------- set number 1 set total_number [llength $task_item_id] + + set deps [list] foreach task $task_item_id { if {[lsearch $deps $task_dependency($task)] == -1 && \ @@ -191,12 +195,16 @@ -project_item_id $this_project] set logger_variable_id [logger::project::get_primary_variable \ -project_id $logger_project] - - set end_date_html [pm::task::date_html \ - -selected_day $task_end_date_day($task) \ - -selected_month $task_end_date_month($task) \ - -selected_year $task_end_date_year($task)] + set today_date [db_string today "select to_date(sysdate,'YYYY-MM-DD') from dual"] + set today_html$task "
y-m-d " + #set end_date_html [pm::task::date_html \ + \# -selected_day $task_end_date_day($task) \ + \# -selected_month $task_end_date_month($task) \ + \# -selected_year $task_end_date_year($task)] + + set end_date_html "
y-m-d " + set assignee_html [pm::task::assignee_html \ -task_item_id $task \ -number $number] @@ -302,8 +310,12 @@ set new_tasks [llength $process_tasks] - set end_date_html [pm::task::date_html] +# set end_date_html [pm::task::date_html] + + set end_date_html "
y-m-d " + + set number 1 set total_number [llength $process_tasks] @@ -367,9 +379,11 @@ # NEW # --- - set end_date_html [pm::task::date_html] +set today_date [db_string today "select to_date(sysdate,'YYYY-MM-DD') from dual"] + # set end_date_html [pm::task::date_html] for {set i 1} {$i <= $new_tasks} {incr i} { + set end_date_html "
y-m-d " set assignee_html [pm::task::assignee_html \ -number $i]