From 55a8f26f716a2cc514f027745d97c9ddd4f4a9f9 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Tue, 7 Jan 2025 15:02:07 +0100
Subject: [PATCH 1/6] PC108-147 - set selected taak to newly made taak

---
 src/modals/contactMomenten/ContactMomentenForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index c980715..eb999b5 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -988,6 +988,9 @@ export default {
 			if (e) {
 				this.contactMomenten[this.selectedContactMoment].addedTaken.push(e)
 				this.contactMomenten[this.selectedContactMoment]?.klant?.id && this.fetchKlantData(this.contactMomenten[this.selectedContactMoment]?.klant?.id)
+
+				// set the selected taak for current contactmoment to the new taak
+				this.contactMomenten[this.selectedContactMoment].selectedTaak = e
 			}
 			this.taakFormOpen = false
 		},

From 82ee5db0053fcbdca7efb9e59908d807a7bc340e Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Tue, 7 Jan 2025 15:26:10 +0100
Subject: [PATCH 2/6] PC108-148 - modal name changes to multi form

---
 src/modals/contactMomenten/ContactMomentenForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index eb999b5..1634301 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -3,7 +3,7 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 </script>
 
 <template>
-	<NcDialog name="Contactmoment"
+	<NcDialog :name="Object.keys(contactMomenten).length > 1 ? 'Contactmomenten' : 'Contactmoment'"
 		size="large"
 		label-id="contactMomentenForm"
 		dialog-classes="ContactMomentenForm"

From 6fdfe48530dd5393c7da6f82759b8e8f631bf3b4 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Tue, 7 Jan 2025 15:35:50 +0100
Subject: [PATCH 3/6] PC108-149 - plus button replaced with nieuw contactmoment
 button

---
 .../contactMomenten/ContactMomentenForm.vue   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index 1634301..d4354cf 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -10,6 +10,15 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 		:close-on-click-outside="false"
 		@closing="closeModalFromButton()">
 		<div v-if="!isView" class="tabContainer">
+			<div class="newTabButtonContainer">
+				<NcButton type="primary" class="newTabButton" @click="newTab">
+					<template #icon>
+						<Plus :size="20" />
+					</template>
+					Nieuw contactmoment
+				</NcButton>
+			</div>
+
 			<BTabs card>
 				<BTab v-for="i in tabs"
 					:key="'dyn-tab-' + i"
@@ -277,12 +286,6 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 						Close tab
 					</NcButton>
 				</BTab>
-
-				<template #tabs-end>
-					<NcButton @click="newTab">
-						<Plus :size="20" />
-					</NcButton>
-				</template>
 			</BTabs>
 		</div>
 		<div v-if="isView">
@@ -1291,14 +1294,15 @@ div[class='modal-container']:has(.ContactMomentenForm) {
 	margin-block-end: 100px;
 }
 
