From 33862183bf300b316b9d3c39562c131301cbfd60 Mon Sep 17 00:00:00 2001 From: Friederich Loheide Date: Sat, 26 Sep 2026 13:15:44 +0000 Subject: [PATCH] Organigramm und Dokumente kompakter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Organigramm: zwei Ebenen offen, Fläche so hoch wie der Inhalt, kleinere Abstände; Fokus-Ansicht in voller Breite mit Seitenspalte und Team-Vorschau - Dokumente: dichtere Zeilen, Unterordner in den Bereichen, Infospalte „Über diesen Ordner“ mit den pflegenden Rollen - Etwas weniger Randabstand im Seitenlayout Co-Authored-By: Claude Opus 5.5 (1M context) --- CHANGELOG.md | 1 + app/Http/Controllers/OrganigramController.php | 40 ++- .../resources/js/components/DocumentGrid.vue | 6 +- .../resources/js/components/DocumentTable.vue | 21 +- .../documents/resources/js/pages/Index.vue | 78 +++-- .../Http/Controllers/DocumentController.php | 24 +- ...yout-cC9VbY3M.js => AppLayout-CWJWwaeG.js} | 2 +- .../{Areas-CI4N-fWy.js => Areas-B7gAy7d3.js} | 2 +- ...m-C_eKj_7w.js => BirthdayItem-Dd-_WknH.js} | 2 +- ...Dx4G0UTJ.js => BirthdaysBlock-DzaMtEKr.js} | 2 +- ...Logo-CtTA2Hvh.js => BrandLogo-QFn4Ilc6.js} | 2 +- ...uilder-zmgpzU-U.js => Builder-f18I1NDs.js} | 2 +- ...tacts-BZBzP1ha.js => Contacts-Da12-edI.js} | 2 +- ...ile-l9h2Bbu-.js => CustomTile-BfnSN-M_.js} | 2 +- ...oard-DBZSy4-9.js => Dashboard-lUU0mMXc.js} | 4 +- ...Dlc_0LfC.js => DirectoryLogin-DYn59mrF.js} | 2 +- .../{Edit-Cw9trNrJ.js => Edit-DqV_fuJ8.js} | 4 +- ...{Editor-CIWswHcs.js => Editor-PdRcqqRp.js} | 2 +- ...{Editor-BEopXIHj.js => Editor-cV_rfzYU.js} | 2 +- ...CYw0kGtk.js => EditorialForms-BZU_mSFE.js} | 2 +- ...-czIn1ecM.js => EditorialNews-Cx6UuDPY.js} | 2 +- ...DEqHXP13.js => EditorialPages-Ydtf7x8G.js} | 2 +- ...-DdjGhwIt.js => EventListItem-yNoiRlAX.js} | 2 +- ...ck-DvqMyfe-.js => FolderBlock-BPxS0t58.js} | 2 +- ...Dz3ijPBT.js => ForgotPassword-BXxb13nV.js} | 2 +- ...lock-DEAnieTZ.js => FormBlock-CmH0dBYH.js} | 2 +- ...r-DBq9ikB_.js => FormRenderer-JFhk2GVn.js} | 2 +- ...eting-BRRLTBtz.js => Greeting-NsWPCOJd.js} | 2 +- ...ut-DDNLcG12.js => GuestLayout-CUvEjEFB.js} | 2 +- .../{Hero-27mJWjty.js => Hero-CPZF91qy.js} | 2 +- .../{Index-8PoLK6IS.js => Index-BECopX65.js} | 2 +- .../{Index-B_yk80fe.js => Index-Bgk5hsuC.js} | 2 +- .../{Index-CSvvlThC.js => Index-Bhv_AHlC.js} | 2 +- public/build/assets/Index-DiR6Ll-E.js | 1 - public/build/assets/Index-DndcC_BZ.js | 1 + .../{Index-DzOvK3IN.js => Index-DumjLpFg.js} | 4 +- .../{Index-DPjH7veO.js => Index-Teml8wwQ.js} | 2 +- .../{Index-CKgPCw64.js => Index-Xpiyf5ku.js} | 2 +- .../{Index-CPrBLwNj.js => Index-zSRonorI.js} | 2 +- ...{Latest-ByPcnOFU.js => Latest-BIOYJ11w.js} | 2 +- ...ews-IJWm3Yql.js => LatestNews-DNmA0Hk7.js} | 2 +- .../{Login-BE3CWC0H.js => Login--RXsQyHK.js} | 2 +- ...-CWNjZtOs.js => NewColleagues-CxrzNLz_.js} | 2 +- ...-B_bhrvKr.js => NewPageDialog-CCo3uyvq.js} | 2 +- ...sCard-BdBx4PN9.js => NewsCard-DSCApHIo.js} | 2 +- ...m-R3koZ8_1.js => NewsListItem-BGkV74ut.js} | 2 +- public/build/assets/Organigram--HFnEAUo.css | 1 - public/build/assets/Organigram-BSaryvd8.js | 1 - public/build/assets/Organigram-X4MSIQQY.js | 1 + public/build/assets/Organigram-Y7urd_Gw.css | 1 + ...nt-BN6Ih5Fa.js => PageContent-LgdzPPSZ.js} | 4 +- .../{Panel-UNAceHvi.js => Panel-ZzkS5K7e.js} | 2 +- ...h-B7xliGYA.js => PeopleSearch-Dv1XFHUB.js} | 2 +- ...Vj_z8P8.js => ProfileBirthday-C7AAfTaW.js} | 2 +- ...Oc2Iz.js => ProfileIncomplete-B22h5bKn.js} | 2 +- ...nks-0SVa20Xq.js => QuickLinks-D9AoedDD.js} | 2 +- ...-BEaGX9c9.js => ResetPassword-CBd2f9jq.js} | 2 +- ...{Sample-BvkfiqOA.js => Sample-D8alw7k9.js} | 2 +- .../{Show-CyKvSkuf.js => Show-BoF5uh8O.js} | 2 +- .../{Show-DTiZTq6y.js => Show-CFK1CFTX.js} | 2 +- .../{Show-w9J3u2Q4.js => Show-CszyLDHH.js} | 2 +- .../{Show-uDDXxVlb.js => Show-D7kgw99U.js} | 2 +- .../{Show-APALy6r7.js => Show-gks3xEl0.js} | 2 +- ...pages-DnmxpMhQ.js => Subpages-BWhfF8Hq.js} | 2 +- .../{Text-D99SzuwE.js => Text-BjcYkG-R.js} | 2 +- ...oming-BMwOGKNP.js => Upcoming-CSun_diC.js} | 2 +- ...oming-COfo7hH0.js => Upcoming-CX175LVd.js} | 2 +- ...BwQ4N6-l.js => UpcomingEvents-DQGi8Hpw.js} | 2 +- public/build/assets/app-Bao3lx6i.css | 2 - public/build/assets/app-CeywX0nS.css | 2 + .../{app-l1ySyjFE.js => app-Dqgwmm3W.js} | 4 +- public/build/manifest.json | 271 +++++++++--------- resources/js/components/org/OrgCard.vue | 12 +- resources/js/components/org/OrgChart.vue | 22 +- resources/js/components/org/OrgChartNode.vue | 20 +- resources/js/components/org/OrgFocus.vue | 184 ++++++------ resources/js/layouts/AppLayout.vue | 2 +- resources/js/pages/People/Organigram.vue | 5 +- tests/Feature/Documents/DocumentsTest.php | 1 + tests/Feature/OrganigramTest.php | 6 +- 80 files changed, 475 insertions(+), 352 deletions(-) rename public/build/assets/{AppLayout-cC9VbY3M.js => AppLayout-CWJWwaeG.js} (68%) rename public/build/assets/{Areas-CI4N-fWy.js => Areas-B7gAy7d3.js} (91%) rename public/build/assets/{BirthdayItem-C_eKj_7w.js => BirthdayItem-Dd-_WknH.js} (95%) rename public/build/assets/{BirthdaysBlock-Dx4G0UTJ.js => BirthdaysBlock-DzaMtEKr.js} (91%) rename public/build/assets/{BrandLogo-CtTA2Hvh.js => BrandLogo-QFn4Ilc6.js} (95%) rename public/build/assets/{Builder-zmgpzU-U.js => Builder-f18I1NDs.js} (99%) rename public/build/assets/{Contacts-BZBzP1ha.js => Contacts-Da12-edI.js} (96%) rename public/build/assets/{CustomTile-l9h2Bbu-.js => CustomTile-BfnSN-M_.js} (97%) rename public/build/assets/{Dashboard-DBZSy4-9.js => Dashboard-lUU0mMXc.js} (67%) rename public/build/assets/{DirectoryLogin-Dlc_0LfC.js => DirectoryLogin-DYn59mrF.js} (95%) rename public/build/assets/{Edit-Cw9trNrJ.js => Edit-DqV_fuJ8.js} (95%) rename public/build/assets/{Editor-CIWswHcs.js => Editor-PdRcqqRp.js} (99%) rename public/build/assets/{Editor-BEopXIHj.js => Editor-cV_rfzYU.js} (98%) rename public/build/assets/{EditorialForms-CYw0kGtk.js => EditorialForms-BZU_mSFE.js} (94%) rename public/build/assets/{EditorialNews-czIn1ecM.js => EditorialNews-Cx6UuDPY.js} (95%) rename public/build/assets/{EditorialPages-DEqHXP13.js => EditorialPages-Ydtf7x8G.js} (91%) rename public/build/assets/{EventListItem-DdjGhwIt.js => EventListItem-yNoiRlAX.js} (92%) rename public/build/assets/{FolderBlock-DvqMyfe-.js => FolderBlock-BPxS0t58.js} (96%) rename public/build/assets/{ForgotPassword-Dz3ijPBT.js => ForgotPassword-BXxb13nV.js} (92%) rename public/build/assets/{FormBlock-DEAnieTZ.js => FormBlock-CmH0dBYH.js} (93%) rename public/build/assets/{FormRenderer-DBq9ikB_.js => FormRenderer-JFhk2GVn.js} (99%) rename public/build/assets/{Greeting-BRRLTBtz.js => Greeting-NsWPCOJd.js} (95%) rename public/build/assets/{GuestLayout-DDNLcG12.js => GuestLayout-CUvEjEFB.js} (96%) rename public/build/assets/{Hero-27mJWjty.js => Hero-CPZF91qy.js} (98%) rename public/build/assets/{Index-8PoLK6IS.js => Index-BECopX65.js} (92%) rename public/build/assets/{Index-B_yk80fe.js => Index-Bgk5hsuC.js} (93%) rename public/build/assets/{Index-CSvvlThC.js => Index-Bhv_AHlC.js} (93%) delete mode 100644 public/build/assets/Index-DiR6Ll-E.js create mode 100644 public/build/assets/Index-DndcC_BZ.js rename public/build/assets/{Index-DzOvK3IN.js => Index-DumjLpFg.js} (68%) rename public/build/assets/{Index-DPjH7veO.js => Index-Teml8wwQ.js} (94%) rename public/build/assets/{Index-CKgPCw64.js => Index-Xpiyf5ku.js} (90%) rename public/build/assets/{Index-CPrBLwNj.js => Index-zSRonorI.js} (97%) rename public/build/assets/{Latest-ByPcnOFU.js => Latest-BIOYJ11w.js} (88%) rename public/build/assets/{LatestNews-IJWm3Yql.js => LatestNews-DNmA0Hk7.js} (90%) rename public/build/assets/{Login-BE3CWC0H.js => Login--RXsQyHK.js} (97%) rename public/build/assets/{NewColleagues-CWNjZtOs.js => NewColleagues-CxrzNLz_.js} (87%) rename public/build/assets/{NewPageDialog-B_bhrvKr.js => NewPageDialog-CCo3uyvq.js} (97%) rename public/build/assets/{NewsCard-BdBx4PN9.js => NewsCard-DSCApHIo.js} (94%) rename public/build/assets/{NewsListItem-R3koZ8_1.js => NewsListItem-BGkV74ut.js} (92%) delete mode 100644 public/build/assets/Organigram--HFnEAUo.css delete mode 100644 public/build/assets/Organigram-BSaryvd8.js create mode 100644 public/build/assets/Organigram-X4MSIQQY.js create mode 100644 public/build/assets/Organigram-Y7urd_Gw.css rename public/build/assets/{PageContent-BN6Ih5Fa.js => PageContent-LgdzPPSZ.js} (76%) rename public/build/assets/{Panel-UNAceHvi.js => Panel-ZzkS5K7e.js} (93%) rename public/build/assets/{PeopleSearch-B7xliGYA.js => PeopleSearch-Dv1XFHUB.js} (89%) rename public/build/assets/{ProfileBirthday-BVj_z8P8.js => ProfileBirthday-C7AAfTaW.js} (92%) rename public/build/assets/{ProfileIncomplete-DNZOc2Iz.js => ProfileIncomplete-B22h5bKn.js} (82%) rename public/build/assets/{QuickLinks-0SVa20Xq.js => QuickLinks-D9AoedDD.js} (97%) rename public/build/assets/{ResetPassword-BEaGX9c9.js => ResetPassword-CBd2f9jq.js} (93%) rename public/build/assets/{Sample-BvkfiqOA.js => Sample-D8alw7k9.js} (87%) rename public/build/assets/{Show-CyKvSkuf.js => Show-BoF5uh8O.js} (91%) rename public/build/assets/{Show-DTiZTq6y.js => Show-CFK1CFTX.js} (95%) rename public/build/assets/{Show-w9J3u2Q4.js => Show-CszyLDHH.js} (94%) rename public/build/assets/{Show-uDDXxVlb.js => Show-D7kgw99U.js} (81%) rename public/build/assets/{Show-APALy6r7.js => Show-gks3xEl0.js} (96%) rename public/build/assets/{Subpages-DnmxpMhQ.js => Subpages-BWhfF8Hq.js} (95%) rename public/build/assets/{Text-D99SzuwE.js => Text-BjcYkG-R.js} (94%) rename public/build/assets/{Upcoming-BMwOGKNP.js => Upcoming-CSun_diC.js} (89%) rename public/build/assets/{Upcoming-COfo7hH0.js => Upcoming-CX175LVd.js} (82%) rename public/build/assets/{UpcomingEvents-BwQ4N6-l.js => UpcomingEvents-DQGi8Hpw.js} (88%) delete mode 100644 public/build/assets/app-Bao3lx6i.css create mode 100644 public/build/assets/app-CeywX0nS.css rename public/build/assets/{app-l1ySyjFE.js => app-Dqgwmm3W.js} (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61493440..f38f127c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Der Self-Updater zeigt diese Abschnitte bei neuen Versionen an. - 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 +- Kompakter: Organigramm zeigt gleich zwei Ebenen, Fokus-Ansicht mit Seitenspalte (Berichtet an, Im selben Team) und Team-Vorschau je Führungskraft; Dokumente mit dichteren Zeilen, Unterordnern in den Bereichen und Infospalte „Über diesen Ordner“ (u. a. wer den Ordner pflegt); etwas weniger Randabstand auf allen Seiten ## 0.9.0 diff --git a/app/Http/Controllers/OrganigramController.php b/app/Http/Controllers/OrganigramController.php index a5745bad..a712b6cb 100644 --- a/app/Http/Controllers/OrganigramController.php +++ b/app/Http/Controllers/OrganigramController.php @@ -52,15 +52,46 @@ class OrganigramController extends Controller if (! $roots->contains('id', $path[0])) { $roots = $roots->push(...$this->nodes(User::query()->whereKey($path[0])))->values(); } - } elseif ($roots->count() === 1) { - // Nur eine Spitze (z. B. die Geschäftsführung): erste Ebene gleich zeigen. - $path = [$roots[0]['id']]; - $teams[$path[0]] = $this->nodes(User::query()->active()->where('manager_id', $path[0])); + } + + // Aufgeklappt: der Weg zur gesuchten Person – sonst die obersten zwei Ebenen, + // damit das Organigramm gleich etwas zeigt. + $open = array_values(array_filter($path, fn ($id) => $id !== $focus?->id)); + + if (! $focus && $roots->count() <= 3) { + foreach ($roots as $root) { + $teams[$root['id']] = $this->nodes(User::query()->active()->where('manager_id', $root['id'])); + $open[] = $root['id']; + } + + $leaders = collect($teams)->flatten(1)->where('reports', '>', 0)->pluck('id')->take(12)->all(); + + if ($leaders !== []) { + $this->nodes(User::query()->active()->whereIn('manager_id', $leaders)) + ->groupBy('manager_id') + ->each(function ($team, $managerId) use (&$teams) { + $teams[$managerId] = $team->values(); + }); + $open = [...$open, ...$leaders]; + } + } + + // Fokus: auch die Teams der direkt Unterstellten – für die Vorschau im Fokus. + if ($focus && $view === 'fokus') { + $leads = collect($teams[$focus->id] ?? [])->where('reports', '>', 0)->pluck('id')->take(24)->all(); + + if ($leads !== []) { + $this->nodes(User::query()->active()->whereIn('manager_id', $leads))->groupBy('manager_id') + ->each(function ($team, $managerId) use (&$teams) { + $teams[$managerId] = $team->values(); + }); + } } return Inertia::render('People/Organigram', [ 'roots' => $roots, 'path' => $path, + 'open' => array_values(array_unique($open)), 'teams' => (object) $teams, 'focus' => $focus?->id, 'details' => $focus ? [ @@ -110,6 +141,7 @@ class OrganigramController extends Controller 'location' => $u->location, 'avatar_url' => $u->avatarUrl(96), 'reports' => $u->reports_count, + 'manager_id' => $u->manager_id, ]); } } diff --git a/plugins-core/documents/resources/js/components/DocumentGrid.vue b/plugins-core/documents/resources/js/components/DocumentGrid.vue index a11a45c3..90f5f43d 100644 --- a/plugins-core/documents/resources/js/components/DocumentGrid.vue +++ b/plugins-core/documents/resources/js/components/DocumentGrid.vue @@ -21,7 +21,7 @@ defineEmits(['versions', 'new-version', 'edit', 'remove']);