mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
This commit is contained in:
@@ -72,7 +72,7 @@ class studienplatz extends basis_db
|
||||
parent::__construct();
|
||||
|
||||
if(!is_null($studienplatz_id))
|
||||
$this->load($studienplatz_id);
|
||||
$this->loadStudienplatz($studienplatz_id);
|
||||
}
|
||||
|
||||
public function __set($name,$value)
|
||||
|
||||
@@ -356,6 +356,33 @@ $filters = array(
|
||||
',
|
||||
'oe_kurzbz' => null,
|
||||
),
|
||||
array(
|
||||
'app' => 'core',
|
||||
'dataset_name' => 'leistungsstipendium',
|
||||
'filter_kurzbz' => 'LeistungsstipendiumAlle',
|
||||
'description' => '{Alle}',
|
||||
'sort' => 1,
|
||||
'default_filter' => true,
|
||||
'filter' => '
|
||||
{
|
||||
"name": "Leistungsstipendium - Alle",
|
||||
"columns": [
|
||||
{"name" : "Vorname"},
|
||||
{"name" : "Nachname"},
|
||||
{"name" : "Buchungsdatum"},
|
||||
{"name" : "Betrag"},
|
||||
{"name" : "Buchungstyp"},
|
||||
{"name" : "VorgangsId"},
|
||||
{"name" : "FoerderfallId"},
|
||||
{"name" : "LeistungsdatenId"},
|
||||
{"name" : "startjahr"},
|
||||
{"name" : "endjahr"}
|
||||
],
|
||||
"filters": []
|
||||
}
|
||||
',
|
||||
'oe_kurzbz' => null,
|
||||
),
|
||||
array(
|
||||
'app' => 'reihungstest',
|
||||
'dataset_name' => 'overview',
|
||||
|
||||
@@ -23,6 +23,7 @@ require_once('../../config/vilesci.config.inc.php');
|
||||
require_once('../../include/functions.inc.php');
|
||||
require_once('../../include/statistik.class.php');
|
||||
require_once('../../include/benutzerberechtigung.class.php');
|
||||
require_once('../../include/webservicelog.class.php');
|
||||
|
||||
$statistik_kurzbz = filter_input(INPUT_GET, 'statistik_kurzbz');
|
||||
$outputformat = filter_input(INPUT_GET, 'outputformat');
|
||||
@@ -92,6 +93,16 @@ foreach($_REQUEST as $name=>$value)
|
||||
else
|
||||
$param .= '&'.$name.'='.urlencode($value);
|
||||
}
|
||||
|
||||
// Log schreiben
|
||||
$log = new webservicelog();
|
||||
$log->request_data = $param;
|
||||
$log->webservicetyp_kurzbz = 'reports';
|
||||
$log->request_id = $statistik_kurzbz;
|
||||
$log->beschreibung = 'statistik';
|
||||
$log->execute_user = (isset($uid) ? $uid : 'unknown');
|
||||
$log->save(true);
|
||||
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
@@ -101,12 +112,12 @@ foreach($_REQUEST as $name=>$value)
|
||||
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
|
||||
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css"/>
|
||||
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
|
||||
<?php
|
||||
include('../../include/meta/jquery.php');
|
||||
include('../../include/meta/jquery-tablesorter.php');
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
|
||||
<?php
|
||||
include('../../include/meta/jquery.php');
|
||||
include('../../include/meta/jquery-tablesorter.php');
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$("#myTable").tablesorter({
|
||||
widgets: ['zebra', 'filter', 'stickyHeaders']
|
||||
|
||||
Reference in New Issue
Block a user