QM: Wiedervorlage und Lesebestätigung, Platzhalter für Profilbilder (0.21.0)
Some checks failed
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 3m49s
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 3m54s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 5m27s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 5m29s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 6m38s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 6m40s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 6m7s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 6m13s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m24s
Some checks failed
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 3m49s
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 3m54s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 5m27s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 5m29s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 6m38s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 6m40s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 6m7s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 6m13s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m24s
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
8701b6d1b8
commit
4d855c8a74
213 changed files with 1729 additions and 515 deletions
|
|
@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
|
|||
use App\Support\Audit;
|
||||
use App\Support\RichText;
|
||||
use App\Support\Settings;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
|
@ -14,6 +15,7 @@ use Illuminate\Support\Facades\Storage;
|
|||
use Illuminate\Validation\Rule;
|
||||
use Inertia\Inertia;
|
||||
use Inertia\Response;
|
||||
use Inhaus\Plugins\Qm\Acknowledgements;
|
||||
use Inhaus\Plugins\Qm\Library;
|
||||
use Inhaus\Plugins\Qm\Models\QmEntry;
|
||||
use Inhaus\Plugins\Qm\Models\QmFile;
|
||||
|
|
@ -21,6 +23,7 @@ use Inhaus\Plugins\Qm\Models\QmFolder;
|
|||
use Inhaus\Plugins\Qm\Presenter;
|
||||
use Inhaus\Plugins\Qm\QmAccess;
|
||||
use Inhaus\Plugins\Qm\QmTree;
|
||||
use Inhaus\Plugins\Qm\Reviews;
|
||||
use Inhaus\Plugins\Qm\Search;
|
||||
use Symfony\Component\HttpFoundation\Response as HttpResponse;
|
||||
|
||||
|
|
@ -49,16 +52,85 @@ class QmController extends Controller
|
|||
])->values(),
|
||||
'canManage' => $this->access->canManage($request->user()),
|
||||
'adminUrl' => $this->access->canManage($request->user()) ? url('/admin/qm-ordner') : null,
|
||||
'toAcknowledge' => app(Acknowledgements::class)->outstanding($request->user())->map(fn (QmEntry $entry) => $this->presenter->entry($entry, withFolder: true))->values(),
|
||||
'reviews' => app(Reviews::class)->canSee($request->user()) ? ['open' => app(Reviews::class)->openCount($request->user()), 'url' => route('qm.reviews')] : null,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Wiedervorlagen: alle Termine (QM-Team) bzw. die eigenen (Verantwortliche).
|
||||
*/
|
||||
public function reviews(Request $request, Reviews $reviews): Response
|
||||
{
|
||||
abort_unless($reviews->canSee($request->user()), 403);
|
||||
|
||||
return Inertia::render('qm::Reviews', [
|
||||
'entries' => $reviews->list($request->user())->map(fn (QmEntry $entry) => [
|
||||
...$this->presenter->entry($entry, withFolder: true),
|
||||
'reviewer' => $entry->reviewer?->name,
|
||||
'can_complete' => $reviews->canComplete($entry, $request->user()),
|
||||
])->values(),
|
||||
'intervals' => Reviews::INTERVALS,
|
||||
'leadDays' => Reviews::LEAD_DAYS,
|
||||
]);
|
||||
}
|
||||
|
||||
public function completeReview(Request $request, QmEntry $entry, Reviews $reviews): RedirectResponse
|
||||
{
|
||||
abort_unless($reviews->canComplete($entry, $request->user()), 403);
|
||||
$reviews->complete($entry, $request->user());
|
||||
|
||||
return back()->with('status', $entry->review_due_at
|
||||
? 'Als geprüft vermerkt – nächste Prüfung am '.$entry->review_due_at->format('d.m.Y').'.'
|
||||
: 'Als geprüft vermerkt.');
|
||||
}
|
||||
|
||||
public function acknowledge(Request $request, QmEntry $entry, Acknowledgements $acknowledgements): RedirectResponse
|
||||
{
|
||||
abort_unless($entry->requires_acknowledgement && $this->tree->isVisible($entry->folder_id, $request->user()), 404);
|
||||
$acknowledgements->acknowledge($entry, $request->user());
|
||||
|
||||
return back()->with('status', 'Danke – Ihre Lesebestätigung ist gespeichert.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Auswertung der Lesebestätigungen (QM-Team), als JSON oder CSV.
|
||||
*/
|
||||
public function acknowledgements(Request $request, QmEntry $entry, Acknowledgements $acknowledgements): JsonResponse|HttpResponse
|
||||
{
|
||||
$this->authorizeManage($request);
|
||||
$report = $acknowledgements->report($entry);
|
||||
|
||||
if ($request->query('format') === 'csv') {
|
||||
$rows = [['Name', 'Abteilung', 'Funktion', 'Status', 'Bestätigt am']];
|
||||
|
||||
foreach ($report['confirmed'] as $p) {
|
||||
$rows[] = [$p['name'], $p['department'], $p['job_title'], 'bestätigt', Carbon::parse($p['acknowledged_at'])->format('d.m.Y H:i')];
|
||||
}
|
||||
|
||||
foreach ($report['missing'] as $p) {
|
||||
$rows[] = [$p['name'], $p['department'], $p['job_title'], 'offen', ''];
|
||||
}
|
||||
|
||||
$csv = "\u{FEFF}".collect($rows)->map(fn (array $row) => implode(';', array_map(fn ($v) => '"'.str_replace('"', '""', (string) $v).'"', $row)))->implode("\r\n");
|
||||
|
||||
return response($csv, 200, [
|
||||
'Content-Type' => 'text/csv; charset=UTF-8',
|
||||
'Content-Disposition' => 'attachment; filename="lesebestaetigungen-'.$entry->id.'.csv"',
|
||||
]);
|
||||
}
|
||||
|
||||
return response()->json($report);
|
||||
}
|
||||
|
||||
public function folder(Request $request, QmFolder $folder): Response
|
||||
{
|
||||
abort_unless($this->tree->isVisible($folder->id, $request->user()), 404);
|
||||
|
||||
$counts = $this->entryCounts();
|
||||
$canManage = $this->access->canManage($request->user());
|
||||
$entries = $folder->entries()->with(['readingFile', 'editableFile'])->orderBy('sort')->orderBy('title')->get();
|
||||
$entries = $folder->entries()->with(['readingFile', 'editableFile', 'responsible'])->orderBy('sort')->orderBy('title')->get();
|
||||
$acks = app(Acknowledgements::class)->stateFor($entries, $request->user());
|
||||
$node = $this->tree->folder($folder->id);
|
||||
|
||||
return Inertia::render('qm::Folder', [
|
||||
|
|
@ -72,7 +144,7 @@ class QmController extends Controller
|
|||
],
|
||||
'breadcrumbs' => array_map(fn (array $f) => ['id' => $f['id'], 'name' => $f['name'], 'color' => $f['color']], array_slice($this->tree->path($folder->id), 0, -1)),
|
||||
'children' => array_map(fn (int $id) => $this->presenter->tile($id, $counts), $this->tree->childIds($folder->id)),
|
||||
'entries' => $entries->map(fn (QmEntry $entry) => $this->presenter->entry($entry)),
|
||||
'entries' => $entries->map(fn (QmEntry $entry) => [...$this->presenter->entry($entry), 'acknowledged_at' => $acks[$entry->id] ?? null]),
|
||||
'canManage' => $canManage,
|
||||
'forms' => $canManage ? $this->formOptions() : [],
|
||||
'maxUploadMb' => (int) floor(min(Library::MAX_KB / 1024, self::phpUploadLimitMb())),
|
||||
|
|
@ -110,7 +182,7 @@ class QmController extends Controller
|
|||
}
|
||||
|
||||
return Inertia::render('qm::Viewer', [
|
||||
'entry' => $this->presenter->entry($entry, withFolder: true),
|
||||
'entry' => [...$this->presenter->entry($entry, withFolder: true), 'acknowledged_at' => app(Acknowledgements::class)->stateFor([$entry], $request->user())[$entry->id] ?? null],
|
||||
'file' => ['url' => $file->url(inline: true), 'kind' => $file->mime === 'application/pdf' ? 'pdf' : 'image', 'name' => $file->name],
|
||||
'query' => (string) $request->query('suche', ''),
|
||||
]);
|
||||
|
|
@ -206,9 +278,14 @@ class QmController extends Controller
|
|||
'form_id' => [Rule::requiredIf($type === QmEntry::FORM), 'nullable', 'integer', Rule::exists('forms', 'id')],
|
||||
'reading' => [...$fileRule, Rule::requiredIf($type === QmEntry::FILE && ! $entry && ! $request->hasFile('editable'))],
|
||||
'editable' => $fileRule,
|
||||
'review_due_at' => ['nullable', 'date'],
|
||||
'review_interval_months' => ['nullable', 'integer', Rule::in(array_keys(Reviews::INTERVALS))],
|
||||
'responsible_id' => ['nullable', 'integer', Rule::exists('users', 'id')],
|
||||
'requires_acknowledgement' => ['nullable', 'boolean'],
|
||||
], ['url.regex' => 'Bitte eine Adresse angeben, die mit https:// oder / beginnt.', 'reading.required' => 'Bitte eine Datei auswählen.'], [
|
||||
'title' => 'Titel', 'version' => 'Version', 'valid_from' => 'Stand', 'url' => 'Adresse', 'form_id' => 'Formular',
|
||||
'reading' => 'Datei', 'editable' => 'Bearbeitbare Vorlage',
|
||||
'reading' => 'Datei', 'editable' => 'Bearbeitbare Vorlage', 'review_due_at' => 'Nächste Prüfung',
|
||||
'review_interval_months' => 'Prüfintervall', 'responsible_id' => 'Verantwortlich',
|
||||
]) + ['type' => $type];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue