alahouze/accountant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed rescheduling.

Browse Source
This commit is contained in:
Alexis Lahouze 2015-08-20 21:14:18 +02:00
parent 82f91805f0
commit 7f97b15532
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
accountant/api/models/scheduled_operations.py
View File

@ -81,31 +81,42 @@ class ScheduledOperation(db.Model):
).delete() ).delete()
# 2) schedule remaining operations. # 2) schedule remaining operations.
# Find the first date to have all dates in the range with the right day.
start_date = arrow.get(self.start_date) start_date = arrow.get(self.start_date)
day = min(self.day, monthrange(start_date.year, start_date.month)[1])
# First date is in the next month is below the start date day.
if day < start_date.day:
start_date = start_date.replace(months=+1)
start_date = start_date.replace(day=day)
# Stop date remains the same.
stop_date = arrow.get(self.stop_date) stop_date = arrow.get(self.stop_date)
for r in arrow.Arrow.range( # Iterate over the range.
for c_date in arrow.Arrow.range(
"month", start_date, stop_date "month", start_date, stop_date
)[::self.frequency]: )[::self.frequency]:
current_monthrange = monthrange(r.year, r.month) # If a date day is below the first date day, next dates will not
# have the right day.
day = min(self.day, monthrange(
c_date.year, c_date.month)[1])
day = max(self.day, current_monthrange[0]) c_date = c_date.replace(day=day)
day = min(self.day, current_monthrange[1])
r.replace(day=day)
# Search if a close operation exists. # Search if a close operation exists.
if not session.query( if not session.query(
Operation Operation
).filter( ).filter(
Operation.account_id == self.account_id, Operation.account_id == self.account_id,
Operation.scheduled_operation_id == self.id, Operation.scheduled_operation_id == self.id,
Operation.operation_date >= r.clone().replace(weeks=-2).date(), Operation.operation_date >= c_date.replace(weeks=-2).date(),
Operation.operation_date <= r.clone().replace(weeks=+2).date() Operation.operation_date <= c_date.replace(weeks=+2).date()
).count(): ).count():
# Create not confirmed operation if not found. # Create not confirmed operation if not found.
operation = Operation( operation = Operation(
operation_date=r.date(), operation_date=c_date.date(),
label=self.label, label=self.label,
value=self.value, value=self.value,
category=self.category, category=self.category,