diff --git a/CHANGELOG.md b/CHANGELOG.md index 97654a65..61493440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ Neueste Version oben. Jeder Abschnitt beginnt mit `## MAJOR.MINOR.PATCH` und enthält kurze Stichpunkte für Anwenderinnen und Anwender – keine Commit-Texte. Der Self-Updater zeigt diese Abschnitte bei neuen Versionen an. +## 0.9.1 + +- Organigramm neu gestaltet: grafischer Baum mit Verbindungslinien, Zoom und Verschieben; Mitarbeitende ohne eigenes Team stehen platzsparend untereinander +- Neue Fokus-Ansicht im Organigramm: eine Person groß mit Kontakt, darüber die Vorgesetzten, daneben das eigene Team, darunter die direkt unterstellten Personen; die gewählte Ansicht wird gemerkt +- Dokumente neu gestaltet: Übersicht mit Bereichen und „Zuletzt aktualisiert“, Dateiliste mit sortierbaren Spalten (Name, Geändert, Größe) und wer zuletzt geändert hat, alternativ Kachelansicht (wird gemerkt) +- Dateien lassen sich auf die ganze Ordneransicht ziehen; leere Ordner laden direkt zum Hochladen ein + ## 0.9.0 - Weitere Anmeldeverfahren (jeweils als Plugin): **OpenID Connect** (z. B. Keycloak, Authentik, Okta, Google Workspace), **LDAP / Active Directory** mit Benutzername und Passwort und **SAML 2** (z. B. ADFS, Shibboleth) diff --git a/app/Http/Controllers/OrganigramController.php b/app/Http/Controllers/OrganigramController.php index 6d68caad..a5745bad 100644 --- a/app/Http/Controllers/OrganigramController.php +++ b/app/Http/Controllers/OrganigramController.php @@ -19,6 +19,7 @@ class OrganigramController extends Controller { public function index(Request $request): Response { + $view = in_array($request->query('ansicht'), ['baum', 'fokus'], true) ? $request->query('ansicht') : 'baum'; $focus = $request->integer('person') ? User::query()->active()->find($request->integer('person')) : null; // Oberste Ebene: aktive Personen ohne (aktive) Vorgesetzte, die selbst ein Team haben. @@ -26,6 +27,11 @@ class OrganigramController extends Controller ->where(fn (Builder $q) => $q->whereNull('manager_id')->orWhereDoesntHave('manager', fn (Builder $m) => $m->where('is_active', true))) ->whereHas('reports', fn (Builder $r) => $r->where('is_active', true))); + // Die Fokus-Ansicht beginnt ohne Auswahl bei der Spitze. + if ($view === 'fokus' && ! $focus && $roots->isNotEmpty()) { + $focus = User::query()->find($roots[0]['id']); + } + // Weg von oben zur gewählten Person, samt Team jeder Ebene. $path = []; $teams = []; @@ -57,6 +63,23 @@ class OrganigramController extends Controller 'path' => $path, 'teams' => (object) $teams, 'focus' => $focus?->id, + 'details' => $focus ? [ + 'id' => $focus->id, + 'name' => $focus->name, + 'initials' => $focus->initials, + 'job_title' => $focus->job_title, + 'department' => $focus->department, + 'location' => $focus->location, + 'email' => $focus->email, + 'phone' => $focus->phone, + 'mobile' => $focus->mobile, + 'avatar_url' => $focus->avatarUrl(192), + ] : null, + 'view' => $view, + 'stats' => [ + 'people' => User::query()->active()->where(fn (Builder $q) => $q->whereNotNull('manager_id')->orWhereHas('reports', fn (Builder $r) => $r->where('is_active', true)))->count(), + 'leaders' => User::query()->active()->whereHas('reports', fn (Builder $r) => $r->where('is_active', true))->count(), + ], 'unassigned' => User::query()->active()->whereNull('manager_id')->whereDoesntHave('reports')->count(), ]); } @@ -84,6 +107,7 @@ class OrganigramController extends Controller 'initials' => $u->initials, 'job_title' => $u->job_title, 'department' => $u->department, + 'location' => $u->location, 'avatar_url' => $u->avatarUrl(96), 'reports' => $u->reports_count, ]); diff --git a/app/Version.php b/app/Version.php index 3a9b8c08..c7999736 100644 --- a/app/Version.php +++ b/app/Version.php @@ -9,5 +9,5 @@ namespace App; */ final class Version { - public const VERSION = '0.9.0'; + public const VERSION = '0.9.1'; } diff --git a/plugins-core/documents/resources/js/components/DocumentGrid.vue b/plugins-core/documents/resources/js/components/DocumentGrid.vue new file mode 100644 index 00000000..a11a45c3 --- /dev/null +++ b/plugins-core/documents/resources/js/components/DocumentGrid.vue @@ -0,0 +1,56 @@ + + + diff --git a/plugins-core/documents/resources/js/components/DocumentMenu.vue b/plugins-core/documents/resources/js/components/DocumentMenu.vue new file mode 100644 index 00000000..cd5a8e91 --- /dev/null +++ b/plugins-core/documents/resources/js/components/DocumentMenu.vue @@ -0,0 +1,29 @@ + + + diff --git a/plugins-core/documents/resources/js/components/DocumentTable.vue b/plugins-core/documents/resources/js/components/DocumentTable.vue new file mode 100644 index 00000000..6ac4c290 --- /dev/null +++ b/plugins-core/documents/resources/js/components/DocumentTable.vue @@ -0,0 +1,107 @@ + + + diff --git a/plugins-core/documents/resources/js/components/FileIcon.vue b/plugins-core/documents/resources/js/components/FileIcon.vue index 1d0b1d71..1ff7f0ba 100644 --- a/plugins-core/documents/resources/js/components/FileIcon.vue +++ b/plugins-core/documents/resources/js/components/FileIcon.vue @@ -7,17 +7,22 @@ import { File, FileArchive, FileImage, FileSpreadsheet, FileText, Presentation } */ const props = defineProps({ extension: { type: String, default: '' }, + size: { type: String, default: 'md' }, // sm | md | lg }); +const text = { icon: FileText }; +const sheet = { icon: FileSpreadsheet }; const kinds = { - PDF: { icon: FileText, class: 'bg-red-50 text-red-700 dark:bg-red-950/50 dark:text-red-300' }, - DOC: { icon: FileText, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, - DOCX: { icon: FileText, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, - ODT: { icon: FileText, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, - XLS: { icon: FileSpreadsheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, - XLSX: { icon: FileSpreadsheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, - CSV: { icon: FileSpreadsheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, - ODS: { icon: FileSpreadsheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, + PDF: { ...text, class: 'bg-red-50 text-red-700 dark:bg-red-950/50 dark:text-red-300' }, + DOC: { ...text, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, + DOCX: { ...text, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, + ODT: { ...text, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, + RTF: { ...text, class: 'bg-sky-50 text-sky-700 dark:bg-sky-950/50 dark:text-sky-300' }, + TXT: { ...text, class: 'bg-muted text-muted-foreground' }, + XLS: { ...sheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, + XLSX: { ...sheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, + CSV: { ...sheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, + ODS: { ...sheet, class: 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950/50 dark:text-emerald-300' }, PPT: { icon: Presentation, class: 'bg-orange-50 text-orange-700 dark:bg-orange-950/50 dark:text-orange-300' }, PPTX: { icon: Presentation, class: 'bg-orange-50 text-orange-700 dark:bg-orange-950/50 dark:text-orange-300' }, JPG: { icon: FileImage, class: 'bg-violet-50 text-violet-700 dark:bg-violet-950/50 dark:text-violet-300' }, @@ -27,11 +32,13 @@ const kinds = { }; const kind = computed(() => kinds[props.extension?.toUpperCase()] ?? { icon: File, class: 'bg-muted text-muted-foreground' }); +const box = computed(() => ({ sm: 'size-8 rounded-md', md: 'size-10 rounded-md', lg: 'size-14 rounded-lg' })[props.size]); +const glyph = computed(() => ({ sm: 'size-4', md: 'size-5', lg: 'size-7' })[props.size]); diff --git a/plugins-core/documents/resources/js/lib.js b/plugins-core/documents/resources/js/lib.js new file mode 100644 index 00000000..1d63242e --- /dev/null +++ b/plugins-core/documents/resources/js/lib.js @@ -0,0 +1,17 @@ +export const formatSize = (bytes) => { + if (!bytes) return '–'; + if (bytes >= 1024 * 1024) return `${(bytes / 1024 / 1024).toFixed(1).replace('.', ',')} MB`; + + return `${Math.max(1, Math.round(bytes / 1024))} KB`; +}; + +export const entries = (n, one, many) => `${n.toLocaleString('de-DE')} ${n === 1 ? one : many}`; + +/** „3 Dokumente · 2 Ordner“ – leere Teile weglassen. */ +export function folderSummary(folder) { + const parts = []; + if (folder.folders) parts.push(entries(folder.folders, 'Ordner', 'Ordner')); + if (folder.documents) parts.push(entries(folder.documents, 'Dokument', 'Dokumente')); + + return parts.join(' · ') || 'Noch leer'; +} diff --git a/plugins-core/documents/resources/js/pages/Index.vue b/plugins-core/documents/resources/js/pages/Index.vue index a18eee1d..6a9f3d98 100644 --- a/plugins-core/documents/resources/js/pages/Index.vue +++ b/plugins-core/documents/resources/js/pages/Index.vue @@ -1,7 +1,7 @@ + + diff --git a/resources/js/components/org/OrgChart.vue b/resources/js/components/org/OrgChart.vue new file mode 100644 index 00000000..0abc29a4 --- /dev/null +++ b/resources/js/components/org/OrgChart.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/resources/js/components/org/OrgChartNode.vue b/resources/js/components/org/OrgChartNode.vue new file mode 100644 index 00000000..45eee359 --- /dev/null +++ b/resources/js/components/org/OrgChartNode.vue @@ -0,0 +1,61 @@ + + + diff --git a/resources/js/components/org/OrgFocus.vue b/resources/js/components/org/OrgFocus.vue new file mode 100644 index 00000000..0ab88f8d --- /dev/null +++ b/resources/js/components/org/OrgFocus.vue @@ -0,0 +1,121 @@ + + + diff --git a/resources/js/components/org/OrgNode.vue b/resources/js/components/org/OrgNode.vue deleted file mode 100644 index 59d5fb2d..00000000 --- a/resources/js/components/org/OrgNode.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/resources/js/composables/useStoredChoice.js b/resources/js/composables/useStoredChoice.js new file mode 100644 index 00000000..19ad419a --- /dev/null +++ b/resources/js/composables/useStoredChoice.js @@ -0,0 +1,28 @@ +import { ref, watch } from 'vue'; + +/** + * Eine Ansichtswahl (z. B. Liste/Kacheln), die sich der Browser merkt. + * Ohne Speicher (privates Fenster) gilt einfach der Standard. + */ +export function useStoredChoice(key, fallback, allowed) { + let initial = fallback; + + try { + const stored = window.localStorage.getItem(key); + if (allowed.includes(stored)) initial = stored; + } catch { + // kein Speicher verfügbar + } + + const choice = ref(initial); + + watch(choice, (value) => { + try { + window.localStorage.setItem(key, value); + } catch { + // kein Speicher verfügbar + } + }); + + return choice; +} diff --git a/resources/js/pages/People/Organigram.vue b/resources/js/pages/People/Organigram.vue index 4f336499..d4fd7253 100644 --- a/resources/js/pages/People/Organigram.vue +++ b/resources/js/pages/People/Organigram.vue @@ -1,11 +1,13 @@ diff --git a/tests/Feature/Documents/DocumentsTest.php b/tests/Feature/Documents/DocumentsTest.php index ca9f0399..6af8819d 100644 --- a/tests/Feature/Documents/DocumentsTest.php +++ b/tests/Feature/Documents/DocumentsTest.php @@ -127,6 +127,22 @@ class DocumentsTest extends TestCase } } + public function test_overview_lists_areas_and_recent_documents(): void + { + $this->personal->update(['description' => 'Alles rund ums Personal']); + $this->uploadTo($this->vertraege, [UploadedFile::fake()->create('Vertrag.pdf', 5)]); + + $this->get('/dokumente')->assertInertia(fn (Assert $p) => $p + ->where('children.0.description', 'Alles rund ums Personal') + ->where('children.0.folders', 1) + ->where('children.0.documents', 0) + ->where('recent.0.title', 'Vertrag') + ->where('recent.0.folder_name', 'Verträge') + ->where('recent.0.updated_by', $this->hr->name)); + + $this->get("/dokumente/ordner/{$this->vertraege->id}")->assertInertia(fn (Assert $p) => $p->where('recent', [])->where('documents.0.folder_name', null)); + } + public function test_folders_can_only_be_deleted_when_empty(): void { $this->actingAs($this->hr)->delete("/dokumente/ordner/{$this->vertraege->id}")->assertRedirect(route('documents.folder', $this->personal)); diff --git a/tests/Feature/OrganigramTest.php b/tests/Feature/OrganigramTest.php index e47c683b..b1252b30 100644 --- a/tests/Feature/OrganigramTest.php +++ b/tests/Feature/OrganigramTest.php @@ -40,6 +40,21 @@ class OrganigramTest extends TestCase ->where("teams.{$head->id}.0.id", $nurse->id)); } + public function test_focus_view_starts_at_the_top_and_shows_contact_details(): void + { + $ceo = User::factory()->create(['first_name' => 'Clara', 'last_name' => 'Chefin', 'phone' => '+49 40 1']); + $head = User::factory()->create(['manager_id' => $ceo->id]); + User::factory()->create(['manager_id' => $head->id]); + + $this->actingAs($head)->get('/personen/organigramm?ansicht=fokus')->assertInertia(fn (Assert $p) => $p + ->where('view', 'fokus') + ->where('focus', $ceo->id) + ->where('details.phone', '+49 40 1') + ->where('stats', ['people' => 3, 'leaders' => 2])); + + $this->get('/personen/organigramm?ansicht=unsinn')->assertInertia(fn (Assert $p) => $p->where('view', 'baum')->where('details', null)); + } + public function test_admin_sets_managers_without_cycles(): void { $this->actingAs(User::factory()->admin()->create());