kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

make sure recurrence can skip weekends.

Browse Source
This commit is contained in:
James Cole
2018-06-26 21:17:50 +02:00
parent 49de4f2200
commit 7ba11a57a8
7 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -33,6 +33,7 @@ use FireflyIII\Models\RecurrenceMeta;
use FireflyIII\Models\RecurrenceRepetition;
use FireflyIII\Models\RecurrenceTransaction;
use FireflyIII\Models\RecurrenceTransactionMeta;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Services\Internal\Destroy\RecurrenceDestroyService;
use FireflyIII\Services\Internal\Update\RecurrenceUpdateService;
use FireflyIII\User;
@@ -129,6 +130,34 @@ class RecurringRepository implements RecurringRepositoryInterface
return $return === '' ? null : $return;
}
/**
* Returns the journals created for this recurrence, possibly limited by time.
*
* @param Recurrence $recurrence
* @param Carbon|null $start
* @param Carbon|null $end
*
* @return Collection
*/
public function getJournals(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): Collection
{
$query = TransactionJournal
::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.user_id', $recurrence->user_id)
->whereNull('transaction_journals.deleted_at')
->where('journal_meta.name', 'recurrence_id')
->where('journal_meta.data', '"' . $recurrence->id . '"');
if (null !== $start) {
$query->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'));
}
if (null !== $end) {
$query->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'));
}
$result = $query->get(['transaction_journals.*']);
return $result;
}
/**
* Get the notes.
*
@@ -398,6 +427,8 @@ class RecurringRepository implements RecurringRepositoryInterface
}
break;
}
// filter out all the weekend days:
$return = $this->filterWeekends($repetition, $return);
return $return;
}
@@ -512,12 +543,16 @@ class RecurringRepository implements RecurringRepositoryInterface
/** @var Carbon $date */
foreach ($dates as $date) {
$isWeekend = $date->isWeekend();
if (!$isWeekend) {
$return[] = clone $date;
continue;
}
// set back to Friday?
// is weekend and must set back to Friday?
if ($isWeekend && $repetition->weekend === RecurrenceRepetition::WEEKEND_TO_FRIDAY) {
$clone = clone $date;
$clone->subDays(7 - $date->dayOfWeekIso);
$return[] = $clone;
$clone->addDays(5 - $date->dayOfWeekIso);
$return[] = clone $clone;
}
// postpone to Monday?
@@ -526,10 +561,12 @@ class RecurringRepository implements RecurringRepositoryInterface
$clone->addDays(8 - $date->dayOfWeekIso);
$return[] = $clone;
}
// otherwise, ignore the date!
}
// filter unique dates?
// filter unique dates
$collection = new Collection($return);
$filtered = $collection->unique();
$return = $filtered->toArray();
return $return;
}

11
app/Repositories/Recurring/RecurringRepositoryInterface.php
View File

@@ -78,6 +78,17 @@ interface RecurringRepositoryInterface
*/
public function getCategory(RecurrenceTransaction $recurrenceTransaction): ?string;
/**
* Returns the journals created for this recurrence, possibly limited by time.
*
* @param Recurrence $recurrence
* @param Carbon|null $start
* @param Carbon|null $end
*
* @return Collection
*/
public function getJournals(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): Collection;
/**
* Get the notes.
*