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

add tags extraction from nested rows

Browse Source
This commit is contained in:
Ivymaster
2026-06-29 13:12:29 +02:00
parent b047b95505
commit 5399375bc1
2 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Stv/Studentenverwaltung/List.js
+10 -4
View File
@@ -736,10 +736,16 @@ export default {
},
updateTagFilterLabels() {
this.tagFilterLabels.clear = this.$p.t("ui/filterdelete");
this.tagFilterLabels.tag = 'Tag';
this.tagFilterLabels.connectors.AND = this.$p.t("ui/andCondition").toUpperCase();
this.tagFilterLabels.connectors.OR = this.$p.t("ui/orCondition").toUpperCase();
this.tagFilterLabels.connectors.NOT = this.$p.t("ui/notCondition").toUpperCase();
this.tagFilterLabels.tag = "Tag";
this.tagFilterLabels.connectors.AND = this.$p
.t("ui/andCondition")
.toUpperCase();
this.tagFilterLabels.connectors.OR = this.$p
.t("ui/orCondition")
.toUpperCase();
this.tagFilterLabels.connectors.NOT = this.$p
.t("ui/notCondition")
.toUpperCase();
},
updateUrl(endpoint, first) {
this.lastSelected = first ? undefined : this.selected;
public/js/tabulator/filters/extendedHeaderFilter.js
+44 -26
View File
@@ -61,33 +61,55 @@ export function buildTagHeaderFilterExpression(selectedTagOptions) {
}
export function buildTagOptionsFromRows(rows = []) {
const options = new Map();
let options = [];
let tags = [
...new Map(
getRawTagValuesFromRows(rows)
.filter((tag) => tag && tag.done !== true)
.map((tag) => {
return {
label: tag.beschreibung || tag.typ_kurzbz,
value: tag.beschreibung || tag.typ_kurzbz,
style: tag.style,
};
})
.map((obj) => [JSON.stringify(obj), obj]),
).values(),
];
if (!Array.isArray(tags)) return;
return tags;
}
export function getRawTagValuesFromRows(rows = []) {
let tags = [];
rows.forEach((row) => {
let tags = row.tags;
if (!row || (!row.tags?.length && !row._children?.length)) return;
if (typeof tags === "string") {
try {
tags = JSON.parse(tags);
} catch {
return;
}
}
let newTags = row.tags?.length
? [row.tags]
: getRawTagValuesFromRows(row._children);
if (!Array.isArray(tags)) return;
newTags = newTags
.map((newTag) => {
if (typeof newTag === "string") {
try {
newTag = JSON.parse(newTag);
} catch {
return null;
}
}
tags
.filter((tag) => tag && tag.done !== true)
.forEach((tag) => {
options.set(tag.beschreibung, {
label: tag.beschreibung,
value: tag.beschreibung,
style: tag.style,
});
});
return newTag;
})
.filter((newTag) => newTag !== null);
tags = tags.concat(newTags);
});
return [...options.values()];
return tags.flat();
}
export function customTagFilter(cell, onRendered, success, cancel, params) {
@@ -155,10 +177,7 @@ export function customTagFilter(cell, onRendered, success, cancel, params) {
input.value = "";
if (Array.isArray(params.selectedOptions)) {
params.selectedOptions.splice(
0,
params.selectedOptions.length,
);
params.selectedOptions.splice(0, params.selectedOptions.length);
}
success("");
@@ -205,7 +224,7 @@ export function customTagFilter(cell, onRendered, success, cancel, params) {
event.preventDefault();
event.stopPropagation();
clearFilter({closeDropdownAfterClear: false});
clearFilter({ closeDropdownAfterClear: false });
openDropdown();
});
@@ -335,7 +354,6 @@ function generateDropdownTable(options, selectedTagOptions, labels) {
selectedTagOptions.splice(idx, 1);
}
}
});
td.appendChild(cb);