Merge pull request #42 from ConductionNL/feature/dashboard-widgets

feature/dashboard-widgets

appinfo/info.xml

@@ -26,7 +26,7 @@ Create a [feature request](https://github.com/OpenCatalogi/.github/issues/new/ch
 	<licence>agpl</licence>
 	<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>
 	<namespace>ZaakAfhandelApp</namespace>
-	<category>organisation</category>
+	<category>organization</category>
     <website>https://github.com/ConductionNL/zaakafhandelapp</website>
 	<bugs>https://github.com/ConductionNL/zaakafhandelapp/issues</bugs>
 	<repository type="git">https://github.com/ConductionNL/zaakafhandelapp.git</repository>

css/dashboardWidgets.css

@@ -0,0 +1,9 @@
+.icon-zaken-widget {
+    background-image: url("../img/app-dark.svg");
+    filter: var(--background-invert-if-dark);
+  }
+
+  body.theme--dark .icon-zaken-widget {
+    background-image: url("../img/app.svg");
+  }
+

lib/AppInfo/Application.php

@@ -6,6 +6,9 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCA\ZaakAfhandelApp\Dashboard\ZakenWidget;
+use OCA\ZaakAfhandelApp\Dashboard\TakenWidget;
+use OCA\ZaakAfhandelApp\Dashboard\OpenZakenWidget;
 
 /**
  * Class Application
@@ -28,6 +31,10 @@ public function __construct(array $urlParams = [])
 
 	public function register(IRegistrationContext $context): void
 	{
+		$context->registerDashboardWidget(ZakenWidget::class);
+		$context->registerDashboardWidget(TakenWidget::class);
+		$context->registerDashboardWidget(OpenZakenWidget::class);
+
 	}
 
 	public function boot(IBootContext $context): void

lib/Dashboard/OpenZakenWidget.php

@@ -0,0 +1,69 @@
+<?php
+
+
+namespace OCA\ZaakAfhandelApp\Dashboard;
+
+use OCP\Dashboard\IWidget;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
+
+use OCA\ZaakAfhandelApp\AppInfo\Application;
+
+class OpenZakenWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_openzaak_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Open zaken');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(): int
+    {
+        return 10;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIconClass(): string
+    {
+        return 'icon-zaken-widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUrl(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load(): void
+    {
+        Util::addScript(Application::APP_ID, Application::APP_ID . '-openZakenWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}

lib/Dashboard/TakenWidget.php

@@ -0,0 +1,69 @@
+<?php
+
+
+namespace OCA\ZaakAfhandelApp\Dashboard;
+
+use OCP\Dashboard\IWidget;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
+
+use OCA\ZaakAfhandelApp\AppInfo\Application;
+
+class TakenWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_taak_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Uw taken');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(): int
+    {
+        return 10;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIconClass(): string
+    {
+        return 'icon-zaken-widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUrl(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load(): void
+    {
+        Util::addScript(Application::APP_ID, Application::APP_ID . '-takenWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}

lib/Dashboard/ZakenWidget.php

@@ -0,0 +1,69 @@
+<?php
+
+
+namespace OCA\ZaakAfhandelApp\Dashboard;
+
+use OCP\Dashboard\IWidget;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
+
+use OCA\ZaakAfhandelApp\AppInfo\Application;
+
+class ZakenWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_zaak_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Uw zaken');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(): int
+    {
+        return 10;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIconClass(): string
+    {
+        return 'icon-zaken-widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUrl(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load(): void
+    {
+        Util::addScript(Application::APP_ID, Application::APP_ID . '-zakenWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}

src/entities/zaak/zaak.mock.ts

@@ -3,6 +3,7 @@ import { TZaak } from './zaak.types'
 
 export const mockZaakData = (): TZaak[] => [
 	{
+		id: '15551d6f-44e3-43f3-a9d2-59e583c91eb0',
 		uuid: '15551d6f-44e3-43f3-a9d2-59e583c91eb0',
 		omschrijving: 'Zaak 3',
 		url: 'http://example.com',

src/entities/zaak/zaak.ts

@@ -3,6 +3,7 @@ import { TZaak, zaakTypeID } from './zaak.types'
 
 export class Zaak implements TZaak {
 
+	public id: string
 	public uuid: string
 	public omschrijving: string
 	public identificatie: string
@@ -26,6 +27,7 @@ export class Zaak implements TZaak {
 	public hoofdzaak: string
 
 	constructor(source: TZaak) {
+		this.id = source.id || ''
 		this.uuid = source.uuid || ''
 		this.omschrijving = source.omschrijving || ''
 		this.identificatie = source.identificatie || ''
@@ -51,6 +53,7 @@ export class Zaak implements TZaak {
 
 	public validate(): SafeParseReturnType<TZaak, unknown> {
 		const schema = z.object({
+			id: z.string().optional(),
 			uuid: z.string().optional(),
 			omschrijving: z.string().min(1),
 			identificatie: z.string().min(1),

src/entities/zaak/zaak.types.ts

@@ -1,6 +1,7 @@
 export type zaakTypeID = string // create an alias for string called ZaakTypeID to make it easier for developers to understand that this is a ID from a ZaakType
 
 export type TZaak = {
+    id: string;
     uuid: string;
     omschrijving: string;
     identificatie: string;

src/modals/Modals.vue

@@ -5,6 +5,7 @@ import { navigationStore } from '../store/store.js'
 <template>
 	<!-- Placeholder -->
 	<div>
+		<ZaakForm v-if="navigationStore.modal === 'zaakForm'" />
 		<EditZaakType />
 		<EditKlant />
 		<ViewKlantAuditTrail v-if="navigationStore.modal === 'viewKlantAuditTrail'" />
@@ -13,12 +14,12 @@ import { navigationStore } from '../store/store.js'
 		<EditTaak />
 		<ViewTaakAuditTrail v-if="navigationStore.modal === 'viewTaakAuditTrail'" />
 		<EditRol />
-		<EditZaak />
 		<ViewZaakAuditTrail v-if="navigationStore.modal === 'viewZaakAuditTrail'" />
 	</div>
 </template>
 
 <script>
+import ZaakForm from './zaken/ZaakForm.vue'
 import EditZaakType from './zaakTypen/EditZaakType.vue'
 import EditKlant from './klanten/EditKlant.vue'
 import ViewKlantAuditTrail from './klanten/ViewKlantAuditTrail.vue'
@@ -27,12 +28,12 @@ import ViewBerichtAuditTrail from './berichten/ViewBerichtAuditTrail.vue'
 import EditTaak from './taken/EditTaak.vue'
 import ViewTaakAuditTrail from './taken/ViewTaakAuditTrail.vue'
 import EditRol from './rollen/EditRol.vue'
-import EditZaak from './zaken/EditZaak.vue'
 import ViewZaakAuditTrail from './zaken/ViewZaakAuditTrail.vue'
 
 export default {
 	name: 'Modals',
 	components: {
+		ZaakForm,
 		EditZaakType,
 		EditKlant,
 		ViewKlantAuditTrail,
@@ -41,7 +42,6 @@ export default {
 		EditTaak,
 		ViewTaakAuditTrail,
 		EditRol,
-		EditZaak,
 		ViewZaakAuditTrail,
 	},
 }