Timon/SmartCane
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
Martin Folkerts 2024-07-09 09:55:52 +02:00
parent 07d5e81a27
commit d8c730e0f9
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
laravel_app/app/Livewire/Projects/ProjectManager.php
View file

@ -141,7 +141,6 @@ public function deleteEmailRecipient($index)
*/ */
public function confirmReportDeletion($reportId) public function confirmReportDeletion($reportId)
{ {
$this->confirmingReportDeletion = true; $this->confirmingReportDeletion = true;
$this->reportIdBeingDeleted = $reportId; $this->reportIdBeingDeleted = $reportId;
} }
@ -207,7 +206,6 @@ private function validateForm()
], ],
'pivot_file.extension' => ['sometimes', function ($attribute, $value, $fail) { 'pivot_file.extension' => ['sometimes', function ($attribute, $value, $fail) {
if ($value && $value != 'json') { if ($value && $value != 'json') {
$fail('Not a json file'); $fail('Not a json file');
} }
}], }],

7
laravel_app/app/Models/Project.php
View file

@ -63,12 +63,13 @@ public static function saveWithFormData(mixed $formData)
$project->setMinHarvestDate(); $project->setMinHarvestDate();
} }
} }
self::upsertMailRecipients($formData, $project);
} }
private function upsertMailRecipients($formData) private static function upsertMailRecipients($formData, Project $project)
{ {
$mailRecipientsData = array_map(function ($mailRecipient) { $mailRecipientsData = array_map(function ($mailRecipient) use ($project) {
$mailRecipient['project_id'] = $this->id; $mailRecipient['project_id'] = $project->id;
unset($mailRecipient['created_at']); unset($mailRecipient['created_at']);
unset($mailRecipient['updated_at']); unset($mailRecipient['updated_at']);
$mailRecipient['id'] ??= null; $mailRecipient['id'] ??= null;

2
laravel_app/public/build/assets/app-e4d1ce6a.css → laravel_app/public/build/assets/app-d3f21131.css
View file

File diff suppressed because one or more lines are too long

2
laravel_app/public/build/manifest.json
View file

@ -44,7 +44,7 @@
"src": "node_modules/leaflet/dist/images/marker-icon.png" "src": "node_modules/leaflet/dist/images/marker-icon.png"
}, },
"resources/css/app.css": { "resources/css/app.css": {
"file": "assets/app-e4d1ce6a.css", "file": "assets/app-d3f21131.css",
"isEntry": true, "isEntry": true,
"src": "resources/css/app.css" "src": "resources/css/app.css"
}, },

4
laravel_app/resources/views/livewire/projects/tabs/settings.blade.php
View file

@ -88,10 +88,10 @@
<div class="md:w-2/3"> <div class="md:w-2/3">
<form x-init=" <form x-init="
$nextTick(() => { $nextTick(() => {
@if($formData['pivot_file']) @if($formData['pivot_file'] && is_string($formData['pivot_file']))
showMap({{$formData['pivot_file']}},'pivot_file'); showMap({{$formData['pivot_file']}},'pivot_file');
@endif @endif
@if($formData['span_file']) @if($formData['span_file'] && is_string($formData['span_file']))
showMap({{$formData['span_file']}},'span_file'); showMap({{$formData['span_file']}},'span_file');
@endif @endif
}) })