Commit 7caf0bd2 authored by cosine's avatar cosine

- Enabled MS task dependency types during import and export

- Disabled anything except Finish-to-Start dependency in
  the GanttSchedulingController
- Still need to adapt display in GanttBarPanel
parent 74ef2370
...@@ -29,9 +29,18 @@ ad_proc -public im_timesheet_task_type_standard { } { return 9500 } ...@@ -29,9 +29,18 @@ ad_proc -public im_timesheet_task_type_standard { } { return 9500 }
# 9650-9699 Intranet Gantt Task Dependency Type # 9650-9699 Intranet Gantt Task Dependency Type
# #
# For GanttProject: # For GanttProject:
# Obsolete!
ad_proc -public im_timesheet_task_dependency_type_depends { } { return 9650 } ad_proc -public im_timesheet_task_dependency_type_depends { } { return 9650 }
ad_proc -public im_timesheet_task_dependency_type_subtask { } { return 9652 } ad_proc -public im_timesheet_task_dependency_type_subtask { } { return 9652 }
# Now using Microsoft Project type of dependencies
ad_proc -public im_timesheet_task_dependency_type_finish_to_finish { } { return 9660 }
ad_proc -public im_timesheet_task_dependency_type_finish_to_start { } { return 9662 }
ad_proc -public im_timesheet_task_dependency_type_start_to_finish { } { return 9664 }
ad_proc -public im_timesheet_task_dependency_type_start_to_start { } { return 9666 }
# #
# For MS-Project # For MS-Project
ad_proc -public im_timesheet_task_dependency_type_ff { } { return 9660 } ad_proc -public im_timesheet_task_dependency_type_ff { } { return 9660 }
......
...@@ -4,6 +4,7 @@ ad_page_contract { ...@@ -4,6 +4,7 @@ ad_page_contract {
task_id task_id
dependency_id dependency_id
return_url return_url
{ dependency_type_id 9662 }
} }
set current_user_id [auth::require_login] set current_user_id [auth::require_login]
...@@ -14,12 +15,11 @@ if {!$write} { ...@@ -14,12 +15,11 @@ if {!$write} {
} }
# Default is 9662 = FS (finish-to-start) dependency
db_dml insert_dependency " db_dml insert_dependency "
insert into im_timesheet_task_dependencies insert into im_timesheet_task_dependencies
(task_id_one, task_id_two, dependency_type_id) values (:task_id, :dependency_id, 9650) (task_id_one, task_id_two, dependency_type_id) values (:task_id, :dependency_id, :dependency_type_id)
" "
ad_returnredirect $return_url ad_returnredirect $return_url
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment