Merge pull request #47 from ConductionNL/development

Development to main

composer.json

@@ -43,7 +43,6 @@
 		"adbario/php-dot-notation": "^3.3.0",
 		"bamarni/composer-bin-plugin": "^1.8",
 		"elasticsearch/elasticsearch": "^v8.14.0",
-		"adbario/php-dot-notation": "^3.3.0",
 		"guzzlehttp/guzzle": "^7.0",
 		"symfony/uid": "^6.4"
 	},

docker-compose.yml

@@ -18,17 +18,17 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
 
-  init-ubuntu:
-    image: ubuntu
-    command: sh /home/ubuntu/docker/init-ubuntu.sh
-    volumes:
-      - ./docker:/home/ubuntu/docker
-      - .:/home/ubuntu/app
+  # init-ubuntu:
+  #   image: ubuntu
+  #   command: sh /home/ubuntu/docker/init-ubuntu.sh
+  #   volumes:
+  #     - ./docker:/home/ubuntu/docker
+  #     - .:/home/ubuntu/app
 
   nextcloud:
     user: root
     container_name: nextcloud
-#    entrypoint: occ app:enable openconnector
+#    entrypoint: occ app:enable zaakafhandelapp
     image: nextcloud
     restart: always
     ports:
@@ -47,5 +47,7 @@ services:
       - TZ=Europe/Amsterdam
       - NEXTCLOUD_ADMIN_USER=admin
       - NEXTCLOUD_ADMIN_PASSWORD=admin
-
+    # depends_on: 
+    #   init-ubuntu: 
+    #     condition: service_completed_successfully 
 

lib/AppInfo/Application.php

@@ -9,6 +9,9 @@
 use OCA\ZaakAfhandelApp\Dashboard\ZakenWidget;
 use OCA\ZaakAfhandelApp\Dashboard\TakenWidget;
 use OCA\ZaakAfhandelApp\Dashboard\OpenZakenWidget;
+use OCA\ZaakAfhandelApp\Dashboard\ContactmomentenWidget;
+use OCA\ZaakAfhandelApp\Dashboard\PersonenWidget;
+use OCA\ZaakAfhandelApp\Dashboard\OrganisatiesWidget;
 
 /**
  * Class Application
@@ -34,7 +37,9 @@ public function register(IRegistrationContext $context): void
 		$context->registerDashboardWidget(ZakenWidget::class);
 		$context->registerDashboardWidget(TakenWidget::class);
 		$context->registerDashboardWidget(OpenZakenWidget::class);
-
+		$context->registerDashboardWidget(ContactmomentenWidget::class);
+		$context->registerDashboardWidget(PersonenWidget::class);
+		$context->registerDashboardWidget(OrganisatiesWidget::class);
 	}
 
 	public function boot(IBootContext $context): void

lib/Dashboard/ContactmomentenWidget.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 ContactmomentenWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_contactmomenten_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Contact momenten');
+    }
+
+    /**
+     * @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 . '-contactmomentenWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}

lib/Dashboard/OrganisatiesWidget.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 OrganisatiesWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_organisaties_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Organisaties zoeken');
+    }
+
+    /**
+     * @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 . '-organisatiesWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}

lib/Dashboard/PersonenWidget.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 PersonenWidget implements IWidget
+{
+
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $url
+    ) {}
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'zaakAfhandelApp_personen_widget';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return $this->l10n->t('Personen zoeken');
+    }
+
+    /**
+     * @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 . '-personenWidget');
+        Util::addStyle(Application::APP_ID, 'dashboardWidgets');
+    }
+}