Skip to content

Commit 7b75572

Browse files
committed
Changed DateTimer options array range presets
1 parent acca01e commit 7b75572

File tree

8 files changed

+36
-12
lines changed

8 files changed

+36
-12
lines changed

public/css/orchid.rtl.css

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/orchid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/orchid.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/orchid.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/controllers/datetime_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default class extends ApplicationController {
7070
* @param event
7171
*/
7272
setValue(event) {
73-
const value = event.target.dataset.value;
73+
const value = JSON.parse(event.target.dataset.value);
7474
this.fp.setDate(value, true);
7575
}
7676

src/Screen/Fields/DateTimer.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,9 @@ public function multiple(): self
409409
public function withQuickDates(array $presets): self
410410
{
411411
$formattedPresets = collect($presets)
412-
->map(fn ($value) => Carbon::parse($value))
413-
->map(fn (Carbon $value) => $value->format($this->attributes['data-datetime-date-format']))
412+
->map(fn ($value) => collect($value))
413+
->map
414+
->map(fn ($value) => Carbon::parse($value)->format($this->attributes['data-datetime-date-format']))
414415
->all();
415416

416417
$this->attributes['quickDates'] = $formattedPresets;

tests/Unit/Screen/Fields/DateTimerTest.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,26 @@ public function testEnableTimeAndFormat24hr()
7979

8080
$this->assertStringContainsString('data-datetime-time_24hr="true"', $view);
8181
}
82+
83+
public function testWithQuickDates(): void
84+
{
85+
$field = DateTimer::make('date')
86+
->format('Y-m-d H:i')
87+
->enableTime()
88+
->format24hr()
89+
->range()
90+
->withQuickDates([
91+
'Today' => Carbon::parse("2024-03-19 12:11:11"),
92+
'Yesterday' => Carbon::parse("2024-03-18 12:11:11")->subDay(),
93+
'Week' => [
94+
Carbon::parse("2024-03-19 12:11:11")->startOfDay()->subWeek(),
95+
Carbon::parse("2024-03-19 12:11:11")->endOfDay()
96+
],
97+
]);
98+
99+
$view = self::renderField($field);
100+
101+
$this->assertStringContainsString('data-value="["2024-03-17 12:11"]"', $view);
102+
$this->assertStringContainsString('data-value="["2024-03-12 00:00","2024-03-19 23:59"]"', $view);
103+
}
82104
}

0 commit comments

Comments
 (0)