mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-16 22:42:16 +00:00
Budget FilterWidget Übersicht Updates:
- public/FilterWidget.js : ignore empty objects when rendering tablesorter table - Insert Budget filter - Insert app "budget"
This commit is contained in:
@@ -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 != "")
|
||||
|
||||
@@ -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>';
|
||||
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user