blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into eine_uid

Browse Source
This commit is contained in:
Andreas Moik
2016-06-20 16:18:28 +02:00
parent f6358f92ed 7758fa3807
commit 6e157bd746
23 changed files with 588 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dokument_export.class.php
+11
View File
@@ -291,6 +291,9 @@ class dokument_export
if($download)
{
if(headers_sent())
exit('Header wurden bereits gesendet -> Abbruch');
switch($this->outputformat)
{
case 'pdf':
@@ -310,6 +313,8 @@ class dokument_export
header('Content-Disposition: attachment; filename="'.$this->filename.'.odt"');
header('Content-Length: '.$fsize);
break;
default:
exit('Outputformat is not defined');
}
while (!feof($handle))
@@ -389,5 +394,11 @@ class dokument_export
}
return $_xml_data->asXML();
}
public function getXML()
{
$this->xml_data->formatOutput=true;
return $this->xml_data->saveXML();
}
}
?>
include/jahresplan.class.php
+4 -2
View File
@@ -548,8 +548,10 @@ class jahresplan extends basis_db
$qry.=", to_char(tbl_veranstaltung.start, 'Q') as \"start_quartal\" ";
$qry.=", to_char(tbl_veranstaltung.ende, 'Q') as \"ende_quartal\" ";
$qry.=", EXTRACT(EPOCH FROM tbl_veranstaltung.start) as \"start_timestamp\" ";
$qry.=", EXTRACT(EPOCH FROM tbl_veranstaltung.ende) as \"ende_timestamp\" ";
$qry.=", EXTRACT(EPOCH FROM tbl_veranstaltung.start::TIMESTAMP WITHOUT TIME
ZONE at time zone 'CEST' ) as \"start_timestamp\" ";
$qry.=", EXTRACT(EPOCH FROM tbl_veranstaltung.ende::TIMESTAMP WITHOUT TIME
ZONE at time zone 'CEST' ) as \"ende_timestamp\" ";
$qry.=", to_char(tbl_veranstaltung.start, 'DD.MM.YYYY') as \"start_datum\" ";
include/prestudent.class.php
+6 -2
View File
@@ -1784,7 +1784,9 @@ class prestudent extends person
if($stg_obj->typ=='m')
{
$qry = "SELECT DISTINCT prestudent_id, vorname, nachname, gebdatum, rt_gesamtpunkte, tbl_prestudent.studiengang_kz, bis.tbl_zgvgruppe.bezeichnung, get_rolle_prestudent(prestudent_id, null) as laststatus
$qry = "SELECT DISTINCT prestudent_id, vorname, nachname, gebdatum, rt_gesamtpunkte, tbl_prestudent.studiengang_kz, bis.tbl_zgvgruppe.bezeichnung, get_rolle_prestudent(prestudent_id, null) as laststatus,
(Select anmerkung from public.tbl_prestudentstatus where prestudent_id=tbl_prestudent.prestudent_id AND studiensemester_kurzbz=". $this->db_add_param($studiensemester_kurzbz)."
AND status_kurzbz='Bewerber') as anmerkung
FROM
public.tbl_prestudent
JOIN public.tbl_person USING(person_id)
@@ -1810,7 +1812,9 @@ class prestudent extends person
}
else
{
$qry = "SELECT DISTINCT prestudent_id, vorname, nachname, gebdatum, rt_gesamtpunkte, tbl_prestudent.studiengang_kz, bis.tbl_zgvgruppe.bezeichnung, get_rolle_prestudent(prestudent_id, null) as laststatus
$qry = "SELECT DISTINCT prestudent_id, vorname, nachname, gebdatum, rt_gesamtpunkte, tbl_prestudent.studiengang_kz, bis.tbl_zgvgruppe.bezeichnung, get_rolle_prestudent(prestudent_id, null) as laststatus,
(Select anmerkung from public.tbl_prestudentstatus where prestudent_id=tbl_prestudent.prestudent_id AND studiensemester_kurzbz=". $this->db_add_param($studiensemester_kurzbz)."
AND status_kurzbz='Bewerber') as anmerkung
FROM
public.tbl_prestudent
JOIN public.tbl_person USING(person_id)