From cf5177e5e1cf3802379071cb00505ab323864794 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 1 Aug 2019 15:25:52 +0200
Subject: [PATCH] Added method getNext() to Studiensemester_model

getNext() returns the upcoming study semester.
---
 .../organisation/Studiensemester_model.php    | 16 +++++
 system/filtersupdate.php                      | 63 ++++++++++++++-----
 2 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index 9248b241d..efe244746 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -13,6 +13,22 @@ class Studiensemester_model extends DB_Model
 		$this->hasSequence = false;
 	}
 
+	// Get next study semester
+	public function getNext()
+    {
+        $query = '
+            SELECT *
+            FROM
+                public.tbl_studiensemester
+            WHERE
+                start > now()
+            ORDER BY start
+            LIMIT 1;
+        ';
+
+        return $this->execQuery($query);
+    }
+
 	/**
 	 * getLastOrAktSemester
 	 */
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 413b821af..6bbe25118 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -400,28 +400,23 @@ $filters = array(
 		'oe_kurzbz' => null,
 	),
 	array(
-		'app' => 'infocenter',
-		'dataset_name' => 'reihungstestAbsolviert',
-		'filter_kurzbz' => 'InfoCenterReihungstestAbsolviertAlle',
+		'app' => 'lehrauftrag',
+		'dataset_name' => 'lehrauftragOrder',
+		'filter_kurzbz' => 'LehrauftragOrder',
 		'description' => '{Alle}',
 		'sort' => 1,
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "Reihungstest absolviert - Alle",
 				"columns": [
-					{"name": "Vorname"},
-					{"name": "Nachname"},
-					{"name": "StgAbgeschickt"},
-					{"name": "LastAction"},
-					{"name": "User/Operator"},
-					{"name": "LockUser"}
-				],
-				"filters": [
-					{
-						"name": "ReihungstestAngetreten",
-						"operation": "true"
-					}
+					{"name": "Lehrveranstaltung"},
+					{"name": "Organisationseinheit"},
+					{"name": "Lektor"},
+					{"name": "Stunden"},
+					{"name": "Betrag"},
+					{"name": "Bestellung STG"},
+					{"name": "Erteilung Department"},
+					{"name": "Akzeptiert von Lektor"}
 				]
 			}
 		',
@@ -460,7 +455,41 @@ $filters = array(
 			}
 		',
 		'oe_kurzbz' => null,
-	)
+	),
+    array(
+        'app' => 'budget',
+        'dataset_name' => 'budgetoverview',
+        'filter_kurzbz' => 'BudgetUebersicht',
+        'description' => '{Budgetanträge Übersicht}',
+        'sort' => 1,
+        'default_filter' => true,
+        'filter' => '
+			{
+				"name": "Budgetanträge",
+				"columns": [
+					{"name": "Budgetantrag"},
+					{"name": "Kostenstelle"},
+					{"name": "Organisationseinheit"},
+					{"name": "Geschäftsjahr"},
+					{"name": "Budgetstatus"},
+					{"name": "Betrag"}
+				],
+				"filters": [
+					{
+						"name": "Budgetstatus",
+						"condition": "Freigegeben",
+						"operation": "ncontains"
+					},
+					{
+						"name": "Geschäftsjahr",
+						"condition": "GJ2019-2020",
+						"operation": "contains"
+					}
+				]
+			}
+		',
+        'oe_kurzbz' => null,
+    )
 );
 
 // Loop through the filters array