blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +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:
Stefan Puraner
2016-12-13 08:53:06 +01:00
parent 5994a25b7b 7365f3b350
commit 6edd32c611
25 changed files with 1527 additions and 4142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/profile/zeitwunsch.php
+1 -1
View File
@@ -127,7 +127,7 @@ if(!$person->load($uid))
{
if(elem[i].name.match("^wunsch"))
{
if(!elem[i].value.match("[12]"))
if(!elem[i].value.match("^\-?[1-2]\d{0,0}$"))
error=true;
}
}
cis/public/incoming/incoming.php
+118 -36
View File
@@ -187,6 +187,11 @@ $( document ).ready(function()
}
}
});
function setBisdatum(datum)
{
if(document.getElementById("bis_datum").value=="")
document.getElementById("bis_datum").value=datum;
}
</script>
';
?>
@@ -269,20 +274,51 @@ if($method =="austauschprogram")
// Speichert Austauschprogram in preincoming tabelle
if(isset($_POST['submit_program']))
{
$preincoming->von = $date->formatDatum($_REQUEST['von'],'Y-m-d');
$preincoming->bis = $date->formatDatum($_REQUEST['bis'],'Y-m-d');
if (isset($_REQUEST['code']))
$preincoming->code = $_REQUEST['code'];
if($_REQUEST['austausch_kz']== "austausch_auswahl")
$preincoming->mobilitaetsprogramm_code = '';
$von_datum = $_REQUEST['von'];
$bis_datum = $_REQUEST['bis'];
//Datum auf Gueltigkeit pruefen
if (($von_datum != '' && !$date->formatDatum($von_datum,'Y-m-d')) || ($bis_datum != '' && !$date->formatDatum($bis_datum,'Y-m-d')))
{
echo '<span style="color: red"><b>'.($p->t('incoming/bitteGueltigesDatumEingeben')).'</b></span>';
}
else
$preincoming->mobilitaetsprogramm_code = $_REQUEST['austausch_kz'];
$preincoming->updateamum = date('Y-m-d H:i:s');
{
$von_datum = $date->formatDatum($von_datum,'Y-m-d');
$bis_datum = $date->formatDatum($bis_datum,'Y-m-d');
$dtstart = new DateTime($von_datum);
$dtende = new DateTime($bis_datum);
$jetzt = new DateTime();
if(!$preincoming->save())
echo $preincoming->errormsg;
else
echo $p->t('global/erfolgreichgespeichert');
if ($dtstart < $jetzt)
{
echo '<span style="color: red"><b>'.$p->t('incoming/beginnNichtInVergangenheit').'</b></span>';
$_REQUEST['von'] = '';
}
elseif ($von_datum != '' && $bis_datum != '' && $dtende < $dtstart)
{
echo '<span style="color: red"><b>'.$p->t('incoming/endeGroesserStart').'</b></span>';
$_REQUEST['bis'] = '';
}
else
{
$preincoming->von = $date->formatDatum($_REQUEST['von'],'Y-m-d');
$preincoming->bis = $date->formatDatum($_REQUEST['bis'],'Y-m-d');
if (isset($_REQUEST['code']))
$preincoming->code = $_REQUEST['code'];
if($_REQUEST['austausch_kz']== "austausch_auswahl")
$preincoming->mobilitaetsprogramm_code = '';
else
$preincoming->mobilitaetsprogramm_code = $_REQUEST['austausch_kz'];
$preincoming->updateamum = date('Y-m-d H:i:s');
if(!$preincoming->save())
echo $preincoming->errormsg;
else
echo $p->t('global/erfolgreichgespeichert');
}
}
}
// Ausgabe Austauschprogram Formular
echo ' <form method="POST" action="incoming.php?method=austauschprogram" name="AustauschForm">
@@ -317,11 +353,11 @@ if($method =="austauschprogram")
</tr>
<tr>
<td>'.$p->t('incoming/studiertvon').' </td>
<td><input type="text" name="von" class="datepicker_exchange" size="10" value="'.$date->formatDatum($preincoming->von,'d.m.Y').'"> (dd.mm.yyyy)</td>
<td><input type="text" id="von_datum" name="von" class="datepicker_exchange" size="10" value="'.($preincoming->von != ''?$date->formatDatum($preincoming->von,'d.m.Y'):$_REQUEST['von']).'" onchange="setBisdatum(this.value)"> (dd.mm.yyyy)</td>
</tr>
<tr>
<td>'.$p->t('incoming/studiertbis').' </td>
<td><input type="text" name="bis" class="datepicker_exchange" size="10" value="'.$date->formatDatum($preincoming->bis,'d.m.Y').'"> (dd.mm.yyyy)</td>
<td><input type="text" id="bis_datum" name="bis" class="datepicker_exchange" size="10" value="'.($preincoming->bis != ''?$date->formatDatum($preincoming->bis,'d.m.Y'):$_REQUEST['bis']).'"> (dd.mm.yyyy)</td>
</tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
@@ -345,12 +381,71 @@ else if($method=="lehrveranstaltungen")
{ // speichern der LV-ID
if($_GET['mode']=="add")
{
$id= $_GET['id'];
if($preincoming->addLehrveranstaltung($preincoming->preincoming_id, $_GET['id'], date('Y-m-d H:i:s')))
$message = '<span style="color: green"><b>'.($p->t('global/erfolgreichgespeichert')).'</b></span>';
else
$message = '<span style="color: red"><b>'.($p->t('global/fehleraufgetreten')).'</b></span>';
$id = $db->db_add_param($_GET['id'], FHC_INTEGER, false);
$freieplaetze = 0;
// Freie Plaetze ermitteln
$qry = " SELECT tbl_lehrveranstaltung.incoming, (
SELECT count(*)
FROM (
SELECT person_id
FROM campus.vw_student_lehrveranstaltung
JOIN PUBLIC.tbl_benutzer using (uid)
JOIN PUBLIC.tbl_student ON (uid = student_uid)
JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
WHERE lehrveranstaltung_id = ".$id."
AND lehreinheit_id IN (
SELECT lehreinheit_id
FROM lehre.tbl_lehreinheit
WHERE lehrveranstaltung_id = ".$id."
AND tbl_lehreinheit.studiensemester_kurzbz = '$stsem->studiensemester_kurzbz'
)
AND tbl_prestudentstatus.status_kurzbz = 'Incoming'
AND tbl_prestudentstatus.studiensemester_kurzbz = '$stsem->studiensemester_kurzbz'
UNION
SELECT person_id
FROM PUBLIC.tbl_preincoming_lehrveranstaltung
JOIN PUBLIC.tbl_preincoming using (preincoming_id)
WHERE lehrveranstaltung_id = ".$id."
AND
(
(bis - '$stsem->start' > '$stsem->start' - von) OR
('$stsem->start' <= von AND bis >= '$stsem->ende' AND '$stsem->ende' - von > bis - '$stsem->ende') OR
(bis <= '$stsem->ende' AND bis >= '$stsem->start' AND von < '$stsem->start') OR
('$stsem->start' <= von AND von < '$stsem->ende' AND bis > '$stsem->ende') OR
(von >= '$stsem->start' AND bis <= '$stsem->ende') OR
(von <= '$stsem->start' AND bis >= '$stsem->ende') OR
(von IS NULL AND bis IS NULL) OR
(von IS NULL AND bis <= '$stsem->ende' AND bis > '$stsem->start') OR
(bis IS NULL AND von < '$stsem->ende' AND von >= '$stsem->start')
)
AND aktiv = true
) a
) AS anzahl
FROM lehre.tbl_lehrveranstaltung
WHERE tbl_lehrveranstaltung.lehrveranstaltung_id = ".$id;
if($result = $db->db_query($qry))
{
if ($db->db_num_rows($result)>0)
{
if ($row = $db->db_fetch_object($result))
{
$freieplaetze = $row->incoming - $row->anzahl;
}
}
}
if(!$preincoming->checkLehrveranstaltung($preincoming->preincoming_id, $_GET['id']) && $freieplaetze>0)
{
if($preincoming->addLehrveranstaltung($preincoming->preincoming_id, $_GET['id'], date('Y-m-d H:i:s')))
$message = '<span style="color: green"><b>'.($p->t('global/erfolgreichgespeichert')).'</b></span>';
else
$message = '<span style="color: red"><b>'.($p->t('global/fehleraufgetreten')).'</b></span>';
}
else
$message = '<span style="color: red"><b>'.$p->t('incoming/lvVollBelegt').'</b></span>';
}
// löschen der LV-ID
if($_GET['mode'] == "delete")
@@ -709,19 +804,6 @@ else if($method=="lehrveranstaltungen")
echo '</td>
</tr>
</table>
<script language="JavaScript">
function selectChange()
{
filter = document.filterSemester.filterLv.options[document.filterSemester.filterLv.selectedIndex].value;
filterSprache = document.filterSemester.filterUnterrichtssprache.options[document.filterSemester.filterUnterrichtssprache.selectedIndex].value;
filterStudiengang = document.filterSemester.filterStudiengang.options[document.filterSemester.filterStudiengang.selectedIndex].value;
url = [location.protocol, "//", location.host, location.pathname].join("");
url = url+"?method=lehrveranstaltungen&filter="+filter+"&unterrichtssprache="+filterSprache+"&studiengang="+filterStudiengang;
document.location=url;
}
</script>
</form>
<br><br>';
@@ -739,7 +821,7 @@ else if($method=="lehrveranstaltungen")
//Uebersicht LVs
/* Erklaerung der Datumszeitraeume ab Zeile 663:
/* Erklaerung der Datumszeitraeume ab Zeile 857:
* |=============== Studiensemester ===============|
* |--------------| Incoming beginnt vor SS-Beginn und endet VOR SS-Ende jedoch ueberwiegend innerhalb SS
* |--------------| Incoming beginnt VOR SS-Ende und endet NACH SS-Ende, jedoch ueberwiegend innerhalb SS
@@ -861,7 +943,7 @@ else if($method=="lehrveranstaltungen")
if ($preincoming->checkLehrveranstaltung($preincoming->preincoming_id, $row->lehrveranstaltung_id))
$style = 'style="background-color: #88DD88"';
elseif ($freieplaetze==0)
elseif ($freieplaetze<=0)
$style = 'style="background-color: #FF8888"';
//if($freieplaetze>0)
//{
@@ -879,7 +961,7 @@ else if($method=="lehrveranstaltungen")
if(!$preincoming->checkLehrveranstaltung($preincoming->preincoming_id, $row->lehrveranstaltung_id) && $freieplaetze>0)
echo '<td><a href="incoming.php?method=lehrveranstaltungen&mode=add&id='.$row->lehrveranstaltung_id.'&'.$filter_url.'">'.$p->t('global/anmelden').'</a></td>';
elseif (!$preincoming->checkLehrveranstaltung($preincoming->preincoming_id, $row->lehrveranstaltung_id) && $freieplaetze==0)
elseif (!$preincoming->checkLehrveranstaltung($preincoming->preincoming_id, $row->lehrveranstaltung_id) && $freieplaetze<=0)
echo '<td '.$style.'>'.$p->t('incoming/noVacancies').'</td>';
else
echo '<td '.$style.'>'.$p->t('global/angemeldet').'</td>';
composer.json
+37 -16
View File
@@ -1,18 +1,39 @@
{
"require": {
"components/jquery": "2.1.4",
"components/angular.js": "1.3.16",
"components/bootstrap": "3.3.5",
"michelf/php-markdown": "1.5.0",
"netcarver/textile": "^3.5"
},
"require-dev":
{
"squizlabs/php_codesniffer": "2.*",
"fzaninotto/faker": "1.*"
},
"config":
{
"bin-dir": "bin"
}
"repositories":
[
{
"type": "package",
"package":
{
"name": "jsoneditor",
"version": "5.5.6",
"dist":
{
"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
"type": "zip"
}
}
}
],
"require":
{
"components/jquery": "2.1.4",
"components/angular.js": "1.3.16",
"components/bootstrap": "3.3.5",
"michelf/php-markdown": "1.5.0",
"netcarver/textile": "^3.5",
"jsoneditor": "5.5.6"
},
"require-dev":
{
"squizlabs/php_codesniffer": "2.*",
"fzaninotto/faker": "1.*"
},
"config":
{
"bin-dir": "bin"
}
}
composer.lock
Generated
+194 -3
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "c07a27773905e5c19ee99e404627eafd",
"content-hash": "6574a5f8f5995f3db237091bf4b70270",
"hash": "1f6a254f9c635aaea6f27ab79e43f2dc",
"content-hash": "ada2d68ca58da7a6f9a3901e8132d18e",
"packages": [
{
"name": "components/angular.js",
@@ -421,6 +421,17 @@
"homepage": "http://jquery.com",
"time": "2015-05-08 05:04:47"
},
{
"name": "jsoneditor",
"version": "5.5.6",
"dist": {
"type": "zip",
"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "michelf/php-markdown",
"version": "1.5.0",
@@ -471,9 +482,189 @@
"markdown"
],
"time": "2015-03-01 12:03:08"
},
{
"name": "netcarver/textile",
"version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/textile/php-textile.git",
"reference": "bac6381fcab28cf6b6ae3d0e61b6a8c8d6adca13"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/textile/php-textile/zipball/bac6381fcab28cf6b6ae3d0e61b6a8c8d6adca13",
"reference": "bac6381fcab28cf6b6ae3d0e61b6a8c8d6adca13",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
"satooshi/php-coveralls": "0.6.*",
"squizlabs/php_codesniffer": "1.5.*",
"symfony/yaml": "2.4.*"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.6-dev"
}
},
"autoload": {
"psr-0": {
"Netcarver\\Textile": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"description": "Textile markup language parser",
"homepage": "https://github.com/textile/php-textile",
"keywords": [
"document",
"format",
"html",
"language",
"markup",
"parser",
"php-textile",
"plaintext",
"textile"
],
"time": "2016-11-17 14:18:12"
}
],
"packages-dev": [
{
"name": "fzaninotto/faker",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"shasum": ""
},
"require": {
"php": "^5.3.3|^7.0"
},
"require-dev": {
"ext-intl": "*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
"type": "library",
"extra": {
"branch-alias": []
},
"autoload": {
"psr-4": {
"Faker\\": "src/Faker/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "François Zaninotto"
}
],
"description": "Faker is a PHP library that generates fake data for you.",
"keywords": [
"data",
"faker",
"fixtures"
],
"time": "2016-04-29 12:21:54"
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.7.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f",
"reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"bin": [
"scripts/phpcs",
"scripts/phpcbf"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"autoload": {
"classmap": [
"CodeSniffer.php",
"CodeSniffer/CLI.php",
"CodeSniffer/Exception.php",
"CodeSniffer/File.php",
"CodeSniffer/Fixer.php",
"CodeSniffer/Report.php",
"CodeSniffer/Reporting.php",
"CodeSniffer/Sniff.php",
"CodeSniffer/Tokens.php",
"CodeSniffer/Reports/",
"CodeSniffer/Tokenizers/",
"CodeSniffer/DocGenerators/",
"CodeSniffer/Standards/AbstractPatternSniff.php",
"CodeSniffer/Standards/AbstractScopeSniff.php",
"CodeSniffer/Standards/AbstractVariableSniff.php",
"CodeSniffer/Standards/IncorrectPatternException.php",
"CodeSniffer/Standards/Generic/Sniffs/",
"CodeSniffer/Standards/MySource/Sniffs/",
"CodeSniffer/Standards/PEAR/Sniffs/",
"CodeSniffer/Standards/PSR1/Sniffs/",
"CodeSniffer/Standards/PSR2/Sniffs/",
"CodeSniffer/Standards/Squiz/Sniffs/",
"CodeSniffer/Standards/Zend/Sniffs/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Greg Sherwood",
"role": "lead"
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2016-11-30 04:02:31"
}
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
include/betriebsmittel.class.php
+3 -3
View File
@@ -1115,11 +1115,11 @@ class betriebsmittel extends basis_db
$jahr_monat=mb_strtoupper(trim(str_replace(array('-','.','/','*','%',"'",'"'),'',trim($jahr_monat))));
$jm='';
if (!empty($jahr_monat) && is_numeric($jahr_monat) && strlen($jahr_monat)>6)
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, 'YYYYMMDD') = ".$this->db_add_param($jahr_monat)." ";
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYYMMDD') = ".$this->db_add_param($jahr_monat)." ";
elseif (!empty($jahr_monat) && is_numeric($jahr_monat) && strlen($jahr_monat)>4)
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, 'YYYYMM') = ".$this->db_add_param($jahr_monat)." ";
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYYMM') = ".$this->db_add_param($jahr_monat)." ";
elseif (!is_null($jahr_monat) && !empty($jahr_monat))
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, 'YYYY') = ".$this->db_add_param($jahr_monat)." ";
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYY') = ".$this->db_add_param($jahr_monat)." ";
$where.=$jm;
$where.=" and tbl_betriebsmittel_betriebsmittelstatus.betriebsmittelbetriebsmittelstatus_id in ( select max(betriebsmittelbetriebsmittelstatus_id) from wawi.tbl_betriebsmittel_betriebsmittelstatus where not betriebsmittelbetriebsmittelstatus_id is null ". $jm ." group by betriebsmittel_id) ";
}
include/meta/jsoneditor.php
+32
View File
@@ -0,0 +1,32 @@
<?php
/* Copyright (C) 2016 Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Moik <moik@technikum-wien.at>
*/
//require_once(dirname(__FILE__).'/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
$dr = DOC_ROOT;
$dr = str_replace($_SERVER["DOCUMENT_ROOT"], "", $dr);
if($dr=='')
$dr='/';
//Originaldateien des Herstellers
echo '<script src="'.$dr.'vendor/jsoneditor/dist/jsoneditor.js"></script>';
echo '<link href="'.$dr.'vendor/jsoneditor/dist/jsoneditor.css" rel="stylesheet" type="text/css">';
?>
include/vendor_custom/easyui/icon.css
+3 -3
View File
@@ -1,12 +1,12 @@
.icon-fhc-chart{
background:url('../../../skin/images/Chart.svg') no-repeat center center;
background-size: 16px 16px;
background-size: 11px 16px;
}
.icon-fhc-report{
background:url('../../../skin/images/Report.svg') no-repeat center center;
background-size: 16px 16px;
background-size: 11px 16px;
}
.icon-fhc-statistik{
background:url('../../../skin/images/Statistik.svg') no-repeat center center;
background-size: 16px 16px;
background-size: 11px 16px;
}
locale/de-AT/incoming.php
+6 -2
View File
@@ -132,6 +132,10 @@ $this->phrasen['incoming/tabelleSortierinformation']='Sie können die Spalten du
$this->phrasen['incoming/waehlenSieAusDenOptionen']='Bitte wählen Sie die gewünschen Optionen aus dem DropDown und klicken Sie auf "Filter"';
$this->phrasen['incoming/lvInfo']='LV-Info';
$this->phrasen['incoming/erfolgreichAbgeschickt']='Ihre Bewerbung wurde erfolgreich abgeschickt. Die zuständige Assistenz wird sich in Kürze mit Ihnen in Verbindung setzen';
$this->phrasen['incoming/fehlerBeimSenden']='Fehler beim senden der Bewerbung. Bitte kontaktieren Sie <a href="mailto:'.MAIL_INTERNATIONAL.'">'.MAIL_INTERNATIONAL.'</a>';
$this->phrasen['incoming/jahreStudiertMussGanzeZahlSein']='Das Feld "Jahre studiert" muss eine ganze Zahl sein</a>';
$this->phrasen['incoming/fehlerBeimSenden']='Fehler beim Senden der Bewerbung. Bitte kontaktieren Sie <a href="mailto:'.MAIL_INTERNATIONAL.'">'.MAIL_INTERNATIONAL.'</a>';
$this->phrasen['incoming/jahreStudiertMussGanzeZahlSein']='Das Feld "Jahre studiert" muss eine ganze Zahl sein';
$this->phrasen['incoming/lvVollBelegt']='Es sind mittlerweile keine freien Plätze mehr für diese Lehrveranstaltung verfügbar. Bei Rückfragen kontaktieren Sie bitte <a href="mailto:'.MAIL_INTERNATIONAL.'">'.MAIL_INTERNATIONAL.'</a>';
$this->phrasen['incoming/beginnNichtInVergangenheit']='Das Beginndatum darf nicht in der Vergangenheit liegen';
$this->phrasen['incoming/endeGroesserStart']='Das Endedatum darf nicht vor dem Beginndatum liegen';
$this->phrasen['incoming/bitteGueltigesDatumEingeben']='Das Start- oder Endedatum muss im Format TT.MM.YYYY vorliegen';
?>
locale/en-US/incoming.php
+5 -1
View File
@@ -134,5 +134,9 @@ $this->phrasen['incoming/waehlenSieAusDenOptionen']='Please choose your options
$this->phrasen['incoming/lvInfo']='Course-Info';
$this->phrasen['incoming/erfolgreichAbgeschickt']='Admission sent successfully. The administrative assistant responsible will contact you soon';
$this->phrasen['incoming/fehlerBeimSenden']='An error occured while sending the application. Please contact <a href="mailto:'.MAIL_INTERNATIONAL.'">'.MAIL_INTERNATIONAL.'</a>';
$this->phrasen['incoming/jahreStudiertMussGanzeZahlSein']='"Years completed" must be a positive integer</a>';
$this->phrasen['incoming/jahreStudiertMussGanzeZahlSein']='"Years completed" must be a positive integer</a>';
$this->phrasen['incoming/lvVollBelegt']='By now there are no vacancies for this course. For further questions please contact <a href="mailto:'.MAIL_INTERNATIONAL.'">'.MAIL_INTERNATIONAL.'</a>';
$this->phrasen['incoming/beginnNichtInVergangenheit']='The "From"-date may not be in the past';
$this->phrasen['incoming/endeGroesserStart']='The "To"-date may not be before the start';
$this->phrasen['incoming/bitteGueltigesDatumEingeben']='The date for the begin and end must be entered in the DD.MM.YYYY format';
?>
skin/images/Chart.svg
+88 -30
View File
@@ -10,12 +10,12 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100mm"
width="75mm"
height="100mm"
viewBox="0 0 100 100"
viewBox="0 0 75 100"
version="1.1"
id="svg4517"
inkscape:version="0.92pre2 r"
inkscape:version="0.92pre3 r"
sodipodi:docname="Chart.svg">
<defs
id="defs4511">
@@ -51,7 +51,8 @@
y1="291.10629"
x2="84.106262"
y2="202.89375"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0709151,0,0,1.111518,-16.045751,-27.544968)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
@@ -61,6 +62,60 @@
x2="22.4"
y2="277"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8743"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8745"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8747"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8749"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8751"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5781"
id="linearGradient8753"
gradientUnits="userSpaceOnUse"
x1="77.190254"
y1="208.05676"
x2="22.4"
y2="277" />
</defs>
<sodipodi:namedview
id="base"
@@ -69,9 +124,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="-619.33207"
inkscape:cy="89.602917"
inkscape:zoom="0.9899495"
inkscape:cx="-526.03693"
inkscape:cy="395.68782"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -89,7 +144,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -99,67 +154,70 @@
id="layer1"
transform="translate(0,-197)">
<rect
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.78746629;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945;opacity:1"
style="opacity:1;fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.95017505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5081"
width="68.212532"
height="88.21254"
x="15.893733"
y="202.89375" />
width="73.04982"
height="98.049828"
x="0.97508752"
y="197.97508" />
<g
id="g5775"
style="fill-opacity:1;fill:url(#linearGradient5783)">
style="fill:url(#linearGradient5783);fill-opacity:1"
transform="matrix(1.0709151,0,0,1.111518,-16.04575,-27.544968)">
<rect
y="227"
x="22.4"
height="50"
width="5"
id="rect5693"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43855953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="opacity:1;fill:url(#linearGradient8743);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43855953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="207"
x="32.399998"
height="70"
width="5"
id="rect5693-8"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.06855869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="opacity:1;fill:url(#linearGradient8745);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.06855869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="217"
x="42.399998"
height="60"
width="5"
id="rect5693-8-5"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.76675367;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="opacity:1;fill:url(#linearGradient8747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.76675367;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="227"
x="52.399998"
height="50"
width="5"
id="rect5693-8-5-2"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="opacity:1;fill:url(#linearGradient8749);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="237"
x="62.399998"
height="40"
width="5"
id="rect5693-8-5-1"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.0755415;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="opacity:1;fill:url(#linearGradient8751);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.0755415;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="227"
x="72.399963"
height="50"
width="5"
id="rect5693-8-5-9"
style="opacity:1;fill:url(#linearGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
</g>
<g
aria-label="C"
transform="matrix(0.26458333,0,0,0.26458333,-58.26189,200.08014)"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="flowRoot5418">
<path
d="m 531.46827,321.41028 -6.144,-13.248 c -8.064,5.184 -19.584,8.64 -31.68,8.64 -30.72,0 -48.576,-23.424 -48.576,-54.336 0,-30.912 17.856,-55.104 48.576,-55.104 12.096,0 24.576,3.84 31.68,8.64 l 6.144,-13.248 c -8.448,-5.184 -22.08,-9.408 -37.824,-9.408 -38.4,0 -64.512,30.72 -64.512,69.12 0,38.4 26.112,68.352 64.512,68.352 12.864,0 26.688,-3.072 37.824,-9.408 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:Cantarell;-inkscape-font-specification:Cantarell;fill:#000000;fill-opacity:1"
id="path4485" />
style="opacity:1;fill:url(#linearGradient8753);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
</g>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:11.54670906px;line-height:7.21669388px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28866774px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="41.84409"
y="289.04132"
id="text4505"
transform="scale(0.98156545,1.0187808)"><tspan
sodipodi:role="line"
id="tspan4503"
x="41.84409"
y="289.04132"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:55.42420578px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1;stroke-width:0.28866774px">C</tspan></text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