-.tabContainer {
-	margin-block-end: var(--zaa-margin-20);
+.newTabButtonContainer {
+    width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
 }
 
-.newTabButton>a {
-	display: flex;
-	justify-content: center;
-	align-items: center;
+.tabContainer {
+	margin-block-end: var(--zaa-margin-20);
 }
 
 .modalButtonsContainer {

From f6a5807d99f41193694e084324af3ee5e0fc62f7 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Tue, 7 Jan 2025 16:23:54 +0100
Subject: [PATCH 4/6] PC108-150 - added X close button to tabs

as opposed to close button at the bottom
---
 .../contactMomenten/ContactMomentenForm.vue   | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index d4354cf..8574308 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -19,12 +19,23 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 				</NcButton>
 			</div>
 
-			<BTabs card>
+			<BTabs card class="contactmomentTabsContainer">
 				<BTab v-for="i in tabs"
 					:key="'dyn-tab-' + i"
-					:title="contactMomenten[i].klant ? getInitials(contactMomenten[i].klant) : 'Leeg'"
 					:active="selectedContactMoment === i"
 					@click="selectedContactMoment = i">
+					<template #title>
+						{{ contactMomenten[i].klant ? getInitials(contactMomenten[i].klant) : 'Leeg' }}
+						<NcButton v-if="tabs.length > 1 && !success"
+							v-tooltip="'Sluiten'"
+							type="tertiary"
+							@click="closeTab(i)">
+							<template #icon>
+								<Close :size="20" />
+							</template>
+						</NcButton>
+					</template>
+
 					<NcNoteCard v-if="success" type="success">
 						<p>Contactmoment succesvol opgeslagen</p>
 					</NcNoteCard>
@@ -282,9 +293,6 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 							@selected-klant="fetchKlantData($event)"
 							@close-modal="closeSearchKlantModal" />
 					</div>
-					<NcButton v-if="tabs.length > 1 && !success" @click="closeTab(i)">
-						Close tab
-					</NcButton>
 				</BTab>
 			</BTabs>
 		</div>
@@ -630,6 +638,7 @@ import Phone from 'vue-material-design-icons/Phone.vue'
 import EmailOutline from 'vue-material-design-icons/EmailOutline.vue'
 import FaceAgent from 'vue-material-design-icons/FaceAgent.vue'
 import MailboxOpenOutline from 'vue-material-design-icons/MailboxOpenOutline.vue'
+import Close from 'vue-material-design-icons/Close.vue'
 
 export default {
 	name: 'ContactMomentenForm',
@@ -1301,6 +1310,21 @@ div[class='modal-container']:has(.ContactMomentenForm) {
 	align-items: flex-end;
 }
 
+.contactmomentTabsContainer :deep(.nav-link) {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.contactmomentTabsContainer :deep(.nav-link) .button-vue {
+    position: absolute;
+    right: 6px;
+}
+.contactmomentTabsContainer :deep(.nav-link) .button-vue:hover {
+    background-color: rgba(255, 255, 255, 0.045) !important;
+}
+
 .tabContainer {
 	margin-block-end: var(--zaa-margin-20);
 }

From 7a03c4cd1de8eda89c1f28fbad1fcce2aac58592 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Tue, 7 Jan 2025 16:42:06 +0100
Subject: [PATCH 5/6] revert PC108-147

---
 src/modals/contactMomenten/ContactMomentenForm.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index 8574308..2ff8873 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -1000,9 +1000,6 @@ export default {
 			if (e) {
 				this.contactMomenten[this.selectedContactMoment].addedTaken.push(e)
 				this.contactMomenten[this.selectedContactMoment]?.klant?.id && this.fetchKlantData(this.contactMomenten[this.selectedContactMoment]?.klant?.id)
-
-				// set the selected taak for current contactmoment to the new taak
-				this.contactMomenten[this.selectedContactMoment].selectedTaak = e
 			}
 			this.taakFormOpen = false
 		},

From d3f0f702c5dc09528a92abded69a64dc0614e71e Mon Sep 17 00:00:00 2001
From: Remko <remko@conduction.nl>
Date: Wed, 5 Feb 2025 13:29:56 +0100
Subject: [PATCH 6/6] Requested changes

---
 src/modals/contactMomenten/ContactMomentenForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modals/contactMomenten/ContactMomentenForm.vue b/src/modals/contactMomenten/ContactMomentenForm.vue
index 559e8fd..c5dfb5b 100644
--- a/src/modals/contactMomenten/ContactMomentenForm.vue
+++ b/src/modals/contactMomenten/ContactMomentenForm.vue
@@ -3,7 +3,7 @@ import { contactMomentStore, navigationStore, taakStore, zaakStore } from '../..
 </script>
 
 <template>
-	<NcDialog :name="Object.keys(contactMomenten).length > 1 ? 'Contactmomenten' : 'Contactmoment'"
+	<NcDialog :name="tabs.length > 1 ? 'Contactmomenten' : 'Contactmoment'"
 		size="large"
 		label-id="contactMomentenForm"
 		dialog-classes="ContactMomentenForm"