Index: openacs-4/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/add-edit.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/project-manager/www/add-edit.tcl 7 Jul 2005 00:20:09 -0000 1.13
+++ openacs-4/packages/project-manager/www/add-edit.tcl 30 Jul 2005 00:26:33 -0000 1.14
@@ -49,6 +49,8 @@
set use_project_code_p [parameter::get -parameter "UseUserProjectCodesP" -default "1"]
set ongoing_by_default_p [parameter::get -parameter "OngoingByDefaultP" -default "f"]
+# daily?
+set daily_p [parameter::get -parameter "UseDayInsteadOfHour" -default "f"]
if {[exists_and_not_null project_item_id] && ![exists_and_not_null project_id]} {
set project_id [pm::project::get_project_id -project_item_id $project_item_id]
@@ -118,22 +120,39 @@
{after_html { \[d.m.y \]
}}
}
-
+
+
{planned_end_date:text(text)
{label "[_ project-manager.Deadline_1]"}
{html {id sel2}}
{after_html { \[d.m.y \]
}}
}
+ }
- {planned_end_time:date
+#------------------------
+# Check if the project will be handled on daily basis or will request hours and minutes
+#------------------------
+
+if { $daily_p } {
+ ad_form -extend -name add_edit -form {
+ {planned_end_time:text(hidden)
+ {value ""}
+ }
+ }
+} else {
+ ad_form -extend -name add_edit -form {
+ {planned_end_time:date
{label "[_ project-manager.Deadline_Time]"}
{value {[template::util::date::now]}}
{format {[lc_get formbuilder_time_format]}}
}
+ }
+}
-
- {ongoing_p:text(select)
+
+ad_form -extend -name add_edit -form {
+ {ongoing_p:text(select)
{label "[_ project-manager.Project_is_ongoing]"}
{options {{"[_ acs-kernel.common_no]" f} {"[_ acs-kernel.common_Yes]" t}}}
{value $ongoing_p}
@@ -315,6 +334,10 @@
ad_returnredirect -message "[_ project-manager.lt_Changes_to_project_sa]" "one?[export_url_vars project_id]"
# to add back in subproject support, should use
# compute_parent_status
- pm::project::compute_status $project_item_id
+ if { [parameter::get -parameter UseDayInsteadOfHour -default f]} {
+ pm::project::compute_status $project_item_id
+ } else {
+ pm::project::compute_status_mins $project_item_id
+ }
ad_script_abort
}