+ test manu: currentSEM: {{semDates.start}} - {{semDates.ende}}
({
id: tag.notiz_id,
typ_kurzbz: tag.titel?.toLowerCase(),
@@ -12,9 +15,33 @@ export function idTagFormatter (id, tagData, tagComponent, typeId)
style: tag.style,
done: tag.done,
automatisiert: tag.automatisiert,
- typeId: id
+ typeId: id,
+ validFrom: tag.start ? new Date(tag.start) : null,
+ validTo: tag.ende ? new Date(tag.ende) : null
}));
+ const isInSemester = (tag) => {
+ if (!hasSemesterFilter) return true;
+
+ if (!tag.validFrom && !tag.validTo) return true;
+
+ if (!tag.validFrom && !tag.validTo) return true;
+
+ if (tag.validFrom && tag.validTo) {
+ return tag.validFrom <= semEnd && tag.validTo >= semStart;
+ }
+
+ if (tag.validFrom && !tag.validTo) {
+ return tag.validFrom <= semEnd;
+ }
+
+ if (!tag.validFrom && tag.validTo) {
+ return tag.validTo >= semStart;
+ }
+
+ return false;
+ };
+
let container = document.createElement('div');
container.className = "d-flex gap-1";
@@ -23,7 +50,9 @@ export function idTagFormatter (id, tagData, tagComponent, typeId)
const renderTags = () => {
container.innerHTML = '';
- let filtered = parsedTags.filter(t => t != null);
+ let filtered = parsedTags
+ .filter(t => t != null)
+ .filter(isInSemester);
filtered.sort((a, b) => {
let adone = a.done ? 1 : 0;
diff --git a/public/js/tabulator/formatter/tags.js b/public/js/tabulator/formatter/tags.js
index b9578dbd4..d9a5244fd 100644
--- a/public/js/tabulator/formatter/tags.js
+++ b/public/js/tabulator/formatter/tags.js
@@ -1,28 +1,115 @@
-export function tagFormatter(cell, tagComponent)
-{
+export function tagFormatter(
+ cell,
+ tagComponent,
+ semesterStart = null,
+ semesterEnd = null
+) {
+
+ // support both call versions
+ // 1. previous Tabulator cell: old version
+ // 2. custom enriched object: with start and end for tags plus semesterDates
+ // for check if valid tag
+
+ const isTabulatorCell =
+ cell && typeof cell.getValue === 'function';
+
+ const normalized = isTabulatorCell
+ ? {
+ tags: cell.getValue() || [],
+ start: null,
+ ende: null,
+ rowData: cell.getRow().getData(),
+ }
+ : {
+ tags: cell.tags || [],
+ start: cell.start || null,
+ ende: cell.ende || null,
+ rowData: cell.rowData || {},
+ };
+
+ const tags = normalized.tags || [];
+
+ if (!tags.length) {
+ return "";
+ }
+
const mappedData = tagComponent.tags.map(tag => ({
typ_kurzbz: tag.tag_typ_kurzbz,
- automatisiert: tag.automatisiert
+ automatisiert: tag.automatisiert,
+ validFrom: normalized.start
+ ? new Date(normalized.start)
+ : null,
+ validTo: normalized.ende
+ ? new Date(normalized.ende)
+ : null
}));
+ const hasSemesterFilter =
+ !!(semesterStart && semesterEnd);
- let tags = cell.getValue();
- if (!tags) return;
+ const semStart = hasSemesterFilter ? new Date(semesterStart) : null;
+
+ const semEnd = hasSemesterFilter ? new Date(semesterEnd) : null;
+
+ const isInSemester = (tag) => {
+
+ if (!hasSemesterFilter) {
+ return true;
+ }
+
+ if (!tag.validFrom && !tag.validTo) {
+ return true;
+ }
+
+ if (tag.validFrom && tag.validTo) {
+ return (
+ tag.validFrom <= semEnd &&
+ tag.validTo >= semStart
+ );
+ }
+
+ if (tag.validFrom && !tag.validTo) {
+ return tag.validFrom <= semEnd;
+ }
+
+ if (!tag.validFrom && tag.validTo) {
+ return tag.validTo >= semStart;
+ }
+
+ return false;
+ };
+
+ // parse tags if needed
+ let parsedTags =
+ typeof tags === 'string'
+ ? JSON.parse(tags)
+ : tags;
let container = document.createElement('div');
container.className = "d-flex gap-1";
- let parsedTags = JSON.parse(tags);
let maxVisibleTags = 2;
- const rowData = cell.getRow().getData();
+ const rowData = normalized.rowData;
+
if (rowData._tagExpanded === undefined) {
rowData._tagExpanded = false;
}
const renderTags = () => {
container.innerHTML = '';
- parsedTags = parsedTags.filter(item => item !== null);
+
+ parsedTags = parsedTags.filter(tag => {
+ const mapped = mappedData.find(
+ m => m.typ_kurzbz === tag.typ_kurzbz
+ );
+
+ if (!mapped) {
+ return true;
+ }
+
+ return isInSemester(mapped);
+ });
parsedTags.sort((a, b) => {
let adone = a.done ? 1 : 0;
@@ -34,10 +121,14 @@ export function tagFormatter(cell, tagComponent)
}
return b.id - a.id;
});
- const tagsToShow = rowData._tagExpanded ? parsedTags : parsedTags.slice(0, maxVisibleTags);
+
+ 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;
@@ -60,8 +151,10 @@ export function tagFormatter(cell, tagComponent)
container.appendChild(tagElement);
});
- if (parsedTags.length > maxVisibleTags) {
+ // show expand button
+ 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";