diff options
Diffstat (limited to 'archaeological_files/models.py')
| -rw-r--r-- | archaeological_files/models.py | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index b91ea7941..47e6185ca 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -1133,25 +1133,17 @@ class File( name = job.job.label has_parents = job.job.has_parents max_ground_day_planned = max(max_ground_day_planned, job.days_planned or 0) - ground_cost_total = ( - (job.man_by_day_planned or 0) * (job.days_planned or 0) * - (job.cost_planned or 0) - ) - total_ground_cost_planned += ground_cost_total - ground_cost_total_worked = ( - (job.man_by_day_worked or 0) * (job.days_worked or 0) * - (job.cost_worked or 0) - ) - total_ground_cost_worked += ground_cost_total_worked + total_ground_cost_planned += job.cost_planned + total_ground_cost_worked += job.cost_worked jobs[name] = { "ground_man_by_day_planned": job.man_by_day_planned, "ground_days_planned": job.days_planned, - "ground_cost_planned": job.cost_planned, - "ground_cost_total_planned": ground_cost_total or "", + "ground_cost_planned": job.job.daily_cost, + "ground_cost_total_planned": job.cost_planned or "", "ground_man_by_day_worked": job.man_by_day_worked, "ground_days_worked": job.days_worked, - "ground_cost_worked": job.cost_worked, - "ground_cost_total_worked": ground_cost_total_worked or "", + "ground_cost_worked": job.job.daily_cost, + "ground_cost_total_worked": job.cost_worked, "has_parents": has_parents, "man_by_day_planned": "", "days_planned": "", @@ -1181,25 +1173,17 @@ class File( "ground_cost_worked": "", "ground_cost_total_worked": "", } - cost_total_planned = ( - (job.man_by_day_planned or 0) * (job.days_planned or 0) * - (job.cost_planned or 0) - ) - total_cost_planned += cost_total_planned - cost_total_worked = ( - (job.man_by_day_worked or 0) * (job.days_worked or 0) * - (job.cost_worked or 0) - ) - total_cost_worked += cost_total_worked + total_cost_planned += job.cost_planned + total_cost_worked += job.cost_worked jobs[name].update({ "man_by_day_planned": job.man_by_day_planned, "days_planned": job.days_planned, - "cost_planned": job.cost_planned, - "cost_total_planned": cost_total_planned or "", + "cost_planned": job.job.daily_cost, + "cost_total_planned": job.cost_planned or "", "man_by_day_worked": job.man_by_day_worked, "days_worked": job.days_worked, - "cost_worked": job.cost_worked, - "cost_total_worked": cost_total_worked or "", + "cost_worked": job.job.daily_cost, + "cost_total_worked": job.cost_worked or "", }) result = [] for k in jobs: |