Merge pull request #67 from ConductionNL/development

dev to main
ConductionNL · Dec 2, 2024 · d222e76 · d222e76
2 parents 5d1aa0c + 732ae32
commit d222e76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/store/modules/contactmoment.ts b/src/store/modules/contactmoment.ts
@@ -34,16 +34,25 @@ export const useContactMomentStore = defineStore('contactmomenten', {
 		 * Refresh the list of contact moments.
 		 *
 		 * @param search - Optional search query to filter the contact moments list. (default: `null`)
+		 * @param notClosed
 		 * @throws If the HTTP request fails.
 		 * @return {Promise<{ response: Response, data: TContactMoment[], entities: ContactMoment[] }>} The response, raw data, and entities.
 		 */
-		async refreshContactMomentenList(search: string = null): Promise<{ response: Response, data: TContactMoment[], entities: ContactMoment[] }> {
+		async refreshContactMomentenList(search: string = null, notClosed: boolean = false): Promise<{ response: Response, data: TContactMoment[], entities: ContactMoment[] }> {
 			let endpoint = apiEndpoint
 
 			if (search !== null && search !== '') {
 				endpoint = endpoint + '?_search=' + search
 			}
 
+			if (notClosed) {
+				if (search !== null && search !== '') {
+					endpoint = endpoint + '&status=open'
+				} else {
+					endpoint = endpoint + '?status=open'
+				}
+			}
+
 			const response = await fetch(endpoint, {
 				method: 'GET',
 			})

diff --git a/src/views/widgets/ContactMomentenWidget.vue b/src/views/widgets/ContactMomentenWidget.vue
@@ -94,7 +94,7 @@ export default {
 			this.loading = true
 
 			Promise.all([
-				contactMomentStore.refreshContactMomentenList(),
+				contactMomentStore.refreshContactMomentenList(null, true),
 				klantStore.refreshKlantenList(),
 			])
 				.then(([contactMomentResponse, klantResponse]) => {
@@ -162,7 +162,7 @@ export default {
 			contactMomentStore.saveContactMoment(newContactMoment)
 				.then(({ response }) => {
 					if (response.ok) {
-						this.fetchContactMomentItems()
+						this.fetchContactMomentItems(null, true)
 					}
 				})
 		},