kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

Add debug info for #3051

Browse Source
This commit is contained in:
James Cole
2020-01-25 06:17:17 +01:00
parent f4fd9e5a15
commit f598c39c6e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Json/RecurrenceController.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\RecurrenceRepetition;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log;
/** /**
* Class RecurrenceController * Class RecurrenceController
@@ -42,6 +43,7 @@ class RecurrenceController extends Controller
/** /**
* RecurrenceController constructor. * RecurrenceController constructor.
*
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function __construct() public function __construct()
@@ -146,12 +148,17 @@ class RecurrenceController extends Controller
*/ */
public function suggest(Request $request): JsonResponse public function suggest(Request $request): JsonResponse
{ {
$string = $request->get('date') ?? date('Y-m-d'); $string = $request->get('date') ?? date('Y-m-d');
$today = new Carbon; $today = new Carbon;
$date = Carbon::createFromFormat('Y-m-d', $string); $date = Carbon::createFromFormat('Y-m-d', $string);
$preSelected = (string)$request->get('pre_select'); $preSelected = (string)$request->get('pre_select');
Log::debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true) ));
Log::debug(sprintf('past = true? %s', var_export('true' === (string)$request->get('past'), true)));
$result = []; $result = [];
if ($date > $today || 'true' === (string)$request->get('past')) { if ($date > $today || 'true' === (string)$request->get('past')) {
Log::debug('Will fill dropdown.');
$weekly = sprintf('weekly,%s', $date->dayOfWeekIso); $weekly = sprintf('weekly,%s', $date->dayOfWeekIso);
$monthly = sprintf('monthly,%s', $date->day); $monthly = sprintf('monthly,%s', $date->day);
$dayOfWeek = (string)trans(sprintf('config.dow_%s', $date->dayOfWeekIso)); $dayOfWeek = (string)trans(sprintf('config.dow_%s', $date->dayOfWeekIso));
@@ -169,6 +176,7 @@ class RecurrenceController extends Controller
$yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')], $yearly => ['label' => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]), 'selected' => 0 === strpos($preSelected, 'yearly')],
]; ];
} }
Log::debug('Dropdown is', $result);
return response()->json($result); return response()->json($result);