Skip to content

Message: Enhance presentation when replying to a message - refs #21328 #5142

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

Merged
merged 1 commit into from
Feb 8, 2024
Merged

Message: Enhance presentation when replying to a message - refs #21328 #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion assets/vue/utils/dates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ const formatDateTime = function(date) {
return DateTime(date).format('DD/MM/YYYY');
};

export { formatDateTime };
const formatDateTimeFromISO = function(dateStr) {
if (!dateStr) return '';

return DateTime.fromISO(dateStr).toFormat('dd/LL/yyyy HH:mm');
};

export { formatDateTime, formatDateTimeFromISO };
13 changes: 9 additions & 4 deletions assets/vue/views/message/MessageReply.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ import BaseButton from "../../components/basecomponents/BaseButton.vue"
import { useI18n } from "vue-i18n"
import { useSecurityStore } from "../../store/securityStore"
import { useNotification } from "../../composables/notification"
import { formatDateTimeFromISO } from "../../utils/dates"

const item = ref({})
const store = useStore()
const securityStore = useSecurityStore();
const securityStore = useSecurityStore()
const route = useRoute()
const router = useRouter()

Expand All @@ -96,7 +97,11 @@ onMounted(async () => {
const response = await store.dispatch("message/load", id)

item.value = await response

const originalUserInfo = await store.dispatch("user/load", '/api/users/' + item.value.sender.id)
const originalSenderName = originalUserInfo.fullName
const originalSenderEmail = originalUserInfo.email
const formattedDate = formatDateTimeFromISO(item.value.sendDate)
const translatedHeader = t('Email reply header', { date: formattedDate, senderName: originalSenderName, senderEmail: `<a href="mailto:${originalSenderEmail}">${originalSenderEmail}</a>` })
delete item.value["@id"]
delete item.value["id"]
delete item.value["firstReceiver"]
Expand Down Expand Up @@ -151,7 +156,7 @@ onMounted(async () => {
}*/

// Set reply content.
item.value.content = `<br /><blockquote>${item.value.content}</blockquote>`
item.value.content = `<br /><br /><hr /><blockquote>${translatedHeader}<hr />${item.value.content}</blockquote>`
})

const isLoading = computed(() => store.state.message.isLoading)
Expand Down Expand Up @@ -191,4 +196,4 @@ const onReplyMessageForm = async () => {
notification.showErrorNotification(e)
}
}
</script>
</script>