skin/images/Filter.svg
+30 -26
View File
@@ -10,12 +10,12 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100mm"
width="75mm"
height="100mm"
viewBox="0 0 100 100"
viewBox="0 0 75 100"
version="1.1"
id="svg4517"
inkscape:version="0.92pre2 r"
inkscape:version="0.92pre3 r"
sodipodi:docname="Filter.svg">
<defs
id="defs4511">
@@ -51,7 +51,8 @@
y1="291.10629"
x2="84.106262"
y2="202.89375"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0709151,0,0,1.111518,-16.045751,-27.544968)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5821"
@@ -60,7 +61,8 @@
y1="284.15033"
x2="74.819145"
y2="212.27556"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0709151,0,0,1.111518,-16.045751,-27.544968)" />
</defs>
<sodipodi:namedview
id="base"
@@ -69,9 +71,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="-120.31671"
inkscape:cy="95.663832"
inkscape:zoom="1.979899"
inkscape:cx="153.56609"
inkscape:cy="212.7952"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -89,7 +91,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -99,27 +101,29 @@
id="layer1"
transform="translate(0,-197)">
<rect
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.78746629;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945;opacity:1"
style="opacity:1;fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.95017505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5081"
width="68.212532"
height="88.21254"
x="15.893733"
y="202.89375" />
<g
aria-label="F"
transform="matrix(0.26458333,0,0,0.26458333,-53.451039,202.48557)"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="flowRoot5418">
<path
d="m 450.82827,210.05028 h 61.056 v -14.016 h -76.992 v 132.864 h 15.936 v -61.632 h 55.488 v -14.016 h -55.488 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:Cantarell;-inkscape-font-specification:Cantarell;fill:#000000;fill-opacity:1"
id="path5829" />
</g>
width="73.04982"
height="98.049828"
x="0.97508752"
y="197.97508" />
<path
style="fill:url(#linearGradient5823);fill-rule:evenodd;stroke:#595959;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
d="m 44.819142,242.27556 v 40 l 10,-10 v -30 l 20,-30 h -50 z"
style="fill:url(#linearGradient5823);fill-opacity:1;fill-rule:evenodd;stroke:#595959;stroke-width:3.27308297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 31.951742,241.74867 v 44.46072 l 10.70915,-11.11518 v -33.34554 l 21.4183,-33.34554 h -53.54575 z"
id="path5813"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:11.54670906px;line-height:7.21669388px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28866774px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="47.490475"
y="289.5903"
id="text4505"
transform="scale(0.98156545,1.0187808)"><tspan
sodipodi:role="line"
id="tspan4503"
x="47.490475"
y="289.5903"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:55.42420578px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1;stroke-width:0.28866774px">F</tspan></text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

