Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/PC108-147/auto-task-bind #141

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

feature/PC108-147/auto-task-bind #141

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55a8f26
PC108-147 - set selected taak to newly made taak
Sudo-Thijn Jan 7, 2025
82ee5db
PC108-148 - modal name changes to multi form
Sudo-Thijn Jan 7, 2025
6fdfe48
PC108-149 - plus button replaced with nieuw contactmoment button
Sudo-Thijn Jan 7, 2025
f6a5807
PC108-150 - added X close button to tabs
Sudo-Thijn Jan 7, 2025
7a03c4c
revert PC108-147
Sudo-Thijn Jan 7, 2025
4b6fa33
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 9, 2025
20cd1f3
Merge branch 'development' into feature/PC108-147/auto-task-bind
Sudo-Thijn Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 46 additions & 18 deletions src/modals/contactMomenten/ContactMomentenForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,39 @@ 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"
:close-on-click-outside="false"
@closing="closeModalFromButton()">
<div v-if="!isView" class="tabContainer">
<BTabs card>
<div class="newTabButtonContainer">
<NcButton type="primary" class="newTabButton" @click="() => newTab()">
<template #icon>
<Plus :size="20" />
</template>
Nieuw contactmoment
</NcButton>
</div>

<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>
Expand Down Expand Up @@ -273,16 +293,7 @@ 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>

<template #tabs-end>
<NcButton @click="() => newTab()">
<Plus :size="20" />
</NcButton>
</template>
</BTabs>
</div>
<div v-if="isView">
Expand Down Expand Up @@ -628,6 +639,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',
Expand Down Expand Up @@ -1289,14 +1301,30 @@ 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;
.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);
}

.modalButtonsContainer {
Expand Down
Loading