From 6c0fa3fed35d5822140d6c5c2bb3587da741b8dd Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 20 Dec 2023 09:14:58 +0100
Subject: [PATCH] Leitungsansicht: Aktiv Default & korrekter Filter beim
 Neuladen der Seite

---
 public/js/components/Studierendenantrag/Leitung.js    |  4 +++-
 .../components/Studierendenantrag/Leitung/Header.js   | 11 +++++++++--
 .../js/components/Studierendenantrag/Leitung/Table.js |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index ab29ea770..0db2cc2c0 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -54,7 +54,8 @@ export default {
 			this.reload();
 		},
 		reload() {
-			this.$refs.table.reload(this.filter);
+			if (this.$refs.table)
+				this.$refs.table.reload(this.filter);
 			this.loadFilter();
 		},
 		download() {
@@ -336,6 +337,7 @@ export default {
 			ref="table"
 			:stg-a="stgkzA"
 			:stg-l="stgkzL"
+			:filter="filter"
 			v-model:columnData="columns"
 			v-model:selectedData="selectedData"
 			@action:approve="actionApprove"
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
index 017148689..eae130de5 100644
--- a/public/js/components/Studierendenantrag/Leitung/Header.js
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -31,7 +31,14 @@ export default {
 		}
 	},
 	created() {
-		const values = window.localStorage.getItem(LOCAL_STORAGE_ID).split('/');
+		var values = 'todo';
+		const savedPath = window.localStorage.getItem(LOCAL_STORAGE_ID);
+		if (savedPath !== null) {
+			values = savedPath;
+		}
+
+		values = values.split('/');
+
 		if (values.length) {
 			if (values.length == 1) {
 				if (values[0] == 'todo')
@@ -49,8 +56,8 @@ export default {
 		<div class="col-auto row row-cols-lg-auto g-3 align-items-center">
 			<div class="col-12">
 				<select class="form-select" v-model="todo_value">
-					<option value="">{{$p.t('global', 'alle')}}</option>
 					<option value="todo">{{$p.t('global', 'aktiv')}}</option>
+					<option value="">{{$p.t('global', 'alle')}}</option>
 				</select>
 			</div>
 			<div class="col-12">
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 7676115c9..c4d794326 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -13,7 +13,8 @@ export default {
 		selectedData: Array,
 		columnData: Array,
 		stgL: Array,
-		stgA: Array
+		stgA: Array,
+		filter: String
 	},
 	emits: [
 		'update:columnData',
@@ -90,7 +91,7 @@ export default {
 			movableColumns: true,
 			maxHeight: '50vh',
 			layout: "fitDataFill",
-			ajaxURL: this.ajaxUrl,
+			ajaxURL: this.ajaxUrl + (this.filter || ''),
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting
 				filter: true, //persist filters