skin/images/Report.svg
+528 -79
View File
@@ -10,12 +10,12 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100mm"
width="75mm"
height="100mm"
viewBox="0 0 100 100"
viewBox="0 0 75 100"
version="1.1"
id="svg4517"
inkscape:version="0.92pre2 r"
inkscape:version="0.92pre3 r"
sodipodi:docname="Report.svg">
<defs
id="defs4511">
@@ -51,7 +51,8 @@
y1="291.10629"
x2="84.106262"
y2="202.89375"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0709151,0,0,1.111518,-16.045751,-27.544968)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
@@ -61,6 +62,456 @@
x2="20.657738"
y2="281.67804"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8643"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8645"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8647"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8649"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8651"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8653"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8655"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8657"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8659"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8661"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8663"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8665"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8667"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8669"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8671"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8673"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8675"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8677"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8679"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8681"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8683"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8685"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8687"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8689"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8691"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8693"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8695"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8697"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8699"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8701"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8703"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8705"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8707"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8709"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8711"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8713"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8715"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8717"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8719"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8721"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8723"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8725"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8727"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8729"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8731"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8733"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8735"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8737"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8739"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4922"
id="linearGradient8741"
gradientUnits="userSpaceOnUse"
x1="79.720238"
y1="205.70483"
x2="20.657738"
y2="281.67804" />
</defs>
<sodipodi:namedview
id="base"
@@ -69,9 +520,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="36.830519"
inkscape:cy="159.96607"
inkscape:zoom="1.979899"
inkscape:cx="67.050792"
inkscape:cy="69.086972"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -95,7 +546,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -105,196 +556,197 @@
id="layer1"
transform="translate(0,-197)">
<rect
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.78746629;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.95017505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5081"
width="68.212532"
height="88.21254"
x="15.893733"
y="202.89375" />
width="73.04982"
height="98.049828"
x="0.97508752"
y="197.97508" />
<g
id="g4895"
style="fill-opacity:1;fill:url(#linearGradient4924)">
style="fill:url(#linearGradient4924);fill-opacity:1"
transform="matrix(1.0709151,0,0,1.111518,-16.04575,-27.544968)">
<g
transform="translate(35.71875,-3.7797619)"
id="g4685"
style="fill-opacity:1;fill:url(#linearGradient4924)">
style="fill:url(#linearGradient8695);fill-opacity:1">
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962421;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8643);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962421;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100"
width="0.23874897"
height="26.136824"
x="23.709431"
y="209.80672" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8645);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-6"
width="0.23874897"
height="25.814148"
x="26.09692"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8647);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-7"
width="0.23874897"
height="25.814148"
x="28.484411"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8649);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-5"
width="0.23874897"
height="25.814148"
x="30.871897"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8651);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3"
width="0.23874897"
height="25.814148"
x="33.259388"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8653);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-56"
width="0.23874897"
height="25.814148"
x="38.034367"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8655);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-2"
width="0.23874897"
height="25.814148"
x="35.646873"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8657);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-9"
width="0.23874897"
height="25.814148"
x="40.421856"
y="210.12939" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8659);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962424;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-1"
width="0.23874897"
height="26.136824"
x="42.809345"
y="209.80672" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962427;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8661);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962427;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2"
width="19.338667"
height="0.32267687"
x="23.709431"
y="235.62086" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8663);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-7"
width="19.099916"
height="0.32267687"
x="23.709431"
y="214.64687" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8665);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-0"
width="19.099916"
height="0.32267687"
x="23.709431"
y="216.26025" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8667);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-9"
width="19.099916"
height="0.32267687"
x="23.709431"
y="211.4201" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8669);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-3"
width="19.099916"
height="0.32267687"
x="23.709431"
y="213.03348" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8671);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-6"
width="19.099916"
height="0.32267687"
x="23.709431"
y="217.87364" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8673);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-06"
width="19.099916"
height="0.32267687"
x="23.709431"
y="219.48701" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8675);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-2"
width="19.099916"
height="0.32267687"
x="23.709431"
y="221.1004" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8677);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-61"
width="19.099916"
height="0.32267687"
x="23.709431"
y="227.55394" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8679);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-8"
width="19.099916"
height="0.32267687"
x="23.709431"
y="230.7807" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8681);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-79"
width="19.099916"
height="0.32267687"
x="23.709431"
y="234.00748" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8683);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-20"
width="19.099916"
height="0.32267687"
x="23.709431"
y="222.71378" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8685);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-23"
width="19.099916"
height="0.32267687"
x="23.709431"
y="225.94055" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8687);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-75"
width="19.099916"
height="0.32267687"
x="23.709431"
y="224.32718" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8689);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-92"
width="19.099916"
height="0.32267687"
x="23.709431"
y="229.16731" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8691);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25801668;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-28"
width="19.099916"
height="0.32267687"
x="23.709431"
y="232.39409" />
<rect
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962427;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient8693);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.25962427;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5100-3-2-97"
width="19.338667"
height="0.32267687"
@@ -307,153 +759,153 @@
height="1"
width="60"
id="rect5100-3-2-3-3"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8697);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="241"
x="20"
height="1"
width="60"
id="rect5100-3-2-3-3-6"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8699);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="236"
x="20"
height="1"
width="60"
id="rect5100-3-2-3-3-6-7"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8701);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80505168;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="251"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-5"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8703);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="256"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-3"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8705);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="261"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-56"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8707);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="266"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-2"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8709);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="276"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-9"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8711);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="231"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8713);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="281"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-27"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="271"
x="45"
height="1"
width="35"
id="rect5100-3-2-3-3-0"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.6148684;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="226"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1-9"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="221"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1-3"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8721);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="211"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1-6"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8723);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="206"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1-0"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8725);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<rect
y="216"
x="20"
height="1"
width="35"
id="rect5100-3-2-3-3-1-62"
style="fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
style="fill:url(#linearGradient8727);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.61486834;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945" />
<g
transform="matrix(0.41143708,0,0,0.41143708,10.886928,168.17075)"
style="fill:url(#linearGradient4924);fill-opacity:1"
style="fill:url(#linearGradient8741);fill-opacity:1"
id="g5775">
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43855953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8729);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43855953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693"
width="5"
height="50"
x="22.4"
y="227" />
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.06855869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8731);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.06855869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693-8"
width="5"
height="70"
x="32.399998"
y="207" />
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.76675367;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8733);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.76675367;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693-8-5"
width="5"
height="60"
x="42.399998"
y="217" />
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8735);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693-8-5-2"
width="5"
height="50"
x="52.399998"
y="227" />
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.0755415;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8737);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.0755415;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693-8-5-1"
width="5"
height="40"
x="62.399998"
y="237" />
<rect
style="opacity:1;fill:url(#linearGradient4924);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="opacity:1;fill:url(#linearGradient8739);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.43856001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5693-8-5-9"
width="5"
height="50"
@@ -461,20 +913,17 @@
y="227" />
</g>
</g>
<g
aria-label="P"
transform="matrix(0.26458333,0,0,0.26458333,-56.852009,201.21407)"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="flowRoot5418">
<g
aria-label="R"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text4505">
<path
d="m 507.0968,325.40009 h 18.432 l -37.824,-56.64 c 18.24,-4.992 30.528,-19.968 30.528,-37.44 0,-22.848 -13.248,-38.784 -39.552,-38.784 h -48.768 v 132.864 h 15.936 v -54.72 h 25.344 z m -33.984,-68.736 h -27.264 v -50.112 h 27.264 c 17.28,0 29.184,3.648 29.184,24.768 0,19.968 -13.44,25.344 -29.184,25.344 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1"
id="path4905" />
</g>
</g>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:11.54670906px;line-height:7.21669388px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28866774px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="42.123096"
y="289.59741"
id="text4505"
transform="scale(0.98156545,1.0187808)"><tspan
sodipodi:role="line"
id="tspan4503"
x="42.123096"
y="289.59741"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:55.42420578px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1;stroke-width:0.28866774px">R</tspan></text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 32 KiB

skin/images/Statistik.svg
+26 -23
View File
@@ -10,12 +10,12 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100mm"
width="75mm"
height="100mm"
viewBox="0 0 100 100"
viewBox="0 0 75 100"
version="1.1"
id="svg4517"
inkscape:version="0.92pre2 r"
inkscape:version="0.92pre3 r"
sodipodi:docname="Statistik.svg">
<defs
id="defs4511">
@@ -72,7 +72,8 @@
y1="291.10629"
x2="84.106262"
y2="202.89375"
gradientUnits="userSpaceOnUse" />
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0709151,0,0,1.111518,-16.045751,-27.544968)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient912"
@@ -324,9 +325,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="-160.90502"
inkscape:cy="173.2425"
inkscape:zoom="0.7"
inkscape:cx="-56.976954"
inkscape:cy="42.697031"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@@ -344,7 +345,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -354,15 +355,15 @@
id="layer1"
transform="translate(0,-197)">
<rect
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.78746629;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
style="fill:url(#linearGradient5416);fill-opacity:1;fill-rule:nonzero;stroke:#474747;stroke-width:1.95017505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97089945"
id="rect5081"
width="68.212532"
height="88.21254"
x="15.893733"
y="202.89375" />
width="73.04982"
height="98.049828"
x="0.97508752"
y="197.97508" />
<g
id="g5359"
transform="matrix(0.60187871,0,0,0.77835028,19.992816,48.488095)"
transform="matrix(0.64456095,0,0,0.86515033,5.3648571,26.350421)"
style="fill:url(#linearGradient5367);fill-opacity:1">
<g
id="g906"
@@ -554,18 +555,20 @@
</g>
<g
aria-label="P"
transform="matrix(0.26458333,0,0,0.26458333,-54.77314,200.08014)"
transform="matrix(0.28334626,0,0,0.29408913,-74.703128,194.8477)"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="flowRoot5418">
<g
aria-label="S"
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text4505">
<path
d="m 466.5848,327.32009 c 28.032,0 48.96,-14.976 48.96,-36.096 0,-43.008 -73.344,-35.904 -73.344,-65.28 0,-13.824 11.712,-22.08 30.528,-22.08 10.752,0 24.96,3.456 32.064,8.64 l 6.144,-13.248 c -10.368,-5.952 -22.656,-9.408 -38.592,-9.408 -24.768,0 -46.08,10.56 -46.08,36.096 0,43.008 73.344,35.904 73.344,65.28 0,11.136 -12.48,22.08 -32.64,22.08 -15.168,0 -30.144,-5.76 -37.632,-10.56 l -6.144,13.248 c 10.368,5.76 23.04,11.328 43.392,11.328 z"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1"
id="path4504" />
</g>
x="419.58417"
y="338.6937"
id="text4505"><tspan
sodipodi:role="line"
id="tspan4503"
x="419.58417"
y="338.6937"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:cantarell;-inkscape-font-specification:cantarell;fill:#000000;fill-opacity:1">S</tspan></text>
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

