diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 3b056b042..745f53002 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -4,6 +4,7 @@ import Alert from "../../../components/Bootstrap/Alert.js";
import Loading from "../../../components/Loader.js";
import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
const sortProfilUpdates = (ele1, ele2, thisPointer) => {
let result = 0;
@@ -184,13 +185,13 @@ export default {
},
height: 600,
- layout: "fitColumns",
+ layout: "fitDataStretchFrozen",
columns: [
{
title: this.$p.t("profilUpdate", "UID"),
field: "uid",
- minWidth: 200,
+ minWidth: 100,
resizable: true,
headerFilter: true,
//responsive:0,
@@ -203,27 +204,59 @@ export default {
headerFilter: true,
//responsive:0,
},
+ {
+ title: this.$p.t("lehre", "studiengang") + ' (' + this.$p.t("profil", "studentIn") + ')',
+ field: "studiengang",
+ minWidth: 50,
+ resizable: true,
+ headerFilter: "list",
+ headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+ //responsive:0,
+ },
+ {
+ title: this.$p.t("lehre", "organisationsform") + ' (' + this.$p.t("profil", "studentIn") + ')',
+ field: "orgform",
+ minWidth: 50,
+ resizable: true,
+ headerFilter: "list",
+ headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+ //responsive:0,
+ },
+ {
+ title: this.$p.t("lehre", "organisationseinheit") + ' (' + this.$p.t("profil", "mitarbeiterIn") + ')',
+ field: "oezuordnung",
+ minWidth: 200,
+ resizable: true,
+ headerFilter: "list",
+ headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+ //responsive:0,
+ },
{
title: this.$p.t("profilUpdate", "Topic"),
field: "topic",
resizable: true,
minWidth: 200,
- headerFilter: true,
+ headerFilter: "list",
+ headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
//responsive:0,
},
{
title: this.$p.t("profilUpdate", "insertamum"),
- field: "insertamum",
+ field: "insertamum_iso",
resizable: true,
- headerFilter: true,
+ headerFilterFunc: 'dates',
+ headerFilter: dateFilter,
minWidth: 200,
+ formatter:"datetime",
+ formatterParams: this.datetimeFormatterParams(),
//responsive:0,
},
{
title: this.$p.t("profilUpdate", "Status"),
field: "status_translated",
hozAlign: "center",
- headerFilter: true,
+ headerFilter: "list",
+ headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
formatter: (cell, para) => {
let iconClasses = "";
let status = cell.getRow().getData().status;
@@ -248,20 +281,11 @@ export default {
{
title: this.$p.t("profilUpdate", "actions"),
headerSort: false,
+ frozen: true,
formatter: (cell, params) => {
- let STATUS_PENDING =
- cell.getRow().getData().status ==
- this.profilUpdateStates["Pending"];
-
+ let details = this.$p.t('global', 'details');
let html = `
-
- ${
- STATUS_PENDING ?
- `
- `
- :
- ``
- }
+
`;
// Convert the HTML string to an HTML node
@@ -276,19 +300,6 @@ export default {
this.showAcceptDenyModal(cell.getRow().getData());
});
- if (STATUS_PENDING) {
- node
- .querySelector("#acceptButton")
- .addEventListener("click", () => {
- this.acceptProfilUpdate(cell.getRow().getData());
- });
- node
- .querySelector("#denyButton")
- .addEventListener("click", () => {
- this.denyProfilUpdate(cell.getRow().getData());
- });
- }
-
return node;
},
minWidth: 200,
@@ -370,6 +381,15 @@ export default {
this.showAcceptDenyModal(arrayRowData[0]);
}
}
+ },
+ datetimeFormatterParams: function() {
+ const params = {
+ inputFormat:"yyyy-MM-dd",
+ outputFormat:"dd.MM.yyyy",
+ invalidPlaceholder:"(invalid date)",
+ timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+ };
+ return params;
}
},
watch: {
@@ -382,7 +402,7 @@ export default {
},
},
created() {
- this.$p.loadCategory("profilUpdate").then(() => {
+ this.$p.loadCategory(["profilUpdate", "lehre", "profil", "global"]).then(() => {
this.categoryLoaded = true;
});
},
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 1088e3f63..04c6d1835 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -121,7 +121,8 @@ export default {
class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
>
![Profilbild]()
@@ -175,7 +176,8 @@ export default {
![Profilbild]()
diff --git a/public/js/components/LVVerwaltung/Details/Direktinskription.js b/public/js/components/LVVerwaltung/Details/Direktinskription.js
index c7b8e5894..73e81bea6 100644
--- a/public/js/components/LVVerwaltung/Details/Direktinskription.js
+++ b/public/js/components/LVVerwaltung/Details/Direktinskription.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
import FormForm from '../../Form/Form.js';
import FormInput from '../../Form/Input.js';
import ApiDirektGruppe from "../../../api/lehrveranstaltung/direktgruppe.js";
+import ApiGruppe from "../../../api/lehrveranstaltung/gruppe.js";
export default{
name: "LVDirektGruppen",
components: {
@@ -61,11 +62,9 @@ export default{
lastSelected: null,
gruppen: [],
tabulatorEvents: [],
- showAutocomplete: false,
selectedUser: null,
filteredUsers: [],
abortController: null,
- searchTimeout: null,
}
},
watch: {
@@ -97,18 +96,36 @@ export default{
},
searchUser(event)
{
- const query = event.query.toLowerCase().trim();
- this.filteredUsers = this.dropdowns.benutzer_array.filter(user => {
+ const query = event.query.trim();
+ if (!query)
+ {
+ this.filteredUsers = [];
+ return;
+ }
- const fullName = `${user.vorname.toLowerCase()} ${user.nachname.toLowerCase()}`;
- const reverseFullName = `${user.nachname.toLowerCase()} ${user.vorname.toLowerCase()}`;
- return fullName.includes(query) || reverseFullName.includes(query) || user.uid.toLowerCase().includes(query) || user.studiengang.toLowerCase().includes(query);
- }).map(user => ({
- label: user.studiengang
- ? `${user.nachname} ${user.vorname} ${user.uid} ${user.studiengang} ${user.semester}`
- : `${user.nachname} ${user.vorname} ${user.uid}`,
- uid: user.uid
- }));
+ if (query.length < 2)
+ {
+ return;
+ }
+
+ if (this.abortController)
+ {
+ this.abortController.abort();
+ }
+
+ this.abortController = new AbortController();
+ const signal = this.abortController.signal;
+
+ this.$api.call(ApiGruppe.getBenutzerSearch(query), { signal })
+ .then(result => {
+ this.filteredUsers = result.data.map(user => ({
+ label: user.studiengang
+ ? `${user.nachname} ${user.vorname} ${user.uid} ${user.studiengang} ${user.semester}`
+ : `${user.nachname} ${user.vorname} ${user.uid}`,
+ uid: user.uid
+ })
+ )})
+ .catch(this.$fhcAlert.handleSystemError)
},
addUser()
{
@@ -132,19 +149,15 @@ export default{
table-only
:side-menu="false"
:reload=true
- :new-btn-label="$p.t('lehre', 'assignPerson')"
- new-btn-show
- @click:new="showAutocomplete = !showAutocomplete"
>
diff --git a/public/js/components/LVVerwaltung/Details/Form.js b/public/js/components/LVVerwaltung/Details/Form.js
index 5908512d7..d8299e4fa 100644
--- a/public/js/components/LVVerwaltung/Details/Form.js
+++ b/public/js/components/LVVerwaltung/Details/Form.js
@@ -26,16 +26,6 @@ export default {
default: true
}
},
- computed: {
- formattedAnmerkung: {
- get() {
- return (this.data.anmerkung || '').replace(/\\n/g, '\n');
- },
- set(value) {
- this.data.anmerkung = (value || '').replace(/\n/g, '\\n');
- }
- }
- },
template: `
@@ -74,7 +64,7 @@ export default {
:label="$p.t('lehre', 'detailanmerkung')"
type="textarea"
container-class="col-3"
- v-model="formattedAnmerkung"
+ v-model="data.anmerkung"
name="anmerkung"
id="anmerkung"
rows="10"
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index a6f9df005..024bf6468 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -88,9 +88,9 @@ export default{
data() {
return{
tabulatorEvents: [],
- showAutocomplete: false,
filteredGroups: [],
- selectedGroup: null
+ selectedGroup: null,
+ abortController: null
}
},
watch: {
@@ -99,19 +99,42 @@ export default{
}
},
methods:{
- searchGroup(event)
+
+ async searchGroup(event)
{
- const query = event.query.toLowerCase().trim();
- this.filteredGroups = this.dropdowns.gruppen_array.filter(gruppe => {
- return gruppe.gruppe_kurzbz.toLowerCase().includes(query) || gruppe?.bezeichnung?.toLowerCase().includes(query);
- }).map(gruppe => ({
- label: gruppe.bezeichnung
- ? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
- : gruppe.gruppe_kurzbz.trim(),
- gid: gruppe.gid,
- gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
- lehrverband: gruppe.lehrverband,
- }));
+ const query = event.query.trim();
+
+ if (!query)
+ {
+ this.filteredLektor = [];
+ return;
+ }
+
+ if (query.length < 2)
+ {
+ return;
+ }
+
+ if (this.abortController)
+ {
+ this.abortController.abort();
+ }
+
+ this.abortController = new AbortController();
+ const signal = this.abortController.signal;
+
+ this.$api.call(ApiGruppe.getAllSearch(query), { signal })
+ .then(result => {
+ this.filteredGroups = result.data.map(gruppe => ({
+ label: gruppe.bezeichnung
+ ? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
+ : gruppe.gruppe_kurzbz.trim(),
+ gid: gruppe.gid,
+ gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
+ lehrverband: gruppe.lehrverband,
+ })
+ )})
+ .catch(this.$fhcAlert.handleSystemError)
},
reload() {
this.$refs.table.reloadTable();
@@ -173,13 +196,9 @@ export default{
table-only
:side-menu="false"
:reload=true
- :new-btn-label="$p.t('lehre', 'addGroup')"
- new-btn-show
- @click:new="showAutocomplete = !showAutocomplete"
>
{
- this.dropdowns.lektor_array = result.data;
- })
- .catch(this.$fhcAlert.handleSystemError);
-
- this.$api.call(ApiGruppe.getAll())
- .then(result => {
- this.dropdowns.gruppen_array = result.data;
- })
- .catch(this.$fhcAlert.handleSystemError);
-
- this.$api.call(ApiGruppe.getBenutzer())
- .then(result => {
- this.dropdowns.benutzer_array = result.data;
- })
- .catch(this.$fhcAlert.handleSystemError);
},
- template: `
+ template: /* html */`
`;
}
liste += "";
break;
case 'bestaetigt':
- liste += "