Getting the dialogs to actually work

ConductionNL · Oct 22, 2024 · aee627c · aee627c
1 parent 7a78fc0
commit aee627c
Show file tree

Hide file tree

Showing 24 changed files with 759 additions and 1,137 deletions.
diff --git a/lib/Controller/BerichtenController.php b/lib/Controller/BerichtenController.php
@@ -2,12 +2,9 @@
 
 namespace OCA\ZaakAfhandelApp\Controller;
 
-use GuzzleHttp\Client;
-use OCA\ZaakAfhandelApp\Service\CallService;
+use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\IRequest;
 
 class BerichtenController extends Controller
@@ -30,7 +27,7 @@ public function __construct(
 	 *
 	 * @return JSONResponse
 	 */
-	public function index(CallService $callService): JSONResponse
+	public function index(): JSONResponse
 	{
 		 // Retrieve all request parameters
 		 $requestParams = $this->request->getParams();
@@ -50,7 +47,7 @@ public function index(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function show(string $id, CallService $callService): JSONResponse
+	public function show(string $id): JSONResponse
 	{
         // Fetch the catalog object by its ID
         $object = $this->objectService->getObject('berichten', $id);
@@ -68,7 +65,7 @@ public function show(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function create(CallService $callService): JSONResponse
+	public function create(): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -91,7 +88,7 @@ public function create(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function update(string $id, CallService $callService): JSONResponse
+	public function update(string $id): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -114,7 +111,7 @@ public function update(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function destroy(string $id, CallService $callService): JSONResponse
+	public function destroy(string $id): JSONResponse
 	{
         // Delete the catalog object
         $result = $this->objectService->deleteObject('berichten', $id);

diff --git a/lib/Controller/KlantenController.php b/lib/Controller/KlantenController.php
@@ -2,11 +2,9 @@
 
 namespace OCA\ZaakAfhandelApp\Controller;
 
-use GuzzleHttp\Client;
+use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\IRequest;
 
 class KlantenController extends Controller
@@ -31,7 +29,7 @@ public function __construct
 	 *
 	 * @return JSONResponse
      */
-    public function index(CallService $klantenService): JSONResponse
+    public function index(): JSONResponse
     {
         // Retrieve all request parameters
         $requestParams = $this->request->getParams();
@@ -51,7 +49,7 @@ public function index(CallService $klantenService): JSONResponse
 	 *
 	 * @return JSONResponse
      */
-    public function show(string $id, CallService $klantenService): JSONResponse
+    public function show(string $id): JSONResponse
     {
         // Fetch the catalog object by its ID
         $object = $this->objectService->getObject('klanten', $id);
@@ -69,7 +67,7 @@ public function show(string $id, CallService $klantenService): JSONResponse
 	 *
 	 * @return JSONResponse
      */
-    public function create(CallService $callService): JSONResponse
+    public function create(): JSONResponse
     {
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -92,7 +90,7 @@ public function create(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
      */
-    public function update(string $id, CallService $callService): JSONResponse
+    public function update(string $id): JSONResponse
     {
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -115,7 +113,7 @@ public function update(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
      */
-    public function destroy(string $id, CallService $callService): JSONResponse
+    public function destroy(string $id): JSONResponse
     {
         // Delete the catalog object
         $result = $this->objectService->deleteObject('klanten', $id);

diff --git a/lib/Controller/TakenController.php b/lib/Controller/TakenController.php
@@ -2,12 +2,9 @@
 
 namespace OCA\ZaakAfhandelApp\Controller;
 
-use GuzzleHttp\Client;
-use OCA\ZaakAfhandelApp\Service\CallService;
+use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\IRequest;
 
 class TakenController extends Controller
@@ -29,7 +26,7 @@ public function __construct(
 	 *
 	 * @return JSONResponse
 	 */
-	public function index(CallService $klantenService): JSONResponse
+	public function index(): JSONResponse
 	{
 		 // Retrieve all request parameters
 		 $requestParams = $this->request->getParams();
@@ -49,7 +46,7 @@ public function index(CallService $klantenService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function show(string $id, CallService $klantenService): JSONResponse
+	public function show(string $id): JSONResponse
 	{
         // Fetch the catalog object by its ID
         $object = $this->objectService->getObject('taken', $id);
@@ -67,7 +64,7 @@ public function show(string $id, CallService $klantenService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function create(CallService $callService): JSONResponse
+	public function create(): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -90,7 +87,7 @@ public function create(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function update(string $id, CallService $callService): JSONResponse
+	public function update(string $id): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -113,7 +110,7 @@ public function update(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function destroy(string $id, CallService $callService): JSONResponse
+	public function destroy(string $id): JSONResponse
 	{
         // Delete the catalog object
         $result = $this->objectService->deleteObject('taken', $id);

diff --git a/lib/Controller/ZaakTypenController.php b/lib/Controller/ZaakTypenController.php
@@ -2,12 +2,9 @@
 
 namespace OCA\ZaakAfhandelApp\Controller;
 
-use GuzzleHttp\Client;
-use OCA\ZaakAfhandelApp\Service\CallService;
+use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\IRequest;
 
 class ZaakTypenController extends Controller
@@ -30,7 +27,7 @@ public function __construct(
 	 *
 	 * @return JSONResponse
 	 */
-	public function index(CallService $callService): JSONResponse
+	public function index(): JSONResponse
 	{
 		 // Retrieve all request parameters
 		 $requestParams = $this->request->getParams();
@@ -50,7 +47,7 @@ public function index(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function show(string $id, CallService $callService): JSONResponse
+	public function show(string $id): JSONResponse
 	{
         // Fetch the catalog object by its ID
         $object = $this->objectService->getObject('zaaktypen', $id);
@@ -68,7 +65,7 @@ public function show(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function create(CallService $callService): JSONResponse
+	public function create(): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -91,7 +88,7 @@ public function create(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function update(string $id, CallService $callService): JSONResponse
+	public function update(string $id): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -114,7 +111,7 @@ public function update(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function destroy(string $id, CallService $callService): JSONResponse
+	public function destroy(string $id): JSONResponse
 	{
         // Delete the catalog object
         $result = $this->objectService->deleteObject('zaaktypen', $id);

diff --git a/lib/Controller/ZakenController.php b/lib/Controller/ZakenController.php
@@ -2,12 +2,9 @@
 
 namespace OCA\ZaakAfhandelApp\Controller;
 
-use GuzzleHttp\Client;
-use OCA\ZaakAfhandelApp\Service\CallService;
+use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
-use OCA\ZaakAfhandelApp\Service\ObjectService;
 use OCP\IRequest;
 
 /**
@@ -32,7 +29,7 @@ public function __construct(
 	 *
 	 * @return JSONResponse
 	 */
-	public function index(CallService $callService): JSONResponse
+	public function index(): JSONResponse
 	{
 		 // Retrieve all request parameters
         $requestParams = $this->request->getParams();
@@ -52,7 +49,7 @@ public function index(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function show(string $id, CallService $callService): JSONResponse
+	public function show(string $id): JSONResponse
 	{
         // Fetch the catalog object by its ID
         $object = $this->objectService->getObject('zaken', $id);
@@ -70,7 +67,7 @@ public function show(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function create(CallService $callService): JSONResponse
+	public function create(): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -93,7 +90,7 @@ public function create(CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function update(string $id, CallService $callService): JSONResponse
+	public function update(string $id): JSONResponse
 	{
         // Get all parameters from the request
         $data = $this->request->getParams();
@@ -116,7 +113,7 @@ public function update(string $id, CallService $callService): JSONResponse
 	 *
 	 * @return JSONResponse
 	 */
-	public function destroy(string $id, CallService $callService): JSONResponse
+	public function destroy(string $id): JSONResponse
 	{
         // Delete the catalog object
         $result = $this->objectService->deleteObject('zaken', $id);

diff --git a/lib/Service/ObjectService.php b/lib/Service/ObjectService.php
@@ -36,7 +36,7 @@ public function __construct(
 		private readonly IAppManager $appManager,
 		private readonly IAppConfig $config,
 	) {
-		$this->appName = 'opencatalogi';
+		$this->appName = 'zaakafhandelapp';
 	}
 
 	/**

diff --git a/src/modals/Modals.vue b/src/modals/Modals.vue
@@ -10,6 +10,7 @@ import { navigationStore } from '../store/store.js'
 		<EditBericht />
 		<EditTaak />
 		<EditRol />
+		<EditZaak />
 	</div>
 </template>
 
@@ -19,6 +20,7 @@ import EditKlant from './klanten/EditKlant.vue'
 import EditBericht from './berichten/EditBericht.vue'
 import EditTaak from './taken/EditTaak.vue'
 import EditRol from './rollen/EditRol.vue'
+import EditZaak from './zaken/EditZaak.vue'
 
 export default {
 	name: 'Modals',
@@ -28,6 +30,7 @@ export default {
 		EditBericht,
 		EditTaak,
 		EditRol,
+		EditZaak
 	},
 }
 </script>