system/xsl/PrProtBAEng_0.xsl
+3 -3
View File
@@ -406,7 +406,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.C2" table:number-columns-spanned="5" office:value-type="string">
<text:p text:style-name="P5">Presentation and Examination interview on the Bachelor paper and its links to subjects of the curriculum</text:p>
<text:p text:style-name="P5">Presentation and Examination interview on the Bachelor Paper and its links to subjects of the curriculum</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
@@ -434,7 +434,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<table:covered-table-cell/>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.C2" table:number-columns-spanned="5" office:value-type="string">
<text:p text:style-name="P4">Examination interview on the Bachelor paper and its links to </text:p>
<text:p text:style-name="P4">Examination interview on the Bachelor Paper and its links to </text:p>
<text:p text:style-name="P5">
<draw:custom-shape text:anchor-type="char" draw:z-index="5" draw:name="Rechteck 10" draw:style-name="gr1" draw:text-style-name="P22" svg:width="0.4cm" svg:height="0.4cm" svg:x="10.9cm" svg:y="-0.2cm">
<text:p/>
@@ -554,7 +554,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<table:table-row table:style-name="Tabelle1.1">
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
<text:p text:style-name="P10">Assessment of the examination interview based on technical accuracy, completeness, structure and linguistic quality.</text:p>
<text:p text:style-name="P10">Passed with highest distinction, Passed with distinction, Passed, Failed</text:p>
<text:p text:style-name="P10">Passed with distinction, Passed with merit, Passed, Failed</text:p>
</table:table-cell>
</table:table-row>
<table:table-row table:style-name="Tabelle1.1">
system/xsl/PrProtMAEng_0.xsl
+7 -7
View File
@@ -359,7 +359,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle1.1">
<table:table-cell table:style-name="Tabelle1.A2" table:number-columns-spanned="2" office:value-type="string">
<text:p text:style-name="P4">Topic and Assessment of Master's thesis</text:p>
<text:p text:style-name="P4">Topic and Assessment of Master's Thesis</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.B5" table:number-columns-spanned="6" office:value-type="string">
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
<text:p text:style-name="P4">Examination interview on the Master’s thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme</text:p>
<text:p text:style-name="P4">Examination interview on the Master’s Thesis and its links to subjects of the curriculum as well as examination interview on a curricular theme</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
@@ -396,8 +396,8 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.D2" table:number-columns-spanned="7" office:value-type="string">
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="6" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.964cm" svg:y="0.153cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Presentation of the Master's thesis</text:p>
<text:p text:style-name="P14">Examination interview on the Master's thesis <text:span text:style-name="T1">and its links</text:span></text:p>
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="6" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.964cm" svg:y="0.153cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Presentation of the Master's Thesis</text:p>
<text:p text:style-name="P14">Examination interview on the Master's Thesis <text:span text:style-name="T1">and its links</text:span></text:p>
<text:p text:style-name="P4"><draw:custom-shape text:anchor-type="char" draw:z-index="4" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.982cm" svg:y="-0.046cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>to subjects of the curriculum</text:p>
<text:p text:style-name="P14"><draw:custom-shape text:anchor-type="char" draw:z-index="5" draw:name="Rechteck 1" draw:style-name="gr1" draw:text-style-name="P21" svg:width="0.336cm" svg:height="0.359cm" svg:x="10.986cm" svg:y="-0.019cm"><text:p/><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0 0 Z N"/></draw:custom-shape>Examination interview on other subjects relevant to the curriculum</text:p>
</table:table-cell>
@@ -410,7 +410,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle1.1">
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="9" office:value-type="string">
<text:p text:style-name="P4">Notes on the presentation of the Master's thesis</text:p>
<text:p text:style-name="P4">Notes on the presentation of the Master's Thesis</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
@@ -538,10 +538,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.D2" table:number-columns-spanned="5" office:value-type="string">
<text:p text:style-name="P4">
(+++) Passed with highest distinction
(+++) Passed with distinction
</text:p>
<text:p text:style-name="P4">
(++) Passt with distinction
(++) Passed with merit
</text:p>
<text:p text:style-name="P4">
(+) Passed
system/xsl/PrProtMA_0.xsl
+1 -1
View File
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
<text:p text:style-name="P4">Prüfungsgespräch über Masterarbeit und Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über Stoffgebiet</text:p>
<text:p text:style-name="P4">Prüfungsgespräch über die Masterarbeit und deren Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über das Stoffgebiet</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
system/xsl/PrProtMA_Lehrgaenge.xsl
+1 -1
View File
@@ -381,7 +381,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:covered-table-cell/>
<table:table-cell table:style-name="Tabelle1.A1" table:number-columns-spanned="7" office:value-type="string">
<text:p text:style-name="P4">Prüfungsgespräch über Masterarbeit und Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über Stoffgebiet</text:p>
<text:p text:style-name="P4">Prüfungsgespräch über die Masterarbeit und deren Querverbindungen zu Fächern des Studienplans sowie Prüfungsgespräch über das Stoffgebiet</text:p>
</table:table-cell>
<table:covered-table-cell/>
<table:covered-table-cell/>
system/xsl/bakkzeugnisEng_0.xsl
+1 -1
View File
@@ -369,7 +369,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P9"/>
<text:p text:style-name="P9"/>
<text:p text:style-name="P10"/>
<text:p text:style-name="P10">Final assessment: Passed with highest distinction, Passed with distinction, Passed</text:p>
<text:p text:style-name="P10">Final assessment: Passed with distinction, Passed with merit, Passed</text:p>
<text:p text:style-name="P10">Pursuant to section 6 subsection 1 of the University of Applied Sciences Studies Act (FHStG), BGBI. Nr. <xsl:value-of select="bescheidbgbl1" /> idgF</text:p>
<text:p text:style-name="P18"/>
<text:p text:style-name="P18"/>
system/xsl/diplomaSupp_-12_v1.xsl
-1867
View File
File diff suppressed because it is too large Load Diff
system/xsl/diplomaSupp_-5.xsl
-1867
View File
File diff suppressed because it is too large Load Diff
system/xsl/diplomaSupp_0.xsl
+1 -1
View File
@@ -2784,7 +2784,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
</table:table>
<text:p text:style-name="P15"/>
<text:p text:style-name="P23">Grading Scheme: Passed with highest distinction, Passed with distinction, Passed</text:p>
<text:p text:style-name="P23">Grading Scheme: Passed with distinction, Passed with merit, Passed</text:p>
<text:p text:style-name="P22"/>
<text:p text:style-name="P22">
<draw:frame xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" draw:style-name="fr4" draw:name="graphics5" text:anchor-type="char" svg:x="4.50cm" svg:y="0.1cm" svg:width="3.5cm" svg:height="3.5cm" draw:z-index="16" >
system/xsl/diplomaSupp_Lehrgaenge.xsl
+1 -1
View File
@@ -2814,7 +2814,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
</table:table-row>
</table:table>
<text:p text:style-name="P15"/>
<text:p text:style-name="P23">Grading Scheme: Passed with highest distinction, Passed with distinction, Passed</text:p>
<text:p text:style-name="P23">Grading Scheme: Passed with distinction, Passed with merit, Passed</text:p>
<text:p text:style-name="P22"/>
</xsl:if>
<text:p text:style-name="P22">
system/xsl/diplomzeugnisEng_0.xsl
+1 -1
View File
@@ -393,7 +393,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P9"/>
<text:p text:style-name="P9"/>
<text:p text:style-name="P10"/>
<text:p text:style-name="P10">Final assessment: Passed with highest distinction, Passed with distinction, Passed</text:p>
<text:p text:style-name="P10">Final assessment: Passed with distinction, Passed with merit, Passed</text:p>
<text:p text:style-name="P10">Pursuant to section 6 subsection 1 of the University of Applied Sciences Studies Act (FHStG), BGBI. Nr. <xsl:value-of select="bescheidbgbl1" /> idgF</text:p>
<text:p text:style-name="P18"/>
<text:p text:style-name="P18"/>
vilesci/lehre/lehrveranstaltung_details.php
+16
View File
@@ -475,6 +475,22 @@
$htmlstr.= $row->studiensemester_kurzbz.'; ';
}
}
$htmlstr.='<br><b>Verwendung in folgenden Studienplänen</b>: ';
$qry ="SELECT distinct tbl_studienplan.bezeichnung
FROM
lehre.tbl_studienplan_lehrveranstaltung
JOIN lehre.tbl_studienplan USING(studienplan_id)
WHERE lehrveranstaltung_id=".$db->db_add_param($lv->lehrveranstaltung_id).'
ORDER BY tbl_studienplan.bezeichnung desc';
if($result = $db->db_query($qry))
{
while($row = $db->db_fetch_object($result))
{
$htmlstr.= $row->bezeichnung.'; ';
}
}
$htmlstr.='</span>';
// Details Ende
}
vilesci/personen/incoming_lehrveranstaltungen.php
+424 -169
View File
@@ -52,6 +52,12 @@ $stsem->getNextStudiensemester();
$stg = new studiengang();
$stg->getAll();
$message = '';
$filter_url = '';
if (isset($_GET['filter']) || isset($_GET['unterrichtssprache']) || isset($_GET['studiengang']))
$filter_url = 'filter='.$_GET['filter'].'&unterrichtssprache='.$_GET['unterrichtssprache'].'&studiengang='.$_GET['studiengang'].'&go=Filter&';
?>
<html>
<head>
@@ -66,14 +72,20 @@ $stg->getAll();
$(document).ready(function()
{
$("#t1").tablesorter(
{
sortList: [[0,0],[2,0],[3,0],[4,0]],
widgets: ["zebra"]
});
{
sortList: [[1,0],[3,0],[4,0],[5,0]],
widgets: ["zebra"],
headers: {10: {sorter: false}, 11: {sorter: false}}
});
$("#t2").tablesorter(
{
sortList: [[0,0],[1,0]],
widgets: ["zebra"]
});
});
function conf(val1)
{
return confirm("Incomingplätze von '"+val1+"' auf 0 setzen?");
return confirm("Incomingplätze der LV '"+val1+"' auf 0 setzen?");
}
</script>
@@ -96,88 +108,101 @@ if($method=="lehrveranstaltungen")
$lehrveranstaltung->incoming = 0;
if($lehrveranstaltung->save())
echo $p->t('global/erfolgreichgespeichert');
$message = $p->t('global/erfolgreichgespeichert');
else
echo $p->t('global/fehleraufgetreten');
$message = $p->t('global/fehleraufgetreten');
}
// Übersicht aller LVs
echo '<h2>Lehrveranstaltungs-Verwaltung</h2>';
echo '
<form name="filterSemester">
<table border="0">
<tr>
<td>'.$p->t('incoming/filter').':
<SELECT name="filterLv" onchange=selectChange()>
<option value="allSemester">'.$p->t('incoming/alleSemester').'</option>';
// Vorauswahl der Übergebenen Filter
$WSemesterSelected = '';
$SSemesterSelected = '';
if(isset($_GET['filter']))
if($_GET['filter'] == 'WSemester')
$WSemesterSelected ='selected';
elseif($_GET['filter']=='SSemester')
$SSemesterSelected='selected';
echo '<option value="WSemester" '.$WSemesterSelected.'>'.$p->t('incoming/wintersemester').'</option>';
<form name="filterSemester" action="'.$_SERVER['PHP_SELF'].'" method="GET">
<table width="90%" border="0" align="center">
<tr>
<td>'.$p->t('incoming/studentenImWS').'</td>
</tr>
<tr>
<td>'.$p->t('incoming/studentenImSS').'</td>
</tr>
<tr>
<td>'.$p->t('incoming/filter').':
<SELECT name="filter">
<option value="allSemester">'.$p->t('incoming/alleSemester').'</option>';
echo '<option value="SSemester" '.$SSemesterSelected.'>'.$p->t('incoming/sommersemester').'</option>';
// Vorauswahl der Übergebenen Filter
$WSemesterSelected = '';
$SSemesterSelected = '';
echo'</SELECT><br>';
echo $p->t('courseInformation/unterrichtssprache').':<SELECT name="filterUnterrichtssprache" onchange=selectChange()>
<option value="">'.$p->t('incoming/alleSprachen').'</option>';
// Vorauswahl der Übergebenen Filter
$GermanSelected = '';
$EnglishSelected = '';
if(isset($_GET['unterrichtssprache']))
if($_GET['unterrichtssprache'] == 'German')
$GermanSelected ='selected';
elseif($_GET['unterrichtssprache']=='English')
$EnglishSelected='selected';
echo '<option value="German" '.$GermanSelected.'>German</option>';
echo '<option value="English" '.$EnglishSelected.'>English</option>';
echo'</SELECT><br>';
echo $p->t('global/studiengang').':<SELECT name="filterStudiengang" onchange=selectChange()>
<option value="">Alle Studiengänge</option>';
// Vorauswahl der Übergebenen Filter
$studiengang = new studiengang();
$studiengang->getAll('typ,kurzbz', true);
foreach ($studiengang->result as $row)
if(isset($_GET['filter']))
if($_GET['filter'] == 'WSemester')
$WSemesterSelected ='selected';
elseif($_GET['filter']=='SSemester')
$SSemesterSelected='selected';
echo '<option value="WSemester" '.$WSemesterSelected.'>'.$p->t('incoming/wintersemester').'</option>';
echo '<option value="SSemester" '.$SSemesterSelected.'>'.$p->t('incoming/sommersemester').'</option>';
echo'</SELECT><br>';
echo $p->t('courseInformation/unterrichtssprache').':<SELECT name="unterrichtssprache">
<option value="">'.$p->t('incoming/alleSprachen').'</option>';
// Vorauswahl der Übergebenen Filter
$GermanSelected = '';
$EnglishSelected = '';
if(isset($_GET['unterrichtssprache']))
if($_GET['unterrichtssprache'] == 'German')
$GermanSelected ='selected';
elseif($_GET['unterrichtssprache']=='English')
$EnglishSelected='selected';
echo '<option value="German" '.$GermanSelected.'>'.$p->t("global/deutsch").'</option>';
echo '<option value="English" '.$EnglishSelected.'>'.$p->t("global/englisch").'</option>';
echo'</SELECT><br>';
echo $p->t('global/studiengang').':<SELECT name="studiengang">
<option value="">'.$p->t('incoming/alleStudiengaenge').'</option>';
// Vorauswahl der Übergebenen Filter
$studiengang = new studiengang();
$studiengang->getAll('typ,kurzbz', true);
$type = array('b' => 'Bachelor', 'm' => 'Master', 'e' => 'Other');
$typ = '';
foreach ($studiengang->result as $row)
{
//Nur Bachelor, Master und CIR-Studiengang
if ($row->typ == 'b' || $row->typ == 'm' || $row->studiengang_kz == '10006')
{
$selected = '';
if ($typ != $row->typ || $typ=='')
{
if ($typ!='')
echo '</optgroup>';
echo '<optgroup label="'.$type[$row->typ].'">';
}
if(isset($_GET['studiengang']) && $_GET['studiengang'] == $row->studiengang_kz)
$selected='selected';
echo '<option value="'.$row->studiengang_kz.'" '.$selected.'>'.strtoupper($row->typ.$row->kurzbz).' - '.$row->bezeichnung.'</option>';
$studiengang_language = ($sprache == 'German') ? $row->bezeichnung : $row->english;
echo '<option value="'.$row->studiengang_kz.'" '.$selected.'>'.strtoupper($row->typ.$row->kurzbz).' - '.$studiengang_language.'</option>';
$typ = $row->typ;
}
echo'</SELECT>';
echo '</td>
</tr>
</table>
<script language="JavaScript">
function selectChange()
{
filter = document.filterSemester.filterLv.options[document.filterSemester.filterLv.selectedIndex].value;
filterSprache = document.filterSemester.filterUnterrichtssprache.options[document.filterSemester.filterUnterrichtssprache.selectedIndex].value;
filterStudiengang = document.filterSemester.filterStudiengang.options[document.filterSemester.filterStudiengang.selectedIndex].value;
url = [location.protocol, "//", location.host, location.pathname].join("");
url = url+"?method=lehrveranstaltungen&filter="+filter+"&unterrichtssprache="+filterSprache+"&studiengang="+filterStudiengang;
document.location=url;
}
</script>
}
echo'</SELECT><br><br>';
echo '<input type="hidden" name="method" value="lehrveranstaltungen">';
//echo '<input type="hidden" >';
echo '<input type="submit" name="go" value="Filter">';
echo '</td>
</tr>
</table>
</form>';
// Filter für Semester setzen
@@ -192,114 +217,344 @@ if($method=="lehrveranstaltungen")
if(isset($_GET['unterrichtssprache']) && $_GET['unterrichtssprache']!='')
$filterqry .= " AND tbl_lehrveranstaltung.sprache='".$_GET['unterrichtssprache']."'";
//Uebersicht LVs
$qry = "SELECT
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.ects,
tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
tbl_lehrveranstaltung.bezeichnung_english, tbl_lehrveranstaltung.incoming, tbl_lehrveranstaltung.orgform_kurzbz,
(
Select count(*)
FROM (
SELECT
person_id
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer using(uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
/* Erklaerung der Datumszeitraeume ab Zeile 857:
* |=============== Studiensemester ===============|
* |--------------| Incoming beginnt vor SS-Beginn und endet VOR SS-Ende jedoch ueberwiegend innerhalb SS
* |--------------| Incoming beginnt VOR SS-Ende und endet NACH SS-Ende, jedoch ueberwiegend innerhalb SS
* |----------| Incoming beginnt vor SS-Beginn und endet VOR SS-Ende jedoch ueberwiegend außerhalb SS
* |---------| Incoming beginnt VOR SS-Ende und endet NACH SS-Ende, jedoch ueberwiegend außerhalb SS
* |------------------------------| Incoming ist innerhalb oder GENAU SS da
* |------------------------------------------------------| Incoming ist VOR SS-Anfang und NACH SS-Ende da, jedoch ueberwiegend ueberlappend mit SS
* ------------------------------------------------------------ Von und Bis ist NULL
* -------------------| Von ist NULL und bis innerhalb SS
* |--------------------------- Bis ist NULL und von innerhalb SS
*/
$studiensemester_array = array();
$studiensemester = new studiensemester();
$studiensemester_array[] = $studiensemester->getakt();
$studiensemester->getFutureStudiensemester('',2);
foreach ($studiensemester->studiensemester AS $row)
$studiensemester_array[] = $row->studiensemester_kurzbz;
if(isset($_GET['go']))
{
// QUERY liefert LVs aus den gültigen Studienordnungen UND jene mit Anmeldungen, auch wenn Incomingplätze 0 sind oder die LV in keinem gültigen Studienplan liegt
$qry = "SELECT
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.ects,
tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
tbl_lehrveranstaltung.bezeichnung_english, tbl_lehrveranstaltung.incoming, tbl_lehrveranstaltung.orgform_kurzbz,
(
Select count(*)
FROM (
SELECT
person_id
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer using(uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
WHERE
lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
lehreinheit_id in (SELECT lehreinheit_id FROM lehre.tbl_lehreinheit
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
tbl_lehreinheit.studiensemester_kurzbz='$stsem->studiensemester_kurzbz')
AND
tbl_prestudentstatus.status_kurzbz='Incoming'
AND tbl_prestudentstatus.studiensemester_kurzbz='$stsem->studiensemester_kurzbz'
UNION
SELECT
person_id
FROM
public.tbl_preincoming_lehrveranstaltung
JOIN public.tbl_preincoming using(preincoming_id)
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
(
(bis - '$stsem->start' > '$stsem->start' - von) OR
('$stsem->start' <= von AND bis >= '$stsem->ende' AND '$stsem->ende' - von > bis - '$stsem->ende') OR
(bis <= '$stsem->ende' AND bis >= '$stsem->start' AND von < '$stsem->start') OR
('$stsem->start' <= von AND von < '$stsem->ende' AND bis > '$stsem->ende') OR
(von >= '$stsem->start' AND bis <= '$stsem->ende') OR
(von <= '$stsem->start' AND bis >= '$stsem->ende') OR
(von IS NULL AND bis IS NULL) OR
(von IS NULL AND bis <= '$stsem->ende' AND bis > '$stsem->start') OR
(bis IS NULL AND von < '$stsem->ende' AND von >= '$stsem->start')
)
AND aktiv = true
)a ) as anzahl
FROM
lehre.tbl_lehrveranstaltung
JOIN
public.tbl_studiengang USING(studiengang_kz)
WHERE
lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
lehreinheit_id in (SELECT lehreinheit_id FROM lehre.tbl_lehreinheit
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
tbl_lehreinheit.studiensemester_kurzbz='$stsem->studiensemester_kurzbz')
AND
tbl_prestudentstatus.status_kurzbz='Incoming'
AND tbl_prestudentstatus.studiensemester_kurzbz='$stsem->studiensemester_kurzbz'
tbl_lehrveranstaltung.incoming>0 AND
tbl_lehrveranstaltung.aktiv AND
tbl_lehrveranstaltung.lehre AND
tbl_lehrveranstaltung.lehrveranstaltung_id IN
(
SELECT lehrveranstaltung_id FROM lehre.tbl_studienplan_lehrveranstaltung
JOIN lehre.tbl_studienplan USING (studienplan_id)
JOIN lehre.tbl_studienordnung USING (studienordnung_id)
JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
WHERE tbl_studienordnung.status_kurzbz='approved'
AND tbl_lehrveranstaltung.lehrveranstaltung_id=tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id
AND tbl_studienplan_semester.studiensemester_kurzbz IN ('".implode("','", $studiensemester_array)."')
AND tbl_studienplan_semester.semester=tbl_lehrveranstaltung.semester
)
AND ((tbl_lehrveranstaltung.studiengang_kz>0 AND tbl_lehrveranstaltung.studiengang_kz<10000) OR tbl_lehrveranstaltung.studiengang_kz=10006)";
if (isset($_GET['studiengang']) && $_GET['studiengang'] !='')
$qry .= " AND tbl_lehrveranstaltung.studiengang_kz=".$_GET['studiengang'];
$qry .= " AND tbl_studiengang.aktiv ".$filterqry;
$qry .= "
UNION
SELECT
person_id
FROM
public.tbl_preincoming_lehrveranstaltung
JOIN public.tbl_preincoming using(preincoming_id)
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
(von is null OR von <= '$stsem->start')
AND
(bis is null OR bis >= (DATE '$stsem->ende'))
AND aktiv = true
)a ) as anzahl
FROM
lehre.tbl_lehrveranstaltung JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE
/*tbl_lehrveranstaltung.incoming>0 AND*/
tbl_lehrveranstaltung.aktiv AND
tbl_lehrveranstaltung.lehre
AND tbl_lehrveranstaltung.studiengang_kz>0 AND tbl_lehrveranstaltung.studiengang_kz<10000";
if (isset($_GET['studiengang']) && $_GET['studiengang'] !='')
$qry .= "AND tbl_lehrveranstaltung.studiengang_kz=".$_GET['studiengang'];
$qry .= "AND tbl_studiengang.aktiv ".$filterqry." order by studiengang_kz
";
echo '<table class="tablesorter" id="t1" width="90%" border="0" align="center">
SELECT
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.ects,
tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
tbl_lehrveranstaltung.bezeichnung_english, tbl_lehrveranstaltung.incoming, tbl_lehrveranstaltung.orgform_kurzbz,
(
Select count(*)
FROM (
SELECT
person_id
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer using(uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
WHERE
lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
lehreinheit_id in (SELECT lehreinheit_id FROM lehre.tbl_lehreinheit
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
tbl_lehreinheit.studiensemester_kurzbz='$stsem->studiensemester_kurzbz')
AND
tbl_prestudentstatus.status_kurzbz='Incoming'
AND tbl_prestudentstatus.studiensemester_kurzbz='$stsem->studiensemester_kurzbz'
UNION
SELECT
person_id
FROM
public.tbl_preincoming_lehrveranstaltung
JOIN public.tbl_preincoming using(preincoming_id)
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND
(
(bis - '$stsem->start' > '$stsem->start' - von) OR
('$stsem->start' <= von AND bis >= '$stsem->ende' AND '$stsem->ende' - von > bis - '$stsem->ende') OR
(bis <= '$stsem->ende' AND bis >= '$stsem->start' AND von < '$stsem->start') OR
('$stsem->start' <= von AND von < '$stsem->ende' AND bis > '$stsem->ende') OR
(von >= '$stsem->start' AND bis <= '$stsem->ende') OR
(von <= '$stsem->start' AND bis >= '$stsem->ende') OR
(von IS NULL AND bis IS NULL) OR
(von IS NULL AND bis <= '$stsem->ende' AND bis > '$stsem->start') OR
(bis IS NULL AND von < '$stsem->ende' AND von >= '$stsem->start')
)
AND aktiv = true
)a ) as anzahl
FROM
public.tbl_preincoming_lehrveranstaltung
JOIN public.tbl_preincoming using(preincoming_id)
JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE
(
(bis - '$stsem->start' > '$stsem->start' - von) OR
('$stsem->start' <= von AND bis >= '$stsem->ende' AND '$stsem->ende' - von > bis - '$stsem->ende') OR
(bis <= '$stsem->ende' AND bis >= '$stsem->start' AND von < '$stsem->start') OR
('$stsem->start' <= von AND von < '$stsem->ende' AND bis > '$stsem->ende') OR
(von >= '$stsem->start' AND bis <= '$stsem->ende') OR
(von <= '$stsem->start' AND bis >= '$stsem->ende') OR
(von IS NULL AND bis IS NULL) OR
(von IS NULL AND bis <= '$stsem->ende' AND bis > '$stsem->start') OR
(bis IS NULL AND von < '$stsem->ende' AND von >= '$stsem->start')
)
AND tbl_preincoming.aktiv = true
";
if (isset($_GET['studiengang']) && $_GET['studiengang'] !='')
$qry .= " AND tbl_lehrveranstaltung.studiengang_kz=".$_GET['studiengang'];
$qry .= " AND tbl_studiengang.aktiv ".$filterqry." order by studiengang_kz";
if($result = $db->db_query($qry))
{
if ($db->db_num_rows($result)>0)
{
echo '<center>'.$message.'</center>';
echo '<p style="padding-left: 10px; padding-right: 10px;">'.$p->t('incoming/tabelleSortierinformation').'</p>';
echo '<table class="tablesorter" id="t1" width="90%" style="padding-left: 10px; padding-right: 10px;" border="0" align="center">
<thead align="center">
<tr>
<th>LV-ID</th>
<th>'.$p->t('global/studiengang').'</th>
<th>'.$p->t('abgabetool/typ').'</th>
<th>'.$p->t('incoming/orgform').'</th>
<th>'.$p->t('global/semester').'</th>
<th>'.$p->t('global/lehrveranstaltung').'</th>
<th>'.$p->t('global/lehrveranstaltung').' '.$p->t('global/englisch').'</th>
<th>'.$p->t('incoming/ects').'</th>
<th>'.$p->t('courseInformation/unterrichtssprache').'</th>
<th>'.$p->t('incoming/lvInfo').'</th>
<th>'.$p->t('incoming/freieplätze').'</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>';
while($row = $db->db_fetch_object($result))
{
$freieplaetze = $row->incoming - $row->anzahl;
$style = '';
$studiengang = new studiengang();
$studiengang->load($row->studiengang_kz);
$studiengang_language = ($sprache == 'German') ? $studiengang->bezeichnung : $studiengang->english;
$typ = $studiengang->typ;
if ($studiengang->typ == 'b')
$typ = 'Bachelor';
else if ($studiengang->typ == 'm')
$typ = 'Master';
else
$typ = '-';
echo '<tr>';
if ($freieplaetze<=0)
$style = 'style="background-color: #FF8888"';
echo '<td '.$style.'>',$row->lehrveranstaltung_id,'</td>';
echo '<td '.$style.'>',$studiengang_language,'</td>';
echo '<td '.$style.'>',$typ,'</td>';
echo '<td '.$style.'>',$row->orgform_kurzbz,'</td>';
echo '<td '.$style.'>',$row->semester,'</td>';
echo '<td '.$style.'>',$row->bezeichnung,'</td>';
echo '<td '.$style.'>',$row->bezeichnung_english,'</td>';
echo '<td '.$style.'>',$row->ects,'</td>';
echo '<td '.$style.'>',($row->sprache=='German'?$p->t("global/deutsch"):$p->t("global/englisch")),'</td>';
echo '<td '.$style.'>
<a href="#Deutsch" class="Item" onclick="javascript:window.open(\'../../addons/lvinfo/cis/view.php?lehrveranstaltung_id='.$row->lehrveranstaltung_id.'&amp;sprache=German\',\'Lehrveranstaltungsinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">'.$p->t("global/deutsch").'&nbsp;</a>
<a href="#Englisch" class="Item" onclick="javascript:window.open(\'../../addons/lvinfo/cis/view.php?lehrveranstaltung_id='.$row->lehrveranstaltung_id.'&amp;sprache=English\',\'Courseinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">'.$p->t("global/englisch").'</a>
</td>';
echo '<td '.$style.'>',($freieplaetze<$row->incoming?'<strong>'.$freieplaetze.' ('.$p->t('incoming/von').' '.$row->incoming.')</strong>':$freieplaetze.' ('.$p->t('incoming/von').' '.$row->incoming.')').'</td>';
echo '<td '.$style.'><a href="#Teilnehmer" class="Item" onclick="javascript:window.open(\'incoming_lehrveranstaltungen.php?method=anmeldungen&amp;id='.$row->lehrveranstaltung_id.'&amp;'.$filter_url.'\',\'Anmeldungen\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">Anmeldungen</a></td>';
echo '<td '.$style.'><a href="incoming_lehrveranstaltungen.php?method=lehrveranstaltungen&mode=setZero&id='.$row->lehrveranstaltung_id.'&'.$filter_url.'" onclick="return conf(\''.$row->bezeichnung.'\')">Incomingplätze auf 0</a></td>';
echo '</tr>';
}
echo '</tbody></table>';
}
else
echo '<center><b>'.$p->t('incoming/derzeitKeineLehrveranstaltungen').'</b></center>';
}
}
else
echo '<center><b>'.$p->t('incoming/waehlenSieAusDenOptionen').'</b></center>';
echo '</tbody></table>';
}
elseif($method=="anmeldungen")
{
// Übersicht aller LVs
echo '<h2>Übersicht Anmeldungen</h2>';
// Filter für Semester setzen
//Uebersicht LVs
/* Erklaerung der Datumszeitraeume
* |=============== Studiensemester ===============|
* |--------------| Incoming beginnt vor SS-Beginn und endet VOR SS-Ende jedoch ueberwiegend innerhalb SS
* |--------------| Incoming beginnt VOR SS-Ende und endet NACH SS-Ende, jedoch ueberwiegend innerhalb SS
* |----------| Incoming beginnt vor SS-Beginn und endet VOR SS-Ende jedoch ueberwiegend außerhalb SS
* |---------| Incoming beginnt VOR SS-Ende und endet NACH SS-Ende, jedoch ueberwiegend außerhalb SS
* |------------------------------| Incoming ist innerhalb oder GENAU SS da
* |------------------------------------------------------| Incoming ist VOR SS-Anfang und NACH SS-Ende da, jedoch ueberwiegend ueberlappend mit SS
* ------------------------------------------------------------ Von und Bis ist NULL
* -------------------| Von ist NULL und bis innerhalb SS
* |--------------------------- Bis ist NULL und von innerhalb SS
*/
if (isset($_GET['id']))
{
$id = $db->db_add_param($_GET['id'], FHC_INTEGER, false);
$qry = " SELECT
nachname, vorname
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer using(uid)
JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
JOIN public.tbl_person USING(person_id)
WHERE
lehrveranstaltung_id=".$id."
AND
lehreinheit_id in (SELECT lehreinheit_id FROM lehre.tbl_lehreinheit
WHERE lehrveranstaltung_id=".$id."
AND
tbl_lehreinheit.studiensemester_kurzbz='$stsem->studiensemester_kurzbz')
AND
tbl_prestudentstatus.status_kurzbz='Incoming'
AND tbl_prestudentstatus.studiensemester_kurzbz='$stsem->studiensemester_kurzbz'
UNION
SELECT
nachname, vorname
FROM
public.tbl_preincoming_lehrveranstaltung
JOIN public.tbl_preincoming using(preincoming_id)
JOIN public.tbl_person USING(person_id)
WHERE lehrveranstaltung_id=".$id."
AND
(
(bis - '$stsem->start' > '$stsem->start' - von) OR
('$stsem->start' <= von AND bis >= '$stsem->ende' AND '$stsem->ende' - von > bis - '$stsem->ende') OR
(bis <= '$stsem->ende' AND bis >= '$stsem->start' AND von < '$stsem->start') OR
('$stsem->start' <= von AND von < '$stsem->ende' AND bis > '$stsem->ende') OR
(von >= '$stsem->start' AND bis <= '$stsem->ende') OR
(von <= '$stsem->start' AND bis >= '$stsem->ende') OR
(von IS NULL AND bis IS NULL) OR
(von IS NULL AND bis <= '$stsem->ende' AND bis > '$stsem->start') OR
(bis IS NULL AND von < '$stsem->ende' AND von >= '$stsem->start')
)
AND tbl_preincoming.aktiv = true";
if($result = $db->db_query($qry))
{
if ($db->db_num_rows($result)>0)
{
echo '<table class="tablesorter" id="t2" width="90%" style="padding-left: 10px; padding-right: 10px;" border="0" align="center">
<thead align="center">
<tr>
<th>'.$p->t('global/studiengang').'</th>
<th>'.$p->t('abgabetool/typ').'</th>
<th>'.$p->t('incoming/orgform').'</th>
<th>'.$p->t('global/semester').'</th>
<th>'.$p->t('global/lehrveranstaltung').'</th>
<th>'.$p->t('global/lehrveranstaltung').' '.$p->t('global/englisch').'</th>
<th>'.$p->t('incoming/ects').'</th>
<th>'.$p->t('courseInformation/unterrichtssprache').'</th>
<th>Info</th>
<th>'.$p->t('incoming/freieplätze').'</th>
<th></th>
<th>'.$p->t('global/nachname').'</th>
<th>'.$p->t('global/vorname').'</th>
</tr>
</thead>
<tbody>';
if($result = $db->db_query($qry))
{
while($row = $db->db_fetch_object($result))
{
$freieplaetze = $row->incoming - $row->anzahl;
$studiengang = new studiengang();
$studiengang->load($row->studiengang_kz);
$studiengang_language = ($sprache == 'German') ? $studiengang->bezeichnung : $studiengang->english;
$typ = $studiengang->typ;
$style='';
if ($row->incoming=='0')
$style = 'style="color:grey"';
if ($studiengang->typ == 'b')
$typ = 'BA';
else if ($studiengang->typ == 'm')
$typ = 'MA';
echo '<tr>';
echo '<td '.$style.'>',$studiengang_language,'</td>';
echo '<td '.$style.'>',$typ,'</td>';
echo '<td '.$style.'>',$row->orgform_kurzbz,'</td>';
echo '<td '.$style.'>',$row->semester,'</td>';
echo '<td '.$style.'>',$row->bezeichnung,'</td>';
echo '<td '.$style.'>',$row->bezeichnung_english,'</td>';
echo '<td '.$style.'>',$row->ects,'</td>';
echo '<td '.$style.'>',$row->sprache,'</td>';
echo '<td '.$style.'>
<a href="#Deutsch" class="Item" onclick="javascript:window.open(\'../../cis/private/lehre/ects/preview.php?lv='.$row->lehrveranstaltung_id.'&amp;language=de\',\'Lehrveranstaltungsinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">Deutsch&nbsp;</a>
<a href="#Englisch" class="Item" onclick="javascript:window.open(\'../../cis/private/lehre/ects/preview.php?lv='.$row->lehrveranstaltung_id.'&amp;language=en\',\'Lehrveranstaltungsinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">Englisch</a>
</td>';
echo '<td '.$style.'>',($freieplaetze<$row->incoming?'<strong>'.$freieplaetze.'/'.$row->incoming.'</strong>':$freieplaetze.'/'.$row->incoming),'</td>';
echo '<td><a href="incoming_lehrveranstaltungen.php?method=lehrveranstaltungen&mode=setZero&id='.$row->lehrveranstaltung_id.'" onclick="return conf(\''.$row->bezeichnung.'\')">Plätze auf 0 setzen</a></td>';
echo '</tr>';
while($row = $db->db_fetch_object($result))
{
echo '<tr>';
echo '<td>',$row->nachname,'</td>';
echo '<td>',$row->vorname,'</td>';
echo '</tr>';
}
echo '</tbody></table>';
}
else
echo '<center><b>Keine Anmeldungen gefunden</b></center>';
}
echo '</tbody></table>';
}
else
'<center><b>Es wurde keine Lehrveranstaltungs-ID übergeben</b></center>';
}
?>
</body>
</html>