From b8a504b42446c27519b836f05aef174ea462c5af Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 15 Apr 2019 16:59:24 +0200
Subject: [PATCH] =?UTF-8?q?Budget=20FilterWidget=20=C3=9Cbersicht=20Update?=
 =?UTF-8?q?s:=20-=20public/FilterWidget.js=20:=20ignore=20empty=20objects?=
 =?UTF-8?q?=20when=20rendering=20tablesorter=20table=20-=20Insert=20Budget?=
 =?UTF-8?q?=20filter=20-=20Insert=20app=20"budget"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/FilterWidget.js |  6 ++++++
 system/dbupdate_3.3.php   | 15 +++++++++++++++
 system/filtersupdate.php  | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/public/js/FilterWidget.js b/public/js/FilterWidget.js
index 0f1889486..36c313783 100644
--- a/public/js/FilterWidget.js
+++ b/public/js/FilterWidget.js
@@ -851,6 +851,12 @@ var FHC_FilterWidget = {
 				for (var i = 0; i < data.dataset.length; i++)
 				{
 					var record = data.dataset[i];
+
+					if ($.isEmptyObject(record))
+					{
+						continue;
+					}
+
 					var strHtml = "<tr class='" + record.MARK_ROW_CLASS + "'>";
 
 					if (data.checkboxes != null && data.checkboxes != "")
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 6a2eb5137..79ca72971 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -2849,6 +2849,21 @@ if($result = $db->db_query($qry_column_desc))
 	}
 }
 
+// App 'budget' hinzufügen
+if($result = $db->db_query("SELECT 1 FROM system.tbl_app WHERE app='budget'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+
+		$qry = "INSERT INTO system.tbl_app(app) VALUES('budget');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>App: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Neue App budget in system.tbl_app hinzugefügt';
+	}
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 27dbce891..5ec998876 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -425,6 +425,40 @@ $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,
 	)
 );