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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2017-05-08 14:12:35 +02:00
parent 8c7146ab5c d7771da74e
commit 57a09b7467
24 changed files with 694 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tw/anwesenheitsliste_bilder.inc.php
+16 -16
View File
@@ -58,18 +58,18 @@ $pdf->SetXY(30,60);
//$stsem_obj = new studiensemester($conn);
//$stsem = $stsem_obj->getaktorNext();
$qry = "SELECT DISTINCT ON
(kuerzel, semester, verband, gruppe, gruppe_kurzbz)
UPPER(stg_typ::varchar(1) || stg_kurzbz) as kuerzel,
semester,
verband,
gruppe,
gruppe_kurzbz
FROM
campus.vw_lehreinheit
WHERE
lehrveranstaltung_id=".$db->db_add_param($lvid)."
AND
$qry = "SELECT DISTINCT ON
(kuerzel, semester, verband, gruppe, gruppe_kurzbz)
UPPER(stg_typ::varchar(1) || stg_kurzbz) as kuerzel,
semester,
verband,
gruppe,
gruppe_kurzbz
FROM
campus.vw_lehreinheit
WHERE
lehrveranstaltung_id=".$db->db_add_param($lvid)."
AND
studiensemester_kurzbz=".$db->db_add_param($stsem);
if($lehreinheit_id!='')
$qry.=" AND lehreinheit_id=".$db->db_add_param($lehreinheit_id);
@@ -128,8 +128,8 @@ $pdf->SetFont('Arial','',8);
$pdf->MultiCell(130,$lineheight,mb_convert_encoding('HörerIn/Name','ISO-8859-15','UTF-8'),1,'L',0);
$maxX +=130;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(65,$lineheight,'Kennzeichen',1,'C',0);
$maxX +=65;
$pdf->MultiCell(70,$lineheight,'Kennzeichen',1,'C',0);
$maxX +=70;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(65,$lineheight,'Gruppe',1,'C',0);
$maxX +=65;
@@ -215,8 +215,8 @@ if($result = $db->db_query($qry))
$maxX +=130;
$pdf->SetXY($maxX,$maxY);
$pdf->SetFont('Arial','',10);
$pdf->MultiCell(65,$lineheight,trim($matrikelnr),1,'C',1);
$maxX +=65;
$pdf->MultiCell(70,$lineheight,trim($matrikelnr),1,'C',1);
$maxX +=70;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(65,$lineheight,$sem_verb_grup,1,'C',1);
$maxX +=65;
include/tw/vilesci_menu_main.inc.php
-1
View File
@@ -230,7 +230,6 @@ $menu=array
'link'=>'left.php?categorie=Admin', 'target'=>'nav',
'Cronjobs'=>array('name'=>'Cronjobs', 'link'=>'stammdaten/cronjobverwaltung.php', 'target'=>'main','permissions'=>array('basis/cronjob')),
'Vorlagen'=>array('name'=>'Vorlagen', 'link'=>'../index.ci.php/system/Vorlage', 'target'=>'main','permissions'=>array('basis/cronjob')),
'Messages'=>array('name'=>'Nachrichten', 'link'=>'../index.ci.php/system/Messages', 'target'=>'main','permissions'=>array('basis/cronjob')),
'Phrasen'=>array('name'=>'Phrasen', 'link'=>'../index.ci.php/system/Phrases', 'target'=>'main','permissions'=>array('basis/cronjob'))
),
'SD-Tools'=> array