Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-rest
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-rest
Commits
80728876
Commit
80728876
authored
Jul 17, 2018
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Added 'Logged Hours' field
parent
9028e1cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
project-task-tree.json.tcl
www/data-source/project-task-tree.json.tcl
+3
-1
No files found.
www/data-source/project-task-tree.json.tcl
View file @
80728876
...
...
@@ -161,7 +161,8 @@ set projects_sql "
(select count(*) from im_projects child where child.parent_id = p.project_id) as num_children,
CASE WHEN bts.open_p = 'o' THEN 'true' ELSE 'false' END as expanded,
p.sort_order,
round(p.percent_completed * 10.0) / 10.0 as percent_completed
round(p.percent_completed * 10.0) / 10.0 as percent_completed,
coalesce(p.reported_hours_cache, 0.0) as logged_hours
from im_projects main_p,
im_projects p
LEFT OUTER JOIN acs_objects o ON (p.project_id = o.object_id)
...
...
@@ -274,6 +275,7 @@ ${indent}\ticonCls:\"icon-$type\",
${indent}
\t
predecessors:
\[
[
join
$predecessor
_tasks
", "
]
\]
,
${indent}
\t
assignees:
\[
[
join
$assignees
", "
]
\]
,
${indent}
\t
invoices:
\[
[
join
$invoices
", "
]
\]
,
${indent}
\t
logged_hours:
$logged
_hours,
${indent}
\t
expanded:
$expanded
,
"
foreach var
$valid
_vars
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment