Commit cf88ff529a9152aecbc8d8b8044911e54cee242e
1 parent
f9fef9d0
Exists in
master
and in
4 other branches
Fix head data selection for project charge
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/db_mgr.py
| @@ -85,7 +85,7 @@ def charges_by_project_stacked(project_id, category="service"): | @@ -85,7 +85,7 @@ def charges_by_project_stacked(project_id, category="service"): | ||
| 85 | . | 85 | . |
| 86 | sem_n, value_n0, value_n1, ....., value_nn, | 86 | sem_n, value_n0, value_n1, ....., value_nn, |
| 87 | """ | 87 | """ |
| 88 | - if category == 'service': | 88 | + if category == 'capacity': |
| 89 | category_table = 'service' | 89 | category_table = 'service' |
| 90 | sql_req = """ | 90 | sql_req = """ |
| 91 | select c.charge_rate | 91 | select c.charge_rate |
| @@ -93,7 +93,7 @@ def charges_by_project_stacked(project_id, category="service"): | @@ -93,7 +93,7 @@ def charges_by_project_stacked(project_id, category="service"): | ||
| 93 | charge c on c1.id = c.capacity_id and project_id = {} and period_id={} | 93 | charge c on c1.id = c.capacity_id and project_id = {} and period_id={} |
| 94 | order by c1.id | 94 | order by c1.id |
| 95 | """ | 95 | """ |
| 96 | - elif category == 'capacity': | 96 | + elif category == 'service': |
| 97 | category_table = 'capacity' | 97 | category_table = 'capacity' |
| 98 | sql_req = """ | 98 | sql_req = """ |
| 99 | select c.charge_rate | 99 | select c.charge_rate |