From b3fa5e020dd803766e965655b5bc88d2597e2131 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 29 Jun 2026 10:49:06 +0200 Subject: [PATCH 1/8] Add help text for all dashboard elements --- .../controllers/dashboard_viz_controller.js | 2 +- assets/styles/app.css | 9 +++-- templates/dashboard/index.html.twig | 38 ++++++++++++++----- translations/messages.da.yaml | 16 +++++--- translations/messages.en.yaml | 16 +++++--- 5 files changed, 57 insertions(+), 24 deletions(-) diff --git a/assets/controllers/dashboard_viz_controller.js b/assets/controllers/dashboard_viz_controller.js index 9c86ec1..3c49b06 100644 --- a/assets/controllers/dashboard_viz_controller.js +++ b/assets/controllers/dashboard_viz_controller.js @@ -308,7 +308,7 @@ export default class extends Controller { el.innerHTML = ""; if (!this.viz.collaboration.length) { el.innerHTML = - '

Ingen tværgående temaer endnu — kategorisér initiativer for at finde sammenfald.

'; + '

Ingen tværgående områder endnu — kategorisér initiativer for at finde sammenfald.

'; return; } // Hold the entrance paused until the panel scrolls into view; once seen, diff --git a/assets/styles/app.css b/assets/styles/app.css index 7926893..7c93f54 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -475,9 +475,9 @@ h3 { padding: var(--itk-space-4) var(--itk-space-5); border-bottom: 1px solid var(--itk-slate-100); display: flex; - align-items: center; - justify-content: space-between; - gap: var(--itk-space-3); + flex-direction: column; + align-items: flex-start; + gap: var(--itk-space-1); } .card__title { @@ -573,7 +573,8 @@ h3 { .card__sub { font-size: var(--itk-text-sm); color: var(--itk-slate-500); - margin: 0 0 var(--itk-space-4); + margin: 0; + line-height: 1.4; } .feed-scroll { diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig index 1b6dcfe..e9ad4fc 100644 --- a/templates/dashboard/index.html.twig +++ b/templates/dashboard/index.html.twig @@ -26,17 +26,19 @@
{{ 'dashboard.themes_heatmap'|trans }} +

{{ 'dashboard.themes_heatmap_sub'|trans }}

-

{{ 'dashboard.themes_heatmap_sub'|trans }}

-
{{ 'dashboard.collaboration'|trans }}
-
+
+ {{ 'dashboard.collaboration'|trans }}

{{ 'dashboard.collaboration_sub'|trans }}

+
+
@@ -58,32 +60,50 @@
-
{{ 'dashboard.status_by_dept'|trans }}
+
+ {{ 'dashboard.status_by_dept'|trans }} +

{{ 'dashboard.status_by_dept_sub'|trans }}

+
-
{{ 'dashboard.by_status'|trans }}
+
+ {{ 'dashboard.by_status'|trans }} +

{{ 'dashboard.by_status_sub'|trans }}

+
-
{{ 'dashboard.funding_sources'|trans }}
+
+ {{ 'dashboard.funding_sources'|trans }} +

{{ 'dashboard.funding_sources_sub'|trans }}

+
-
{{ 'dashboard.budget_by_dept'|trans }}
+
+ {{ 'dashboard.budget_by_dept'|trans }} +

{{ 'dashboard.budget_by_dept_sub'|trans }}

+
-
{{ 'dashboard.timeline'|trans }}
+
+ {{ 'dashboard.timeline'|trans }} +

{{ 'dashboard.timeline_sub'|trans }}

+
-
{{ 'dashboard.reach'|trans }}
+
+ {{ 'dashboard.reach'|trans }} +

{{ 'dashboard.reach_sub'|trans }}

+
diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml index 6acf675..f9a3232 100644 --- a/translations/messages.da.yaml +++ b/translations/messages.da.yaml @@ -131,20 +131,26 @@ dashboard: departments_involved: Afdelinger involveret departments_involved_hint: med mindst ét initiativ collaboration_count: Mulige samarbejder - collaboration_count_hint: temaer på tværs af afdelinger + collaboration_count_hint: områder på tværs af afdelinger by_status: Fordeling på status + by_status_sub: Alle initiativer fordelt på deres aktuelle status. recent: Senest oprettede no_status: Uden status empty: Der er endnu ikke oprettet nogen initiativer. - themes_heatmap: Temaer på tværs af afdelinger - themes_heatmap_sub: Mørkere = flere initiativer. Markerede temaer går på tværs af mindst tre afdelinger. + themes_heatmap: Områder på tværs af afdelinger + themes_heatmap_sub: Antal initiativer pr. område i hver afdeling. collaboration: Muligt samarbejde - collaboration_sub: Initiativer i forskellige afdelinger med fælles tema. + collaboration_sub: Initiativer i forskellige afdelinger med fælles område. status_by_dept: Status pr. afdeling + status_by_dept_sub: Initiativernes status fordelt på hver afdeling. funding_sources: Finansieringskilder + funding_sources_sub: Antal initiativer pr. finansieringskilde. budget_by_dept: Budget pr. afdeling - reach: Temaer med flest afdelinger + budget_by_dept_sub: Samlet budget for initiativerne i hver afdeling. + reach: Områder med flest afdelinger + reach_sub: Hvor mange afdelinger hvert område er repræsenteret i. timeline: Tidslinje + timeline_sub: Hvert initiativs tidsperiode på en tidslinje. initiative: title: Titel diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 92ae714..9f0e070 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -131,20 +131,26 @@ dashboard: departments_involved: Departments involved departments_involved_hint: with at least one initiative collaboration_count: Possible collaborations - collaboration_count_hint: themes across departments + collaboration_count_hint: areas across departments by_status: By status + by_status_sub: All initiatives grouped by their current status. recent: Recently created no_status: No status empty: No initiatives have been created yet. - themes_heatmap: Themes across departments - themes_heatmap_sub: Darker = more initiatives. Marked themes span at least three departments. + themes_heatmap: Areas across departments + themes_heatmap_sub: Number of initiatives per area in each department. Darker = more; marked areas span at least three departments. collaboration: Possible collaboration - collaboration_sub: Initiatives in different departments sharing a theme. + collaboration_sub: Initiatives in different departments sharing an area. status_by_dept: Status by department + status_by_dept_sub: Initiative statuses broken down by department. funding_sources: Funding sources + funding_sources_sub: Number of initiatives per funding source. budget_by_dept: Budget by department - reach: Themes by department reach + budget_by_dept_sub: Total budget of the initiatives in each department. + reach: Areas by department reach + reach_sub: How many departments each area appears in. timeline: Timeline + timeline_sub: Each initiative's time period on a timeline. initiative: title: Title From 7d087df4072ff5d05b0d44573ccbd14c5afeb7bf Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 29 Jun 2026 11:57:32 +0200 Subject: [PATCH 2/8] =?UTF-8?q?Move=20Aktivitet=20up,=20and=20add=20Dit=20?= =?UTF-8?q?igangv=C3=A6rende=20arbejde=20boks,=20showing=20the=20users=20c?= =?UTF-8?q?urrent=20unfinished=20work?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/styles/app.css | 87 +++++++++++++++++++++++++ src/Controller/DashboardController.php | 8 ++- src/Entity/Initiative.php | 18 +++++ src/Repository/ContactRepository.php | 16 ++++- src/Repository/InitiativeRepository.php | 22 +++++-- templates/activity/_item.html.twig | 18 ++--- templates/dashboard/index.html.twig | 80 ++++++++++++++++++----- tests/Unit/Entity/InitiativeTest.php | 20 ++++++ translations/messages.da.yaml | 13 +++- translations/messages.en.yaml | 11 ++++ 10 files changed, 260 insertions(+), 33 deletions(-) diff --git a/assets/styles/app.css b/assets/styles/app.css index 7c93f54..12dbd89 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -471,6 +471,24 @@ h3 { padding: var(--itk-space-5); } +.card--stretch { + align-self: stretch; + display: flex; + flex-direction: column; +} + +.feed-fill { + position: relative; + flex: 1; + min-height: 230px; +} + +.feed-fill .feed-scroll { + position: absolute; + inset: 0; + height: auto; +} + .card__header { padding: var(--itk-space-4) var(--itk-space-5); border-bottom: 1px solid var(--itk-slate-100); @@ -845,6 +863,75 @@ h3 { color: var(--itk-slate-500); } +a.recent-item { + color: inherit; + text-decoration: none; + transition: background-color 0.15s ease; +} + +a.recent-item:hover { + background-color: color-mix(in srgb, var(--itk-blue) 9%, transparent); +} + +.recent-item__cta { + display: none; + align-items: center; + gap: 4px; + font-size: var(--itk-text-xs); + font-weight: 600; + color: var(--itk-blue); + white-space: nowrap; +} + +a.recent-item:hover .badge { + display: none; +} + +a.recent-item:hover .recent-item__cta { + display: inline-flex; +} + +.recent-item__body { + display: flex; + flex-direction: column; + gap: 2px; + min-width: 0; +} + +.recent-item__body .recent-item__title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.todo-empty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: var(--itk-space-2); + height: 100%; + padding: var(--itk-space-5); + text-align: center; +} + +.todo-empty__icon { + color: var(--itk-green); + line-height: 0; +} + +.todo-empty__title { + font-weight: 600; + color: var(--itk-ink); +} + +.todo-empty__hint { + max-width: 34ch; + margin: 0 0 var(--itk-space-2); + font-size: var(--itk-text-sm); + color: var(--itk-slate-500); +} + .table-wrap { overflow-x: auto; } diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php index 8d63386..2053b0d 100644 --- a/src/Controller/DashboardController.php +++ b/src/Controller/DashboardController.php @@ -4,6 +4,8 @@ namespace App\Controller; +use App\Entity\User; +use App\Repository\ContactRepository; use App\Repository\InitiativeRepository; use App\Service\DashboardData; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -13,11 +15,15 @@ class DashboardController extends AbstractController { #[Route('/', name: 'app_dashboard', methods: ['GET'])] - public function index(InitiativeRepository $initiatives, DashboardData $dashboardData): Response + public function index(InitiativeRepository $initiatives, ContactRepository $contacts, DashboardData $dashboardData): Response { + $user = $this->getUser(); + return $this->render('dashboard/index.html.twig', [ 'recent' => $initiatives->findRecent(8), 'viz' => $dashboardData->build(), + 'unfinishedInitiatives' => $user instanceof User ? $initiatives->findUnfinishedListByCreator($user) : [], + 'incompleteContacts' => $user instanceof User ? $contacts->findIncompleteListByCreator($user) : [], ]); } } diff --git a/src/Entity/Initiative.php b/src/Entity/Initiative.php index d9c48bd..91e5649 100644 --- a/src/Entity/Initiative.php +++ b/src/Entity/Initiative.php @@ -501,6 +501,24 @@ public function getCompletionPercentage(): int return (int) round(\count(array_filter($checks)) / \count($checks) * 100); } + /** + * Whether the initiative has been edited since it was created — drives the + * "updated" vs "created" label in the dashboard activity feed. Only counts as + * an edit once it's more than a day past creation, so the initial save and any + * same-day tweaks still read as "created". + */ + public function wasUpdatedAfterCreation(): bool + { + $created = $this->getCreatedAt(); + $updated = $this->getUpdatedAt(); + + if (null === $created || null === $updated) { + return false; + } + + return $updated->getTimestamp() - $created->getTimestamp() > 60 * 60 * 24; + } + public function __toString(): string { return (string) $this->title; diff --git a/src/Repository/ContactRepository.php b/src/Repository/ContactRepository.php index a7cd004..8aa5f2f 100644 --- a/src/Repository/ContactRepository.php +++ b/src/Repository/ContactRepository.php @@ -63,6 +63,18 @@ public function findOrCreate(string $name): Contact * Used by the mascot to nudge them to fill in the rest. */ public function findIncompleteByCreator(User $user): ?Contact + { + return $this->findIncompleteListByCreator($user, 1)[0] ?? null; + } + + /** + * The user's contacts that still lack an email (created name-only and not yet + * finished), most recent first, capped at $limit. Surfaced on the dashboard + * as outstanding work. + * + * @return Contact[] + */ + public function findIncompleteListByCreator(User $user, int $limit = 6): array { // createdBy is a ManyToOne to the UserInterface (resolved to User via // resolve_target_entities); binding the entity to a ULID FK doesn't match, @@ -72,8 +84,8 @@ public function findIncompleteByCreator(User $user): ?Contact ->andWhere("(c.email IS NULL OR c.email = '')") ->setParameter('user', $user->getId(), 'ulid') ->orderBy('c.createdAt', 'DESC') - ->setMaxResults(1) + ->setMaxResults($limit) ->getQuery() - ->getOneOrNullResult(); + ->getResult(); } } diff --git a/src/Repository/InitiativeRepository.php b/src/Repository/InitiativeRepository.php index af4636e..18ce917 100644 --- a/src/Repository/InitiativeRepository.php +++ b/src/Repository/InitiativeRepository.php @@ -180,10 +180,21 @@ public function countByCreator(User $user): int /** * The creator's least-complete initiative that isn't fully filled in yet, or - * null if none are outstanding. Completion is computed in PHP (not a stored - * column), so this scans only the creator's 50 most recent initiatives. + * null if none are outstanding. */ public function findUnfinishedByCreator(User $user): ?Initiative + { + return $this->findUnfinishedListByCreator($user, 1)[0] ?? null; + } + + /** + * The creator's incomplete initiatives (completion below 100 %), least-complete + * first, capped at $limit. Completion is computed in PHP (not a stored column), + * so this scans only the creator's 50 most recent initiatives. + * + * @return Initiative[] + */ + public function findUnfinishedListByCreator(User $user, int $limit = 6): array { // See countByCreator: match the raw ULID FK, not the entity. $initiatives = $this->createQueryBuilder('i') @@ -204,7 +215,7 @@ public function findUnfinishedByCreator(User $user): ?Initiative static fn (Initiative $a, Initiative $b): int => $a->getCompletionPercentage() <=> $b->getCompletionPercentage(), ); - return $unfinished[0] ?? null; + return \array_slice($unfinished, 0, $limit); } /** @@ -232,12 +243,15 @@ public function countByStatus(): array } /** + * Most recently touched initiatives (created or edited) for the activity feed, + * newest first. Ordered by updatedAt so an edit resurfaces the initiative. + * * @return Initiative[] */ public function findRecent(int $limit = 5): array { return $this->createQueryBuilder('i') - ->orderBy('i.createdAt', 'DESC') + ->orderBy('i.updatedAt', 'DESC') ->setMaxResults($limit) ->getQuery() ->getResult(); diff --git a/templates/activity/_item.html.twig b/templates/activity/_item.html.twig index 8adc949..8afa337 100644 --- a/templates/activity/_item.html.twig +++ b/templates/activity/_item.html.twig @@ -1,9 +1,9 @@ -
-
- {% if url %}{{ title }}{% else %}{{ title }}{% endif %} -
- {%- if actor %}{{ actor }} · {% endif -%} - {{ ('activity.action.' ~ action)|trans }} · {{ at|date('d.m.Y H:i') }} -
-
-
+{% set row_tag = url ? 'a' : 'div' %} +<{{ row_tag }} id="activity-item-{{ id }}" class="recent-item"{% if url %} href="{{ url }}"{% endif %}> + + {{ title }} + {%- if actor %}{{ actor }} · {% endif -%}{{ at|date('d.m.Y H:i') }} + + {{ ('activity.action.' ~ action)|trans|capitalize }} + {% if url %}{{ 'action.view'|trans }} →{% endif %} + diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig index e9ad4fc..b0e2ffe 100644 --- a/templates/dashboard/index.html.twig +++ b/templates/dashboard/index.html.twig @@ -23,6 +23,70 @@
+
+
+ {{ 'dashboard.unfinished.title'|trans }} +

{{ 'dashboard.unfinished.sub'|trans }}

+
+
+ {% if unfinishedInitiatives is empty and incompleteContacts is empty %} +
+
{{ 'dashboard.unfinished.empty_title'|trans }}
+
+ {% else %} + {% for initiative in unfinishedInitiatives %} + + + {{ initiative.title }} + {{ 'dashboard.unfinished.initiative'|trans }} + + {{ 'dashboard.unfinished.percent_done'|trans({'%percent%': initiative.completionPercentage}) }} + {{ 'dashboard.unfinished.cta'|trans }} → + + {% endfor %} + {% for contact in incompleteContacts %} + + + {{ contact.name }} + {{ 'dashboard.unfinished.contact'|trans }} + + {{ 'dashboard.unfinished.contact_badge'|trans }} + {{ 'dashboard.unfinished.cta'|trans }} → + + {% endfor %} + {% endif %} +
+
+ +
+
+ {{ 'activity.title'|trans }} +

{{ 'activity.subtitle'|trans }}

+
+
+
+ {% if recent is empty %} +
+
{{ 'activity.empty'|trans }}
+
+ {% else %} + {% for initiative in recent %} + {% set updated = initiative.wasUpdatedAfterCreation %} + {% set actor = updated ? initiative.modifiedBy : initiative.createdBy %} + {{ include('activity/_item.html.twig', { + id: initiative.id, + action: updated ? 'updated' : 'created', + title: initiative.title, + url: path('app_initiative_show', {id: initiative.id}), + actor: actor ? actor.name : null, + at: updated ? initiative.updatedAt : initiative.createdAt, + }) }} + {% endfor %} + {% endif %} +
+
+
+
{{ 'dashboard.themes_heatmap'|trans }} @@ -43,22 +107,6 @@
-
-
{{ 'activity.title'|trans }}
-
- {% for initiative in recent %} - {{ include('activity/_item.html.twig', { - id: initiative.id, - action: 'created', - title: initiative.title, - url: path('app_initiative_show', {id: initiative.id}), - actor: initiative.createdBy ? initiative.createdBy.name : null, - at: initiative.createdAt, - }) }} - {% endfor %} -
-
-
{{ 'dashboard.status_by_dept'|trans }} diff --git a/tests/Unit/Entity/InitiativeTest.php b/tests/Unit/Entity/InitiativeTest.php index 97a5f2c..b522e32 100644 --- a/tests/Unit/Entity/InitiativeTest.php +++ b/tests/Unit/Entity/InitiativeTest.php @@ -95,6 +95,26 @@ public function testCompletionPercentage(): void self::assertSame(100, $full->getCompletionPercentage()); } + public function testWasUpdatedAfterCreation(): void + { + // No timestamps yet (entity not persisted) — treated as not updated. + self::assertFalse((new Initiative())->wasUpdatedAfterCreation()); + + $created = new \DateTimeImmutable('2025-01-01 10:00:00'); + + // Edited within a day of creation: still reads as "created". + $fresh = new Initiative(); + $fresh->setCreatedAt($created); + $fresh->setUpdatedAt($created->modify('+5 hours')); + self::assertFalse($fresh->wasUpdatedAfterCreation()); + + // Edited more than a day after creation. + $edited = new Initiative(); + $edited->setCreatedAt($created); + $edited->setUpdatedAt($created->modify('+2 days')); + self::assertTrue($edited->wasUpdatedAfterCreation()); + } + public function testFundingRoundTrip(): void { $initiative = (new Initiative())->setFunding([Funding::MunicipalBudget, Funding::EuFunds]); diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml index f9a3232..8430eac 100644 --- a/translations/messages.da.yaml +++ b/translations/messages.da.yaml @@ -16,7 +16,7 @@ mascot: blanks: "“%title%” er %percent% % udfyldt — der mangler stadig et par felter. 📝" ending: "“%title%” er %percent% % færdig. Giv den en værdig afslutning! 🏁" strong: "“%title%” er %percent% % færdig — lad os tage den sidste bid! 💪" - finish_cta: Gør færdig + finish_cta: Gå til redigering contact: details: "Kontaktpersonen “%name%” som du har oprettet mangler stadig oplysninger — Vil du gøre den færdig?" quick: "Du tilføjede “%name%” i farten — vil du udfylde resten? ✏️" @@ -60,6 +60,8 @@ autosave: activity: title: Aktivitet + subtitle: Seneste aktivitet på platformen + empty: Ingen aktivitet at vise action: created: oprettede updated: opdaterede @@ -151,6 +153,15 @@ dashboard: reach_sub: Hvor mange afdelinger hvert område er repræsenteret i. timeline: Tidslinje timeline_sub: Hvert initiativs tidsperiode på en tidslinje. + unfinished: + title: Dit igangværende arbejde + sub: Dine initiativer og kontaktpersoner der mangler de sidste detaljer. + initiative: Initiativ + contact: Kontaktperson + contact_badge: Mangler oplysninger + percent_done: "%percent% % udfyldt" + cta: Gå til redigering + empty_title: Intet igangværende arbejde initiative: title: Titel diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 9f0e070..9b139ae 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -60,6 +60,8 @@ autosave: activity: title: Activity + subtitle: Latest activity on the platform + empty: No activity to show action: created: created updated: updated @@ -151,6 +153,15 @@ dashboard: reach_sub: How many departments each area appears in. timeline: Timeline timeline_sub: Each initiative's time period on a timeline. + unfinished: + title: Your work + sub: Your initiatives and contacts that are still missing details. + initiative: Initiative + contact: Contact + contact_badge: Missing details + percent_done: "%percent% % filled in" + cta: Finish + empty_title: You're all caught up initiative: title: Title From ea77c6ac06b1d6269c42cbb003d610062c14f3fe Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 29 Jun 2026 12:12:15 +0200 Subject: [PATCH 3/8] Updated changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfae926..d16fbb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* [PR-18](https://github.com/itk-dev/itk-project-database/pull/18) + Rework the dashboard with an outstanding-work panel and a redesigned activity + feed, add help text to every graph, and fix the mascot's finish nudges. * [PR-16](https://github.com/itk-dev/itk-project-database/pull/16) Turn the strategies and tags fields into a searchable, shared tag pool where new entries are capitalised and reused as suggestions. From 4a036edc7e2ac756cbd96e0dec6972b81af6fae9 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 29 Jun 2026 12:20:50 +0200 Subject: [PATCH 4/8] =?UTF-8?q?Display=20default=20empty=20text=20in=20Omr?= =?UTF-8?q?=C3=A5der=20p=C3=A5=20tv=C3=A6rs=20af=20afdelinger,=20until=20b?= =?UTF-8?q?oth=20afdelinger=20and=20omr=C3=A5der=20exists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/dashboard_viz_controller.js | 19 +++++++++++++++++++ assets/styles/app.css | 6 ++++++ templates/dashboard/index.html.twig | 2 +- translations/messages.da.yaml | 1 + translations/messages.en.yaml | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/assets/controllers/dashboard_viz_controller.js b/assets/controllers/dashboard_viz_controller.js index 3c49b06..bd24e8e 100644 --- a/assets/controllers/dashboard_viz_controller.js +++ b/assets/controllers/dashboard_viz_controller.js @@ -65,6 +65,10 @@ export default class extends Controller { "timeline", ]; + static values = { + empty: String, + }; + connect() { this.reduce = window.matchMedia( "(prefers-reduced-motion: reduce)", @@ -221,6 +225,18 @@ export default class extends Controller { buildHeatmap() { const d = this.viz; const el = this.heatmapTarget; + + // The heatmap only makes sense once there are both rows (departments) and + // columns (areas) to cross; until then show a placeholder, not bare headers. + if (!d.areas.length || !d.departments.length) { + el.style.gridTemplateColumns = ""; + el.classList.remove("heat--paused"); + el.innerHTML = `

${this.esc(this.emptyValue)}

`; + this.heatColHeads = []; + this.heatCells = []; + return; + } + el.style.gridTemplateColumns = `minmax(120px, 168px) repeat(${d.areas.length}, minmax(40px, 1fr))`; if (!this.reduce) { el.classList.add("heat--paused"); @@ -254,6 +270,9 @@ export default class extends Controller { updateHeatmap(initial = false) { const d = this.viz; + if (!d.areas.length || !d.departments.length) { + return; + } let max = 1; d.heatmap.forEach((row) => row.forEach((v) => { diff --git a/assets/styles/app.css b/assets/styles/app.css index 12dbd89..c26b4d4 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -628,6 +628,12 @@ h3 { min-width: 560px; } +.heat-empty { + margin: 0; + color: var(--itk-slate-500); + font-size: var(--itk-text-sm); +} + .heat__collabel { display: flex; flex-direction: column; diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig index b0e2ffe..435a044 100644 --- a/templates/dashboard/index.html.twig +++ b/templates/dashboard/index.html.twig @@ -3,7 +3,7 @@ {% block title %}{{ 'dashboard.title'|trans }} · {{ 'app.name'|trans }}{% endblock %} {% block body %} -
+

{{ 'dashboard.title'|trans }}

diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml index 8430eac..9880564 100644 --- a/translations/messages.da.yaml +++ b/translations/messages.da.yaml @@ -141,6 +141,7 @@ dashboard: empty: Der er endnu ikke oprettet nogen initiativer. themes_heatmap: Områder på tværs af afdelinger themes_heatmap_sub: Antal initiativer pr. område i hver afdeling. + themes_heatmap_empty: Tilføj både afdelinger og områder for at se denne graf. collaboration: Muligt samarbejde collaboration_sub: Initiativer i forskellige afdelinger med fælles område. status_by_dept: Status pr. afdeling diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 9b139ae..e42c1da 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -141,6 +141,7 @@ dashboard: empty: No initiatives have been created yet. themes_heatmap: Areas across departments themes_heatmap_sub: Number of initiatives per area in each department. Darker = more; marked areas span at least three departments. + themes_heatmap_empty: Add both departments and areas to see this chart. collaboration: Possible collaboration collaboration_sub: Initiatives in different departments sharing an area. status_by_dept: Status by department From 1e6333f5b61a2c7fd66b9c397833fcd6a0ef1432 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 29 Jun 2026 15:12:28 +0200 Subject: [PATCH 5/8] Added ITK logo and redesigned login screen --- assets/images/itk-logo.png | Bin 0 -> 32717 bytes assets/styles/app.css | 51 ++++++++++++++++++---------- templates/base.html.twig | 5 ++- templates/dashboard/index.html.twig | 4 +-- templates/security/login.html.twig | 12 +++++-- translations/messages.da.yaml | 6 ++-- translations/messages.en.yaml | 6 ++-- 7 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 assets/images/itk-logo.png diff --git a/assets/images/itk-logo.png b/assets/images/itk-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ca95a6a221d7dedb10ee093868f1eb2f5a6db862 GIT binary patch literal 32717 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 literal 0 HcmV?d00001 diff --git a/assets/styles/app.css b/assets/styles/app.css index c26b4d4..ab827ba 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -129,13 +129,8 @@ h3 { } .top-nav__brand { - font-size: var(--itk-text-base); - font-weight: 700; - color: var(--itk-ink); display: inline-flex; align-items: center; - gap: var(--itk-space-2); - letter-spacing: -0.01em; } .top-nav__brand:hover { @@ -143,19 +138,20 @@ h3 { text-decoration: none; } -.top-nav__brand-mark { - width: 28px; - height: 28px; - border-radius: var(--itk-radius-2); - background: linear-gradient(135deg, var(--itk-blue), var(--itk-cyan)); - display: inline-block; +.top-nav__brand-logo { + height: 26px; + width: auto; + display: block; } .top-nav__menu { display: flex; align-items: center; gap: var(--itk-space-1); - margin-left: var(--itk-space-4); + margin-left: max( + var(--itk-space-4), + calc((100vw - var(--itk-container)) / 2 - 90px) + ); } .top-nav__link { @@ -1549,15 +1545,20 @@ textarea { .auth__brand { display: flex; - align-items: center; - gap: var(--itk-space-2); - font-weight: 700; - font-size: var(--itk-text-md); - margin-bottom: var(--itk-space-2); + justify-content: center; + margin-bottom: var(--itk-space-5); +} + +.auth__logo { + height: 44px; + width: auto; + display: block; } .auth__title { font-size: var(--itk-text-xl); + font-weight: 700; + text-align: center; margin-bottom: var(--itk-space-6); } @@ -1565,6 +1566,22 @@ textarea { margin-bottom: var(--itk-space-4); } +.auth__divider { + border: none; + border-top: 1px solid var(--itk-slate-200); + margin: var(--itk-space-6) 0 var(--itk-space-5); +} + +.auth__help-title { + font-size: var(--itk-text-md); + font-weight: 700; + margin-bottom: var(--itk-space-2); +} + +.auth__help p { + color: var(--itk-slate-500); +} + .admin-layout { display: grid; grid-template-columns: 220px 1fr; diff --git a/templates/base.html.twig b/templates/base.html.twig index 177618c..3f28559 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -18,9 +18,8 @@ {% if app.user %} {% set route = app.request.attributes.get('_route') %}