Cleanup

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,12 +18,12 @@ 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
@@ -47,5 +47,7 @@ services:
       - TZ=Europe/Amsterdam
       - NEXTCLOUD_ADMIN_USER=admin
       - NEXTCLOUD_ADMIN_PASSWORD=admin
-
+    # depends_on: 
+    #   init-ubuntu: 
+    #     condition: service_completed_successfully 
 

src/modals/taken/EditTaak.vue

@@ -124,6 +124,22 @@ export default {
 				toelichting: '',
 				klant: '',
 			},
+			statusOptions: {
+				options: [
+					{
+						id: 'status1',
+						label: 'Status 1',
+					},
+					{
+						id: 'status2',
+						label: 'Status 2',
+					},
+					{
+						id: 'status3',
+						label: 'Status 3',
+					},
+				],
+			},
 		}
 	},
 	updated() {
@@ -151,7 +167,7 @@ export default {
 			this.loading = false
 			this.error = false
 			this.hasUpdated = false
-			this.taakItem ={
+			this.taakItem = {
 				title: '',
 				type: '',
 				status: '',

src/modals/zaken/ZaakForm.vue

@@ -181,7 +181,7 @@ export default {
 		fetchZaakType() {
 			this.zaakTypeLoading = true
 
-			zaakTypeStore.refreshZaakTypeList()
+			zaakTypeStore.refreshZaakTypenList()
 				.then(({ entities }) => {
 					const selectedZaakType = entities.find((zaakType) => zaakType.id === this.zaak.zaaktype.id)
 

src/store/modules/zaakTypen.ts

@@ -33,7 +33,7 @@ export const useZaakTypeStore = defineStore('zaakTypen', {
 		 * @throws If the HTTP request fails.
 		 * @return {Promise<{ response: Response, data: TZaakType[], entities: ZaakType[] }>} The response, raw data, and entities.
 		 */
-		async refreshZaakTypeList(search: string = null): Promise<{ response: Response, data: TZaakType[], entities: ZaakType[] }> {
+		async refreshZaakTypenList(search: string = null): Promise<{ response: Response, data: TZaakType[], entities: ZaakType[] }> {
 			let endpoint = apiEndpoint
 
 			if (search !== null && search !== '') {
@@ -119,7 +119,7 @@ export const useZaakTypeStore = defineStore('zaakTypen', {
 				throw new Error(`HTTP error! status: ${response.status}`)
 			}
 
-			this.refreshZaakTypeList()
+			this.refreshZaakTypenList()
 
 			return { response }
 		},
@@ -168,7 +168,7 @@ export const useZaakTypeStore = defineStore('zaakTypen', {
 			const entity = new ZaakType(data)
 
 			options.setItem && this.setZaakTypeItem(data)
-			this.refreshZaakTypeList()
+			this.refreshZaakTypenList()
 
 			return { response, data, entity }
 		},

src/views/berichten/BerichtenList.vue

@@ -65,11 +65,15 @@ import { navigationStore, berichtStore } from '../../store/store.js'
 			</div>
 		</ul>
 
-		<NcLoadingIcon v-if="!berichtStore.berichtenList"
+		<div v-if="!berichtStore.berichtenList?.length && !loading">
+			Geen berichten gedefinieerd.
+		</div>
+
+		<NcLoadingIcon v-if="loading"
 			class="loadingIcon"
 			:size="64"
 			appearance="dark"
-			name="Klanten aan het laden" />
+			name="Berichten aan het laden" />
 	</NcAppContentList>
 </template>
 <script>
@@ -110,7 +114,9 @@ export default {
 		}
 	},
 	mounted() {
-		berichtStore.refreshBerichtenList()
+		berichtStore.refreshBerichtenList().then(() => {
+			this.loading = false
+		})
 	},
 	methods: {
 		editBericht(bericht) {

src/views/klanten/KlantenList.vue

@@ -65,7 +65,11 @@ import { navigationStore, klantStore } from '../../store/store.js'
 			</div>
 		</ul>
 
-		<NcLoadingIcon v-if="!klantStore.klantenList"
+		<div v-if="!klantStore.klantenList?.length && !loading">
+			Geen klanten gedefinieerd.
+		</div>
+
+		<NcLoadingIcon v-if="loading"
 			class="loadingIcon"
 			:size="64"
 			appearance="dark"
@@ -107,18 +111,20 @@ export default {
 		}
 	},
 	mounted() {
-		klantStore.refreshKlantenList()
+		klantStore.refreshKlantenList().then(() => {
+			this.loading = false
+		})
 	},
 	methods: {
 		fullName(klant) {
-			let name = klant.achternaam;
+			let name = klant.achternaam
 			if (klant.tussenvoegsel) {
-				name = `${klant.tussenvoegsel} ${name}`;
+				name = `${klant.tussenvoegsel} ${name}`
 			}
 			if (klant.voornaam) {
-				name = `${name}, ${klant.voornaam}`;
+				name = `${name}, ${klant.voornaam}`
 			}
-			return name;
+			return name
 		},
 		fetchData(newPage) {
 			this.loading = true

src/views/taken/TakenList.vue

@@ -65,7 +65,11 @@ import { navigationStore, taakStore } from '../../store/store.js'
 			</div>
 		</ul>
 
-		<NcLoadingIcon v-if="!taakStore.takenList"
+		<div v-if="!taakStore.takenList?.length && !loading">
+			Geen taken gedefinieerd.
+		</div>
+
+		<NcLoadingIcon v-if="loading"
 			class="loadingIcon"
 			:size="64"
 			appearance="dark"
@@ -107,7 +111,9 @@ export default {
 		}
 	},
 	mounted() {
-		taakStore.refreshTakenList()
+		taakStore.refreshTakenList().then(() => {
+			this.loading = false
+		})
 	},
 	methods: {
 		fetchData(newPage) {

src/views/zaakTypen/ZaakTypenList.vue

@@ -54,8 +54,8 @@ import { navigationStore, zaakTypeStore } from '../../store/store.js'
 			</div>
 		</ul>
 
-		<div v-if="!zaakTypeStore.zaakTypenList.length">
-			No zaaktypen have been defined yet.
+		<div v-if="!zaakTypeStore.zaakTypenList?.length && !loading">
+			Geen zaaktypen gedefinieerd.
 		</div>
 
 		<NcLoadingIcon v-if="loading"
@@ -105,6 +105,10 @@ export default {
 			.then(() => {
 				this.loading = false
 			})
+			.catch((err) => {
+				console.error(err)
+				this.loading = false
+			})
 	},
 	methods: {
 		clearText() {

src/views/zaken/ZakenList.vue

@@ -66,8 +66,8 @@ import { navigationStore, zaakStore } from '../../store/store.js'
 			</div>
 		</ul>
 
-		<div v-if="!zaakStore.zakenList.length">
-			No zaken have been defined yet.
+		<div v-if="!zaakStore.zakenList.length && !loading">
+			Geen zaken gedefinieerd.
 		</div>
 
 		<NcLoadingIcon v-if="loading"