|
|
@ -95,7 +95,7 @@ class EntriesController < ApplicationController |
|
|
.maximum(:date) |
|
|
.maximum(:date) |
|
|
|
|
|
|
|
|
#start_date = [last_entry_date, Date.today].compact.max |
|
|
#start_date = [last_entry_date, Date.today].compact.max |
|
|
start_date = Date.today |
|
|
|
|
|
|
|
|
start_date = Date.current |
|
|
if weekly_hours > 0 && hours_remaining > 0 |
|
|
if weekly_hours > 0 && hours_remaining > 0 |
|
|
weeks_remaining = (hours_remaining / weekly_hours).ceil |
|
|
weeks_remaining = (hours_remaining / weekly_hours).ceil |
|
|
@estimated_end_by_typ_art[typ][art] = start_date + weeks_remaining.weeks |
|
|
@estimated_end_by_typ_art[typ][art] = start_date + weeks_remaining.weeks |
|
|
|