+
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 39f0e507e..5d88805c9 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -154,7 +154,7 @@ export default {
let button = document.createElement('button');
button.className = 'btn btn-outline-secondary btn-action';
- button.title = this.$p.t('ui', 'notiz_edit');
+ button.title = this.$p.t('notiz', 'notiz_edit');
button.innerHTML = '
';
button.addEventListener(
'click',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
index 81c1a6860..c17c7aebc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
@@ -40,7 +40,7 @@ export default {
return this.$fhcAlert.alertError(this.$p.t('stv', 'error_combinePeople_samePerson'));
}
- let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
+ let linkCombinePeople = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
this.openLink(linkCombinePeople);
},
openLink(url) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
index bd7554a47..43995b918 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
@@ -1,3 +1,4 @@
+import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js"
export default {
name: "Kontaktieren",
computed: {
@@ -22,60 +23,16 @@ export default {
},
methods: {
- async splitMails(mails, event) {
- let splititem = ",";
- let maillist = mails.join(splititem);
- let mailto = "";
-
- if (maillist.length > 2024)
- {
- if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'zuvieleEMails') }) === false)
- return;
- }
-
- let firstrun = true;
- let useBcc = event?.ctrlKey || event?.metaKey;
- while (maillist.length > 0)
- {
- if (maillist.length > 2024)
- {
- let splitposition = maillist.lastIndexOf(splititem, 1900);
- mailto = maillist.substring(0, splitposition);
- maillist = maillist.substring(splitposition + 1);
- }
- else
- {
- mailto = maillist;
- maillist = "";
- }
-
- let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
-
- if (firstrun)
- {
- window.location.href = mailLink;
- firstrun = false;
- }
- else
- {
- if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'weitereEMail')}) === true)
- {
- window.location.href = mailLink;
- }
- }
-
- }
- },
internMail(event) {
if (this.internMails.length)
{
- this.splitMails(this.internMails, event);
+ splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
}
},
privateMail(event) {
if (this.privateMails.length)
{
- this.splitMails(this.privateMails, event);
+ splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
}
}
},
diff --git a/public/js/helpers/EmailHelpers.js b/public/js/helpers/EmailHelpers.js
new file mode 100644
index 000000000..87daa828a
--- /dev/null
+++ b/public/js/helpers/EmailHelpers.js
@@ -0,0 +1,45 @@
+export async function splitMailsHelper(mails, event, subject, alertPluginRef, phrasenPluginRef) {
+ let splititem = ",";
+ let maillist = mails.join(splititem);
+ let mailto = "";
+ // take subject line length + '?subject=' length into account
+ const subjectlength = subject && typeof subject === 'string' ? subject.length + 9 : 0
+ if (maillist.length > 2024)
+ {
+ if (await alertPluginRef.confirm({message: phrasenPluginRef.t('stv', 'zuvieleEMails') }) === false)
+ return;
+ }
+
+ let firstrun = true;
+ let useBcc = event?.ctrlKey || event?.metaKey;
+ while (maillist.length > 0)
+ {
+ if (maillist.length + subjectlength > 2024)
+ {
+ let splitposition = maillist.lastIndexOf(splititem, 1900);
+ mailto = maillist.substring(0, splitposition);
+ maillist = maillist.substring(splitposition + 1);
+ }
+ else
+ {
+ mailto = maillist;
+ maillist = "";
+ }
+
+ let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
+ if(subject && typeof subject === 'string') mailLink += `?subject=${subject}`
+ if (firstrun)
+ {
+ window.location.href = mailLink;
+ firstrun = false;
+ }
+ else
+ {
+ if (await alertPluginRef.confirm({message: phrasenPluginRef.t('stv', 'weitereEMail')}) === true)
+ {
+ window.location.href = mailLink;
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/public/js/helpers/TagHelper.js b/public/js/helpers/TagHelper.js
new file mode 100644
index 000000000..9282aa167
--- /dev/null
+++ b/public/js/helpers/TagHelper.js
@@ -0,0 +1,124 @@
+export function addTagInTable(addedTag, rows, matchKey, tagsKey = "tags")
+{
+ if (!addedTag || !Array.isArray(addedTag.response))
+ return;
+
+ rows.forEach(row =>
+ {
+ const rowData = row.getData();
+ let updated = false;
+
+ addedTag.response.forEach(tag =>
+ {
+ if (rowData[matchKey] !== tag[matchKey])
+ return;
+
+ let tags;
+ try {
+ tags = JSON.parse(rowData[tagsKey] || "[]");
+ } catch (e) {
+ tags = [];
+ }
+
+ if (!Array.isArray(tags))
+ tags = [];
+
+ if (tags.some(t => t?.id === tag.id))
+ return;
+
+ let newTag = { ...addedTag, id: tag.id };
+
+ tags.unshift(newTag);
+
+ rowData[tagsKey] = JSON.stringify(tags);
+ updated = true;
+ });
+
+ if (updated)
+ row.update(rowData);
+ });
+}
+
+export function deleteTagInTable(deletedTag, rows, tagsKeys = ['tags'])
+{
+ if (!Array.isArray(tagsKeys))
+ tagsKeys = [tagsKeys];
+
+ rows.forEach(row => {
+ let rowData = row.getData();
+ let updates = {};
+ let changed = false;
+
+ tagsKeys.forEach(key => {
+ let tags;
+
+ try {
+ tags = JSON.parse(rowData[key] || "[]");
+ } catch (e) {
+ tags = [];
+ }
+
+ if (!Array.isArray(tags))
+ return;
+
+ let filtered = tags.filter(tag => tag?.id !== deletedTag);
+
+ if (filtered.length !== tags.length)
+ {
+ updates[key] = JSON.stringify(filtered);
+ changed = true;
+ }
+ });
+
+ if (changed) {
+ row.update(updates);
+ row.reformat();
+ }
+ });
+}
+
+
+export function updateTagInTable(updatedTag, rows, fields = ['tags'])
+{
+ if (!Array.isArray(fields))
+ fields = [fields];
+
+ rows.forEach(row =>
+ {
+ const rowData = row.getData();
+ let updated = false;
+
+ fields.forEach(field =>
+ {
+ if (!rowData[field])
+ return;
+
+ let fieldData;
+ try {
+ fieldData = JSON.parse(rowData[field] || "[]");
+ } catch (e) {
+ return;
+ }
+
+ if (!Array.isArray(fieldData))
+ return;
+
+ let index = fieldData.findIndex(tag => tag?.id === updatedTag.id);
+
+ if (index !== -1)
+ {
+ fieldData[index] = { ...updatedTag };
+ let updatedFieldData = JSON.stringify(fieldData);
+
+ if (updatedFieldData !== rowData[field])
+ {
+ rowData[field] = updatedFieldData;
+ updated = true;
+ }
+ }
+ });
+
+ if (updated)
+ row.update(rowData);
+ });
+}
diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 7bf86c119..35b66dc1c 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -146,7 +146,7 @@ export function tagHeaderFilter(headerValue, rowValue, rowData, filterParams)
if (Array.isArray(data))
{
combinedText = data
- .filter(item => item?.done === false)
+ .filter(item => item?.done !== true)
.map(item => `${item?.beschreibung} ${item?.notiz}`)
.join(' ');
}
diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js
new file mode 100644
index 000000000..0d2f5004c
--- /dev/null
+++ b/public/js/tabulator/formatter/tags.js
@@ -0,0 +1,67 @@
+export function tagFormatter(cell, tagComponent)
+{
+ let tags = cell.getValue();
+ if (!tags) return;
+
+ let container = document.createElement('div');
+ container.className = "d-flex gap-1";
+
+ let parsedTags = JSON.parse(tags);
+ let maxVisibleTags = 2;
+
+ const rowData = cell.getRow().getData();
+ if (rowData._tagExpanded === undefined) {
+ rowData._tagExpanded = false;
+ }
+
+ const renderTags = () => {
+ container.innerHTML = '';
+ parsedTags = parsedTags.filter(item => item !== null);
+
+ parsedTags.sort((a, b) => {
+ let adone = a.done ? 1 : 0;
+ let bbone = b.done ? 1 : 0;
+
+ if (adone !== bbone)
+ {
+ return adone - bbone;
+ }
+ return b.id - a.id;
+ });
+ const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
+
+ tagsToShow.forEach(tag => {
+ if (!tag) return;
+ let tagElement = document.createElement('span');
+ tagElement.innerText = tag.beschreibung;
+ tagElement.title = tag.notiz;
+ tagElement.className = "tag " + tag.style;
+ if (tag.done) tagElement.className += " tag_done";
+
+ tagElement.addEventListener('click', (event) => {
+ event.stopPropagation();
+ event.preventDefault();
+ tagComponent.editTag(tag.id);
+ });
+
+ container.appendChild(tagElement);
+ });
+
+ if (parsedTags.length > maxVisibleTags) {
+ let toggle = document.createElement('button');
+ toggle.innerText = (rowData._tagExpanded ? '- ' : '+ ') + (parsedTags.length - maxVisibleTags);
+ toggle.className = "display_all";
+ toggle.title = rowData._tagExpanded ? "Tags ausblenden" : "Tags einblenden";
+
+ toggle.addEventListener('click', () => {
+ rowData._tagExpanded = !rowData._tagExpanded;
+ renderTags();
+ });
+
+ container.appendChild(toggle);
+ }
+ };
+
+ renderTags();
+ return container;
+}
\ No newline at end of file
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 793930243..4ddb38203 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -91,6 +91,7 @@ require_once('dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php');
require_once('dbupdate_3.4/68744_StV_settings.php');
require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
+require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '
Pruefe Tabellen und Attribute!
';
diff --git a/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php b/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php
new file mode 100644
index 000000000..4ad88fba9
--- /dev/null
+++ b/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php
@@ -0,0 +1,28 @@
+db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_message_person_id'"))
+{
+ if ($db->db_num_rows($result) == 0)
+ {
+ $qry = "CREATE INDEX idx_tbl_msg_message_person_id ON public.tbl_msg_message USING btree (person_id)";
+
+ if (! $db->db_query($qry))
+ echo '
idx_tbl_msg_message_person_id: ' . $db->db_last_error() . '';
+ else
+ echo 'Index idx_tbl_msg_message_person_id angelegt
';
+ }
+}
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_recipient_person_id'"))
+{
+ if ($db->db_num_rows($result) == 0)
+ {
+ $qry = "CREATE INDEX idx_tbl_msg_recipient_person_id ON public.tbl_msg_recipient USING btree (person_id)";
+
+ if (! $db->db_query($qry))
+ echo '
idx_tbl_msg_recipient_person_id: ' . $db->db_last_error() . '';
+ else
+ echo 'Index idx_tbl_msg_recipient_person_id angelegt
';
+ }
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index eab9f28f0..deb856663 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19087,6 +19087,27 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'kvp',
+ 'phrase' => 'error.opproject_does_not_exists',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => "Es ist kein Openproject Projekt verknüpft.",
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => "No Openproject project is linked.",
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ //******************* KVP end
array(
'app' => 'international',
'category' => 'international',
@@ -45550,18 +45571,18 @@ array(
array(
'app' => 'core',
'category' => 'abgabetool',
- 'phrase' => 'c4sendEmailStudierende',
+ 'phrase' => 'c4sendEmailStudierendev2',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
- 'text' => 'Email an Studierende schicken',
+ 'text' => 'Email an {0} Studierende schicken',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
- 'text' => 'Send Email to students',
+ 'text' => 'Send Email to {0} students',
'description' => '',
'insertvon' => 'system'
)
@@ -45570,18 +45591,58 @@ array(
array(
'app' => 'core',
'category' => 'abgabetool',
- 'phrase' => 'c4sendEmailBetreuer',
+ 'phrase' => 'c4sammelmailStudentBetreff',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
- 'text' => 'Email an Betreuende schicken',
+ 'text' => 'Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
- 'text' => 'Send Email to assessors',
+ 'text' => "Supervision of Bachelor's thesis or Master's thesis for degree program {0}",
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'abgabetool',
+ 'phrase' => 'c4sendEmailBetreuerv2',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Email an {0} Betreuende schicken',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Send Email to {0} assessors',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'abgabetool',
+ 'phrase' => 'c4sammelmailBetreuerBetreff',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => "Supervision of Bachelor's thesis or Master's thesis for degree program {0}",
'description' => '',
'insertvon' => 'system'
)