Skip to content

Commit c62da7b

Browse files
tacxoutacxou
committed
Fix divers
1 parent e5d78f9 commit c62da7b

File tree

6 files changed

+84
-81
lines changed

6 files changed

+84
-81
lines changed

‎app/src/components/threads/Editor.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
).col
1616
template(v-slot:threadTypes)
1717
q-btn-dropdown(
18-
v-model="threadType" :options="threadTypes"
18+
v-model="threadType" :options="threadTypes"
1919
no-wrap unelevated no-caps dense flat
2020
label="Type de thread" :icon="threadType.icon" :color="threadType.color"
2121
)
2222
q-list(dense)
23-
q-item(clickable v-for="threadType in threadTypes" :key="type.value" v-ripple tag="label")
23+
q-item(clickable v-for="(threadType, key) in threadTypes" :key="key" v-ripple tag="label")
2424
q-item-section
2525
q-item-label {{ type.label }}
2626
q-btn(
@@ -35,7 +35,7 @@
3535

3636
q-dialog(v-model="isFullscreen")
3737
q-card
38-
q-card-section.bg-grey-2
38+
q-card-section.bg-grey-2
3939
q-input(dense label="From" v-model="mailInfo.from" :disable="isDisabledTicket")
4040
q-input(dense label="To" v-model="mailInfo.to" :disable="isDisabledTicket")
4141
q-input(dense label="Copy" v-model="mailInfo.cc" :disable="isDisabledTicket")
@@ -44,7 +44,7 @@
4444
q-editor(
4545
min-height="50vh" min-width="50vw"
4646
v-model="message" placeholder="Votre message ..."
47-
:definitions="editorDefinitions"
47+
:definitions="editorDefinitions"
4848
:toolbar="editorToolbar" class="q-pa-none"
4949
:readonly="isDisabledTicket" ref="dropZoneRef"
5050
)
@@ -56,7 +56,7 @@
5656
q-card-section
5757
q-scroll-area(style="width: 100%; height: 100%")
5858
q-virtual-scroll(:items="attachements" virtual-scroll-horizontal v-slot="{item}")
59-
q-chip(v-for="attachement in attachements" :key="attachement.id" icon="mdi-paperclip" dense size='md' :label="attachement.name" removable @remove="removeAttachment(attachement.id)")
59+
q-chip(v-for="(attachement, key) in attachements" :key="key" icon="mdi-paperclip" dense size='md' :label="attachement.name" removable @remove="removeAttachment(attachement.id)")
6060

6161
.row
6262
q-btn(label="Envoyer en note interne" color="primary" icon="mdi-note" @click="sendMessage(ThreadType.INTERNAL)" :disable="isDisabledTicket").col-6
@@ -206,7 +206,7 @@ const sendMessage = (type: ThreadType = ThreadType.OUTGOING) => {
206206
}
207207
})
208208
209-
if (error.value) {
209+
if (error && error.value) {
210210
$q.notify({
211211
message: 'Impossible d\'envoyer le message',
212212
type: 'negative'
@@ -247,4 +247,4 @@ defineExpose({
247247
emailReponse
248248
})
249249
250-
</script>
250+
</script>

‎app/src/components/threads/List.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ q-scroll-area(ref="chatScroll")
88
span {{ key }}
99
q-separator(inset)
1010

11-
div(v-for="(message, index) in value" :id="message._id").q-mx-md
11+
div(v-for="(message, index) in value" :id="message._id" :key='index').q-mx-md
1212
component(
1313
:is="getThreadHookName(message.type)"
1414
:data="message"
@@ -122,4 +122,4 @@ defineExpose({
122122
threadsRefresh,
123123
})
124124
125-
</script>
125+
</script>

‎app/src/components/threads/types/base.vue‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<template lang="pug">
2-
div(v-for="fragment in props.data.fragments")
3-
q-chat-message(
4-
:sent="props.data.metadata.createdBy === user.username"
5-
:name="props.data.metadata.createdBy" size="10"
6-
)
7-
template(v-slot:stamp)
8-
.row.items-center
9-
q-icon(name="mdi-email").q-mx-sm
10-
span {{ getTimeFrom(props.data.metadata.createdAt) }}
11-
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
12-
template(v-slot:default)
13-
div
14-
q-chip(v-for='attachment in props.data.attachments' :key='attachment._id' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
15-
q-separator.q-my-xs(v-if="props.data.fragments.file")
16-
div(v-for='raw in props.data.fragments.raw' v-html="raw.message")
2+
div
3+
div(v-for="(fragment, fragId) in props.data.fragments" :key="fragId")
4+
q-chat-message(
5+
:sent="props.data.metadata.createdBy === user.username"
6+
:name="props.data.metadata.createdBy" size="10"
7+
)
8+
template(v-slot:stamp)
9+
.row.items-center
10+
q-icon(name="mdi-email").q-mx-sm
11+
span {{ getTimeFrom(props.data.metadata.createdAt) }}
12+
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
13+
template(v-slot:default)
14+
div
15+
q-chip(v-for='(attachment, key) in props.data.attachments' :key='key' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
16+
q-separator.q-my-xs(v-if="props.data.fragments.file")
17+
div(v-for='(raw, key) in props.data.fragments.raw' :key='key' v-html="raw.message")
1718
</template>
1819

1920
<script lang="ts" setup>
@@ -42,4 +43,4 @@ const getHour = (time: string) => {
4243
return dayjs(time).format('DD-MM-YYYY HH:mm')
4344
}
4445
45-
</script>
46+
</script>

‎app/src/components/threads/types/mail.vue‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<template lang="pug">
2-
div(v-for="fragment in props.data.fragments").row
3-
q-chat-message(
4-
:sent="props.data.metadata.createdBy === user.username"
5-
:name="props.data.metadata.createdBy" size="12"
6-
).col-10
7-
template(v-slot:stamp)
8-
q-separator.q-my-xs
9-
.row.items-center
10-
q-icon(name="mdi-email").q-mx-sm
11-
span {{ getTimeFrom(props.data.metadata.createdAt) }}
12-
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
13-
template(v-slot:default)
14-
div
15-
div(v-for='raw in props.data.fragments.raw' v-html="raw.message.data")
16-
object(v-for='(file, key) in props.data.fragments.file' :ref="el => { objectIframe[file.filestorage.id] = el }" :data='"http://localhost:7100" + file.filestorage.link' width='100%' height='400px' style="background: white;")
17-
q-separator.q-my-xs(v-if="props.data.attachments.length > 0")
18-
q-chip(v-for='attachment in props.data.attachments' :key='attachment._id' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
19-
.col.flex.justify-center.items-center.q-pa-sm.column.q-gutter-sm
20-
q-btn(fab icon="mdi-share" color="primary" @click="emailReponse(props.data.mailinfo)")
21-
q-btn(fab icon="mdi-dots-vertical" color="primary")
22-
</template>
23-
2+
div
3+
div(v-for="(fragment, fragId) in props.data.fragments", :key='fragId').row
4+
q-chat-message(
5+
:sent="props.data.metadata.createdBy === user.username"
6+
:name="props.data.metadata.createdBy" size="12"
7+
).col-10
8+
template(v-slot:stamp)
9+
q-separator.q-my-xs
10+
.row.items-center
11+
q-icon(name="mdi-email").q-mx-sm
12+
span {{ getTimeFrom(props.data.metadata.createdAt) }}
13+
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
14+
template(v-slot:default)
15+
div
16+
div(v-for='(raw, key) in props.data.fragments.raw' :key='key' v-html="raw.message.data")
17+
object(v-for='(file, key) in props.data.fragments.file' :key='key' :ref="el => { objectIframe[file.filestorage.id] = el }" :data='"http://localhost:7100" + file.filestorage.link' width='100%' height='400px' style="background: white;")
18+
q-separator.q-my-xs(v-if="props.data.attachments.length > 0")
19+
q-chip(v-for='(attachment, key) in props.data.attachments' :key='key' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
20+
.col.flex.justify-center.items-center.q-pa-sm.column.q-gutter-sm
21+
q-btn(fab icon="mdi-share" color="primary" @click="emailReponse(props.data.mailinfo)")
22+
q-btn(fab icon="mdi-dots-vertical" color="primary")
23+
</template>
24+
2425
<script lang="ts" setup>
2526
import type { components } from '#build/types/service-api'
2627
import { onMounted, onBeforeUpdate, ref } from 'vue'
@@ -70,4 +71,4 @@ const getHour = (time: string) => {
7071
return dayjs(time).format('DD-MM-YYYY HH:mm')
7172
}
7273
73-
</script>
74+
</script>

‎app/src/components/threads/types/system.vue‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<template lang="pug">
2-
div(v-for="fragment in props.data.fragments")
3-
q-chat-message(
4-
:sent="props.data.metadata.createdBy === user.username"
5-
:name="props.data.metadata.createdBy" size="10"
6-
)
7-
template(v-slot:stamp)
8-
.row.items-center
9-
q-icon(name="mdi-laptop").q-mx-sm
10-
span {{ getTimeFrom(props.data.metadata.createdAt) }}
11-
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
12-
template(v-slot:default)
13-
div
14-
q-chip(v-for='attachment in props.data.attachments' :key='attachment._id' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
15-
q-separator.q-my-xs(v-if="props.data.fragments.file")
16-
div(v-for='raw in props.data.fragments.raw' v-html="raw.message")
2+
div
3+
div(v-for="(fragment, fragId) in props.data.fragments", :key="fragId")
4+
q-chat-message(
5+
:sent="props.data.metadata.createdBy === user.username"
6+
:name="props.data.metadata.createdBy" size="10"
7+
)
8+
template(v-slot:stamp)
9+
.row.items-center
10+
q-icon(name="mdi-laptop").q-mx-sm
11+
span {{ getTimeFrom(props.data.metadata.createdAt) }}
12+
q-tooltip.text-body2 {{ getHour(props.data.metadata.createdAt) }}
13+
template(v-slot:default)
14+
div
15+
q-chip(v-for='(attachment, key) in props.data.attachments' :key='key' icon="mdi-paperclip" text-color="white" color="primary" dense size='md' :label="attachment.name")
16+
q-separator.q-my-xs(v-if="props.data.fragments.file")
17+
div(v-for='(raw, key) in props.data.fragments.raw' :key='key' v-html="raw.message")
1718
</template>
18-
19+
1920
<script lang="ts" setup>
2021
import type { components } from '#build/types/service-api'
2122
import { useRoute } from 'nuxt/app';
@@ -42,4 +43,4 @@ const getHour = (time: string) => {
4243
return dayjs(time).format('DD-MM-YYYY HH:mm')
4344
}
4445
45-
</script>
46+
</script>

‎app/src/components/ticket/rightPanel.vue‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ q-scroll-area(:style="{height: '100%'}")
88
q-btn(
99
v-if="!props.ticketData.envelope.assigned.find((user) => user.id === store.state.value.auth.user._id)"
1010
color="green" icon="mdi-clipboard-arrow-down-outline" @click="assignTicket" size="md" :disable="isDisabledTicket"
11-
)
11+
)
1212
q-tooltip.text-body2 M'assigner le ticket
13-
q-btn(v-else color="red" icon="mdi-clipboard-arrow-up-outline" size="md" @click="unasignTicket" :disable="isDisabledTicket")
13+
q-btn(v-else color="red" icon="mdi-clipboard-arrow-up-outline" size="md" @click="unasignTicket" :disable="isDisabledTicket")
1414
q-tooltip.text-body2 Me désassigner le ticket
1515

16-
q-btn(color="primary" icon="mdi-printer" @click="console.log('Imprimer')" size="md")
16+
//q-btn(color="primary" icon="mdi-printer" @click="console.log('Imprimer')" size="md")
1717
q-tooltip.text-body2 Imprimer
1818
q-btn(color="info" icon="mdi-content-save-all" @click="console.log('Save')" size="md" :disable="isDisabledTicket")
1919
q-tooltip.text-body2 Sauvegarder
@@ -28,7 +28,7 @@ q-scroll-area(:style="{height: '100%'}")
2828
q-card-section
2929
q-select.q-my-xs(
3030
@update:model-value="updateData({field: 'envelope.senders', value: $event})"
31-
label="Appelant(s)" filled
31+
label="Appelant(s)" filled
3232
v-model="ticketDataRef.envelope.senders"
3333
option-label="name"
3434
use-input use-chips multiple
@@ -37,7 +37,7 @@ q-scroll-area(:style="{height: '100%'}")
3737
q-select.q-my-xs(
3838
option-label="name"
3939
@update:model-value="updateData({field: 'envelope.observers', value: $event})"
40-
label="Concerné(s)" filled
40+
label="Concerné(s)" filled
4141
v-model="ticketDataRef.envelope.observers"
4242
use-input use-chips multiple
4343
:disable="isDisabledTicket"
@@ -46,7 +46,7 @@ q-scroll-area(:style="{height: '100%'}")
4646
q-select.q-my-xs(
4747
option-label="name"
4848
@update:model-value="updateData({field: 'envelope.assigned', value: $event})"
49-
label="Assigné(s)" filled
49+
label="Assigné(s)" filled
5050
v-model="ticketDataRef.envelope.assigned"
5151
use-input use-chips multiple
5252
:disable="isDisabledTicket"
@@ -55,39 +55,39 @@ q-scroll-area(:style="{height: '100%'}")
5555
q-expansion-item(label="Informations").bg-gray-4
5656
q-card
5757
q-card-section
58-
.row.items-center
59-
.col-6 Type de ticket :
58+
.row.items-center
59+
.col-6 Type de ticket :
6060
.col-6
6161
q-chip(:icon="typeOfTicket.icon" :color="typeOfTicket.color" outline).q-mx-auto {{ typeOfTicket.label }}
6262
q-select.q-my-xs(
63-
label="Projet(s)" filled
63+
label="Projet(s)" filled
6464
@update:model-value="updateData({field: 'project', value: $event})"
6565
v-model="ticketDataRef.project"
66-
:options="getProjectsData"
66+
:options="getProjectsData"
6767
option-label="name"
6868
:disable="isDisabledTicket"
6969
)
7070
q-select.q-my-xs(
7171
label="Priorité" filled
7272
@update:model-value="updateData({field: 'priority', value: $event})"
7373
v-model="ticketDataRef.priority"
74-
:options="priority"
74+
:options="priority"
7575
option-label="name"
7676
:disable="isDisabledTicket"
7777
)
7878
q-select.q-my-xs(
7979
label="Impact" filled
8080
@update:model-value="updateData({field: 'impact', value: $event})"
8181
v-model="ticketDataRef.impact"
82-
:options="impact"
82+
:options="impact"
8383
option-label="name"
8484
:disable="isDisabledTicket"
8585
)
8686
q-select.q-my-xs(
8787
label="SLA" filled
8888
@update:model-value="updateData({field: 'sla', value: $event})"
8989
v-model="ticketDataRef.sla"
90-
:options="getSlaData"
90+
:options="getSlaData"
9191
option-label="name"
9292
:disable="isDisabledTicket"
9393
)
@@ -98,15 +98,15 @@ q-scroll-area(:style="{height: '100%'}")
9898
q-card
9999
q-card-section
100100
.row.justify-between.items-center
101-
.col-3 Etat :
101+
.col-3 Etat :
102102
.col
103103
q-chip(:icon="lifestepOfTicket?.icon" :color="lifestepOfTicket?.color" outline).q-mx-auto {{ lifestepOfTicket?.label }}
104104
.col-3
105105
q-space
106106
q-btn(color="red" icon="mdi-close" size="md" flat @click="showCloseTicketDialog()" fab :disable="isDisabledTicket")
107107
q-tooltip.text-body2 Cloturer
108-
.row.items-center
109-
.col-3 Status :
108+
.row.items-center
109+
.col-3 Status :
110110
.col
111111
q-chip(:icon="stateOfTicket?.icon" :color="stateOfTicket?.color" outline).q-mx-auto {{ stateOfTicket?.name }}
112112
q-dialog(v-model="closeTicketDialog")

0 commit comments

Comments
 (0)