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

Merge branch 'master' into ci

Browse Source 
Conflicts:
	composer.json
	composer.lock
	phpci.yml
	system/checksystem.php
	system/dbupdate_3.2.php
	tests/codeception/_data/dump.sql
	tests/codeception/tests/acceptance/CISLoginPage.php
This commit is contained in:
oesi
2017-01-20 11:05:08 +01:00
parent 51b8a15f27 b8ad2dfd0c
commit b8177b58e8
83 changed files with 5390 additions and 5860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tw/abgabe_lektor_benotung.php
+31 -31
View File
@@ -366,31 +366,31 @@ else
//Feld Umrechnung Punkte=>Note
$maxY=620;
$maxX=40;
$maxX=30;
$pdf->SetFont('Arial','',10);
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'Kriterien:');
$pdf->SetFont('Arial','',7);
$maxX +=120;
$pdf->SetFont('Arial','',8);
$maxX +=55;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'0 - 50 Pkte = 5',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'Ergebnis <= 50 Pkte = 5',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'51 - 64 Pkte = 4',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'50 < Ergebnis < 65 = 4',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'65 - 77 Pkte = 3',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'65 <= Ergebnis < 78 = 3',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'78 - 90 Pkte = 2',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'78 <= Ergebnis < 91 = 2',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'91 - 100 Pkte = 1',1,'C',0);
$pdf->MultiCell(95,12,'91 Pkte <= Ergebnis = 1',1,'C',0);
$maxY=$pdf->GetY();
$maxX=160;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(240,12,'1 Gruppe < 50 Punkte => Bachelorarbeit gesamt negativ','LB','L',0);
$maxX +=240;
$maxX=85;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(315,12,'1 Gruppe < 50 Punkte => Masterarbeit gesamt negativ','LB','L',0);
$maxX +=315;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'','TB','C',0);
$maxX +=80;
@@ -400,10 +400,10 @@ else
//Zeile Note und Unterschrift
$pdf->SetFont('Arial','',11);
$maxY+=25;
$maxX=+40;
$maxX=+30;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'Note: '.$note,0,'L',0);
$maxX=+40;
$maxX=+50;
$maxY=$pdf->GetY();
$pdf->SetXY($maxX,$maxY);
$maxX +=300;
@@ -657,26 +657,26 @@ else
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'Kriterien:');
$pdf->SetFont('Arial','',8);
$maxX +=130;
$maxX +=55;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'0 - 50 Pkte = 5',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'Ergebnis <= 50 Pkte = 5',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'51 - 64 Pkte = 4',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'50 < Ergebnis < 65 = 4',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'65 - 77 Pkte = 3',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'65 <= Ergebnis < 78 = 3',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'78 - 90 Pkte = 2',1,'C',0);
$maxX +=80;
$pdf->MultiCell(95,12,'78 <= Ergebnis < 91 = 2',1,'C',0);
$maxX +=95;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'91 - 100 Pkte = 1',1,'C',0);
$pdf->MultiCell(95,12,'91 Pkte <= Ergebnis = 1',1,'C',0);
$maxY=$pdf->GetY();
$maxX=160;
$maxX=85;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(240,12,'1 Gruppe < 50 Punkte => Masterarbeit gesamt negativ','LB','L',0);
$maxX +=240;
$pdf->MultiCell(315,12,'1 Gruppe < 50 Punkte => Masterarbeit gesamt negativ','LB','L',0);
$maxX +=315;
$pdf->SetXY($maxX,$maxY);
$pdf->MultiCell(80,12,'','TB','C',0);
$maxX +=80;
include/tw/generateuid.inc.php
+10 -7
View File
@@ -81,15 +81,18 @@ if(!$generateuid_addon_found)
// Das File aliases enthaelt die Mailverteiler haendisch gewarteten Mailverteiler die nicht
// in der FHC Datenbank vorhanden sind.
// Diese duerfen nicht als UID verwendet werden, da es sonst zu Konflikten kommt
$aliases = file_get_contents(DOC_ROOT.'../system/aliases');
$aliases = explode("\n",$aliases);
foreach($aliases as $alias)
if(file_exists(DOC_ROOT.'../system/aliases'))
{
if(!strstr($alias,'#'))
$aliases = file_get_contents(DOC_ROOT.'../system/aliases');
$aliases = explode("\n",$aliases);
foreach($aliases as $alias)
{
$entry = preg_split("/[\s:]+/", $alias);
if($entry[0]!='')
$reserviert[]=$entry[0];
if(!strstr($alias,'#'))
{
$entry = preg_split("/[\s:]+/", $alias);
if($entry[0]!='')
$reserviert[]=$entry[0];
}
}
}
include/tw/vilesci_menu_main.inc.php
+1 -1
View File
@@ -138,7 +138,7 @@ $menu=array
),
'Stammdaten'=> array
(
'name'=>'Stammdaten', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('admin','lv-plan','support','basis/berechtigung','basis/variable','basis/studiengang','basis/ort','basis/firma','basis/fhausweis'), 'image'=>'vilesci_stammdaten.png',
'name'=>'Stammdaten', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('admin','lv-plan','support','basis/berechtigung','basis/variable','basis/studiengang','basis/ort','basis/firma','basis/fhausweis','basis/infoscreen'), 'image'=>'vilesci_stammdaten.png',
'link'=>'left.php?categorie=Stammdaten', 'target'=>'nav',
'Betriebsmittel'=>array('name'=>'Betriebsmittel', 'link'=>'stammdaten/betriebsmittel_frameset.php', 'target'=>'main','permissions'=>array('basis/betriebsmittel')),
'Reihungstest'=>array('name'=>'Reihungstest', 'link'=>'stammdaten/reihungstestverwaltung.php', 'target'=>'main','permissions'=>array('admin','assistenz')),