blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-03 03:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusted flatTable index to paabgabe_id since projektarbeit_id is not unique per row there; fixed splitMailHelpers call in Mitarbeiter page; emailHelper changes so it actually works with bcc aswell;

Browse Source
This commit is contained in:
Johann Hoffmann
2026-05-18 10:23:41 +02:00
parent 9b823dbaa1
commit c0192e9e00
3 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+1 -1
View File
@@ -319,7 +319,7 @@ export const AbgabetoolAssistenz = {
abgabeTableOptionsFlat: {
minHeight: 250,
height: 700,
index: 'projektarbeit_id',
index: 'paabgabe_id',
layout: 'fitColumns',
placeholder: Vue.computed(() => this.$capitalize(this.$p.t('global/noDataAvailable'))),
selectable: true,
public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+1 -1
View File
@@ -531,7 +531,7 @@ export const AbgabetoolMitarbeiter = {
})
const uniqueRecipients = [...new Set(recipientList)];
const subject = ""; // empty subject line
splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
splitMailsHelper(uniqueRecipients, param.originalEvent, subject, null, this.$fhcAlert, this.$p)
},
getQGateStatusList() {
return [
public/js/helpers/EmailHelpers.js
+44 -28
View File
@@ -1,50 +1,66 @@
export async function splitMailsHelper(mails, event, subject, body, alertPluginRef, phrasenPluginRef) {
await phrasenPluginRef.loadCategory('ui')
await phrasenPluginRef.loadCategory('ui');
let splititem = ",";
let maillist = mails.join(splititem);
let mailto = "";
let encodedBody = body && typeof body === 'string' ? encodeURIComponent(body) : null;
const subjectlength = subject && typeof subject === 'string' ? subject.length + 9 : 0;
let bodylength = encodedBody ? encodedBody.length + 6 : 0;
let overhead = subjectlength + bodylength;
let useBcc = event?.ctrlKey || event?.metaKey;
if (overhead > 2024)
{
// build query parameters using URLSearchParams to get encoding
const urlParams = new URLSearchParams();
if (subject && typeof subject === 'string') {
urlParams.append('subject', subject);
}
if (body && typeof body === 'string') {
urlParams.append('body', body);
}
// initial overhead: "mailto:?bcc=" -> 12 chars, "mailto:" -> 7 chars
const baseOverhead = useBcc ? 12 : 7;
let queryString = urlParams.toString();
let overhead = baseOverhead + (queryString ? 1 + queryString.length : 0); // +1 accounts for '?' or '&'
// calculate overhead with body to exceed the limit
if (overhead > 2024) {
await alertPluginRef.alertWarning(phrasenPluginRef.t('ui', 'bodyZuLang'));
encodedBody = null;
overhead = subjectlength;
urlParams.delete('body');
queryString = urlParams.toString();
overhead = baseOverhead + (queryString ? 1 + queryString.length : 0);
}
let firstrun = true;
let useBcc = event?.ctrlKey || event?.metaKey;
while (maillist.length > 0)
{
if (maillist.length + overhead > 2024)
{
while (maillist.length > 0) {
let mailto = "";
if (maillist.length + overhead > 2024) {
let splitposition = maillist.lastIndexOf(splititem, 2024 - overhead);
// Fallback guard: if a single email address is somehow longer than the remaining space
if (splitposition === -1) {
splitposition = maillist.indexOf(splititem);
if (splitposition === -1) splitposition = maillist.length;
}
mailto = maillist.substring(0, splitposition);
maillist = maillist.substring(splitposition + 1);
}
else
{
} else {
mailto = maillist;
maillist = "";
}
// construct the clean mailLink
let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
if (subject && typeof subject === 'string') mailLink += `?subject=${subject}`;
if (encodedBody) mailLink += `&body=${encodedBody}`;
if (firstrun)
{
if (queryString) {
// If using BCC, the string already has a '?', so append with '&'. Otherwise, start with '?'
mailLink += useBcc ? `&${queryString}` : `?${queryString}`;
}
if (firstrun) {
window.location.href = mailLink;
firstrun = false;
}
else
{
if (await alertPluginRef.confirm({message: phrasenPluginRef.t('ui', 'weitereEMail')}) === true)
{
} else {
if (await alertPluginRef.confirm({message: phrasenPluginRef.t('ui', 'weitereEMail')}) === true) {
window.location.href = mailLink;
} else {
break; // Stop processing further batches if the user cancels
}
}
}