Commit 30ec2b10 authored by cosine's avatar cosine

- Enabled deletion of dependencies from the PropertyPanel

- Now showing and converting lags according to the lag format
- Extended im_timesheet_task_dependencies by diff_format_id
  and created  categories for representing lag formats
- Fixed saving and loading dependencies in REST
  /intranet-rest-data-source-procs.tcl and
  project-task-tree.json.tcl
parent def6632b
......@@ -303,6 +303,7 @@ ad_proc im_rest_project_task_tree_predecessors {
set succ_id $object_hash(succ_id)
set type_id $object_hash(type_id)
set diff $object_hash(diff)
set diff_format_id $object_hash(diff_format_id)
# Create a list of all predecessor tasks
lappend pred_list $pred_id
......@@ -320,9 +321,9 @@ ad_proc im_rest_project_task_tree_predecessors {
# Add the dude
set insert_sql "
insert into im_timesheet_task_dependencies (
task_id_two, task_id_one, dependency_type_id, difference
task_id_two, task_id_one, dependency_type_id, difference, difference_format_id
) values (
:pred_id, :succ_id, :type_id, :diff
:pred_id, :succ_id, :type_id, :diff, :diff_format_id
)
"
db_dml dep_insert $insert_sql
......@@ -332,6 +333,7 @@ ad_proc im_rest_project_task_tree_predecessors {
set update_sql "
update im_timesheet_task_dependencies set
difference = :diff,
difference_format_id = :diff_format_id,
dependency_type_id = :type_id
where task_id_two = :pred_id and
task_id_one = :succ_id
......
......@@ -41,6 +41,7 @@ set default_effort_driven_type_id [parameter::get_from_package_key -package_key
# predecessor_hash: The list of predecessors for each task
set task_dependencies_sql "
select distinct ttd.*,
coalesce(ttd.difference_format_id, 9807) as diff_format_id, -- 9807=Day for formatting lag time
coalesce(ttd.difference, 0.0) as diff
from im_projects main_p,
im_projects p,
......@@ -52,7 +53,7 @@ set task_dependencies_sql "
db_foreach task_dependencies $task_dependencies_sql {
set pred [list]
if {[info exists predecessor_hash($task_id_one)]} { set pred $predecessor_hash($task_id_one) }
lappend pred "{id: $dependency_id, pred_id: $task_id_two, succ_id: $task_id_one, type_id: $dependency_type_id, diff: $diff}"
lappend pred "{id: $dependency_id, pred_id: $task_id_two, succ_id: $task_id_one, type_id: $dependency_type_id, diff: $diff, diff_format_id: $diff_format_id}"
set predecessor_hash($task_id_one) $pred
}
......
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