|
@@ -100,7 +100,7 @@ discard block |
|
|
block discarded – undo |
|
100
|
100
|
{ |
|
101
|
101
|
if ($record instanceof Individual) { |
|
102
|
102
|
$facts = $record->facts(static::INDIVIDUAL_EVENTS, true) |
|
103
|
|
- ->merge($record->spouseFamilies()->map(fn (Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true))); |
|
|
103
|
+ ->merge($record->spouseFamilies()->map(fn(Family $family): Collection => $family->facts(static::FAMILY_EVENTS, true))); |
|
104
|
104
|
} elseif ($record instanceof Family) { |
|
105
|
105
|
$facts = $record->facts(static::FAMILY_EVENTS, true); |
|
106
|
106
|
} else { |
|
@@ -110,11 +110,11 @@ discard block |
|
|
block discarded – undo |
|
110
|
110
|
// iCalendar only supports exact Gregorian dates. |
|
111
|
111
|
$facts = $facts |
|
112
|
112
|
->flatten() |
|
113
|
|
- ->filter(fn (Fact $fact): bool => $fact->date()->isOK()) |
|
114
|
|
- ->filter(fn (Fact $fact): bool => $fact->date()->qual1 === '') |
|
115
|
|
- ->filter(fn (Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate) |
|
116
|
|
- ->filter(fn (Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay()) |
|
117
|
|
- ->mapWithKeys(fn (Fact $fact): array => [ |
|
|
113
|
+ ->filter(fn(Fact $fact): bool => $fact->date()->isOK()) |
|
|
114
|
+ ->filter(fn(Fact $fact): bool => $fact->date()->qual1 === '') |
|
|
115
|
+ ->filter(fn(Fact $fact): bool => $fact->date()->minimumDate() instanceof GregorianDate) |
|
|
116
|
+ ->filter(fn(Fact $fact): bool => $fact->date()->minimumJulianDay() === $fact->date()->maximumJulianDay()) |
|
|
117
|
+ ->mapWithKeys(fn(Fact $fact): array => [ |
|
118
|
118
|
route(static::class, ['tree' => $record->tree()->name(), 'xref' => $fact->record()->xref(), 'fact_id' => $fact->id()]) => |
|
119
|
119
|
$fact->label() . ' — ' . $fact->date()->display(), |
|
120
|
120
|
]); |
|
@@ -149,7 +149,7 @@ discard block |
|
|
block discarded – undo |
|
149
|
149
|
$record = Auth::checkRecordAccess($record); |
|
150
|
150
|
|
|
151
|
151
|
$fact = $record->facts() |
|
152
|
|
- ->filter(fn (Fact $fact): bool => $fact->id() === $fact_id) |
|
|
152
|
+ ->filter(fn(Fact $fact): bool => $fact->id() === $fact_id) |
|
153
|
153
|
->first(); |
|
154
|
154
|
|
|
155
|
155
|
if ($fact instanceof Fact) { |
fisharebest /
webtrees
