mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 08:22:17 +00:00
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
This commit is contained in:
kindlm
@@ -446,6 +446,34 @@ function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, t
|
||||
});
|
||||
$("#studienverpflichtung").html(html);
|
||||
});
|
||||
|
||||
$.ajax({
|
||||
dataType: 'json',
|
||||
url: "./pruefungsanmeldung.json.php",
|
||||
type: "POST",
|
||||
data: {
|
||||
method: "getPrestudenten"
|
||||
},
|
||||
error: loadError
|
||||
}).success(function(data)
|
||||
{
|
||||
if(data.error !== false)
|
||||
{
|
||||
var html = "<select id='prestudent_studiengang' name='studiengang'>";
|
||||
//show if more than 1 active prestudent exists
|
||||
if(data.result.length > 1)
|
||||
{
|
||||
data.result.forEach(function(v,i){
|
||||
html += "<option value='"+v.studiengang_kz+"'>"+v.kuerzel+"</option>";
|
||||
});
|
||||
}
|
||||
html += "</select>";
|
||||
|
||||
console.log(html);
|
||||
|
||||
$("#studiengang").html("<td style='vertical-align: top; font-weight: bold;'><?php echo $p->t('pruefung/AnrechnungInStudiengang'); ?>:</td><td>"+html+"</td>");
|
||||
}
|
||||
});
|
||||
|
||||
var start = terminVon;
|
||||
var ende = terminBis;
|
||||
@@ -487,6 +515,10 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
|
||||
var studienverpflichtung_id = null;
|
||||
if($("#studienverpflichtung").length)
|
||||
studienverpflichtung_id = $("#studienverpflichtung option:selected").val();
|
||||
|
||||
var studiengang_kz = null;
|
||||
if($('#prestudent_studiengang').length)
|
||||
studiengang_kz = $('#prestudent_studiengang option:selected').val();
|
||||
|
||||
$.ajax({
|
||||
dataType: 'json',
|
||||
@@ -498,7 +530,8 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
|
||||
lehrveranstaltung_id: lehrveranstaltung_id,
|
||||
bemerkung: bemerkungen,
|
||||
uid: uid,
|
||||
studienverpflichtung_id: studienverpflichtung_id
|
||||
studienverpflichtung_id: studienverpflichtung_id,
|
||||
studiengang_kz: studiengang_kz
|
||||
},
|
||||
error: loadError
|
||||
}).success(function(data){
|
||||
|
||||
@@ -491,6 +491,32 @@ function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, t
|
||||
$("#studienverpflichtung").html(html);
|
||||
});
|
||||
|
||||
$.ajax({
|
||||
dataType: 'json',
|
||||
url: "./pruefungsanmeldung.json.php",
|
||||
type: "POST",
|
||||
data: {
|
||||
method: "getPrestudenten"
|
||||
},
|
||||
error: loadError
|
||||
}).success(function(data)
|
||||
{
|
||||
if(data.error !== false)
|
||||
{
|
||||
//show if more than 1 active prestudent exists
|
||||
if(data.result.length > 1)
|
||||
{
|
||||
var html = "<select id='prestudent_studiengang' name='studiengang'>";
|
||||
data.result.forEach(function(v,i){
|
||||
html += "<option value='"+v.studiengang_kz+"'>"+v.kuerzel+"</option>";
|
||||
});
|
||||
html += "</select>";
|
||||
|
||||
$("#studiengang").html("<td style='vertical-align: top; font-weight: bold;'><?php echo $p->t('pruefung/AnrechnungInStudiengang'); ?>:</td><td>"+html+"</td>");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
var start = terminVon;
|
||||
var ende = terminBis;
|
||||
start = start.split(' ');
|
||||
@@ -532,6 +558,10 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
|
||||
if($("#studienverpflichtung").length)
|
||||
studienverpflichtung_id = $("#studienverpflichtung option:selected").val();
|
||||
|
||||
var studiengang_kz = null;
|
||||
if($('#prestudent_studiengang').length)
|
||||
studiengang_kz = $('#prestudent_studiengang option:selected').val();
|
||||
|
||||
$.ajax({
|
||||
dataType: 'json',
|
||||
url: "./pruefungsanmeldung.json.php",
|
||||
@@ -542,7 +572,8 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
|
||||
lehrveranstaltung_id: lehrveranstaltung_id,
|
||||
bemerkung: bemerkungen,
|
||||
uid: uid,
|
||||
studienverpflichtung_id: studienverpflichtung_id
|
||||
studienverpflichtung_id: studienverpflichtung_id,
|
||||
studiengang_kz: studiengang_kz
|
||||
},
|
||||
error: loadError
|
||||
}).success(function(data){
|
||||
|
||||
@@ -118,8 +118,11 @@ switch($method)
|
||||
break;
|
||||
case 'getLvKompatibel':
|
||||
$lvid = filter_input(INPUT_POST, "lehrveranstaltung_id");
|
||||
$data = getLvKompatibel($lvid);
|
||||
$data = getLvKompatibel($lvid, $uid);
|
||||
break;
|
||||
case 'getPrestudenten':
|
||||
$data = getPrestudenten($uid, $aktStudiensemester);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -376,6 +379,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
|
||||
$stdsem = $studiensemester->getLastOrAktSemester(0);
|
||||
$lv_besucht = false;
|
||||
$studienverpflichtung_id = filter_input(INPUT_POST, "studienverpflichtung_id");
|
||||
$studiengang_kz = filter_input(INPUT_POST, "studiengang_kz");
|
||||
|
||||
//Defaulteinstellung für Anzahlprüfungsversuche (wird durch Addon "ktu" überschrieben)
|
||||
$maxAnzahlVersuche = 0;
|
||||
@@ -539,7 +543,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
|
||||
|
||||
$konto = new konto();
|
||||
$creditPoints = $konto->getCreditPointsOfStudiensemester($uid, $pruefungsfenster->studiensemester_kurzbz);
|
||||
if(($creditPoints != false))
|
||||
if(($creditPoints !== false))
|
||||
{
|
||||
$cpVerbleibend = $creditPoints - $ects_verwendet;
|
||||
if(($lehrveranstaltung->ects > $cpVerbleibend))
|
||||
@@ -549,7 +553,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
else
|
||||
elseif($konto->errormsg !== null)
|
||||
{
|
||||
$data['error'] = 'true';
|
||||
$data['errormsg'] = 'Fehler beim Laden der Credit Points.';
|
||||
@@ -583,6 +587,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
|
||||
|
||||
$anrechnung = new anrechnung();
|
||||
$lv_komp = new lehrveranstaltung($studienverpflichtung_id);
|
||||
$lehrveranstaltung = new lehrveranstaltung($_REQUEST["lehrveranstaltung_id"]);
|
||||
$person = new person();
|
||||
$person->getPersonFromBenutzer($uid);
|
||||
$prestudent = new prestudent();
|
||||
@@ -592,39 +597,92 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
|
||||
if ($aktStudiensemester)
|
||||
$stdsem = $aktStudiensemester;
|
||||
|
||||
if(count($prestudent->result) > 0)
|
||||
$prestudenten = array();
|
||||
|
||||
foreach ($prestudent->result as $ps)
|
||||
{
|
||||
$prestudent_id = "";
|
||||
foreach($prestudent->result as $ps)
|
||||
{
|
||||
if($ps->getLaststatus($ps->prestudent_id, $stdsem))
|
||||
{
|
||||
if(($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
else
|
||||
{
|
||||
if($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if(($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if(($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
array_push($prestudenten, $ps);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count($prestudenten) > 0)
|
||||
{
|
||||
$prestudent_id = "";
|
||||
if (count($prestudenten) != 1)
|
||||
{
|
||||
foreach ($prestudenten as $ps)
|
||||
{
|
||||
if($ps->studiengang_kz === $studiengang_kz)
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach ($prestudenten as $ps)
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id, $stdsem_lv_besuch))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
$prestudent_id = $ps->prestudent_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($prestudent_id != "")
|
||||
{
|
||||
$anrechungSaveResult = false;
|
||||
@@ -1162,21 +1220,75 @@ function saveRaum($terminId, $ort_kurzbz, $uid)
|
||||
return $data;
|
||||
}
|
||||
|
||||
function getLvKompatibel($lvid)
|
||||
function getLvKompatibel($lvid, $uid)
|
||||
{
|
||||
$lv = new lehrveranstaltung();
|
||||
if($lv->getLVkompatibel($lvid))
|
||||
$person = new person();
|
||||
$person->getPersonFromBenutzer($uid);
|
||||
$prestudent = new prestudent();
|
||||
$prestudent->getPrestudenten($person->person_id);
|
||||
|
||||
$stplIds = array();
|
||||
|
||||
foreach ($prestudent->result as $ps)
|
||||
{
|
||||
$data['result']=$lv->lehrveranstaltungen;
|
||||
$data['error']='false';
|
||||
$data['errormsg']='';
|
||||
if ($ps->getLaststatus($ps->prestudent_id))
|
||||
{
|
||||
if (($ps->status_kurzbz == "Student") || ($ps->status_kurzbz == "Unterbrecher"))
|
||||
{
|
||||
array_push($stplIds, $ps->studienplan_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$lv = new lehrveranstaltung();
|
||||
if($lv->getLVkompatibelTo($lvid, $stplIds))
|
||||
{
|
||||
$data['result']=$lv->lehrveranstaltungen;
|
||||
$data['error']='false';
|
||||
$data['errormsg']='';
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['result']="";
|
||||
$data['error']='true';
|
||||
$data['errormsg']=$lv->errormsg;
|
||||
$data['result']="";
|
||||
$data['error']='true';
|
||||
$data['errormsg']=$lv->errormsg;
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
||||
function getPrestudenten($uid, $aktStudiensemester)
|
||||
{
|
||||
$person = new person();
|
||||
$person->getPersonFromBenutzer($uid);
|
||||
$prestudent = new prestudent();
|
||||
$prestudent->getPrestudenten($person->person_id);
|
||||
$result = array();
|
||||
|
||||
if (count($prestudent->result) > 0)
|
||||
{
|
||||
foreach ($prestudent->result as $key=>$ps)
|
||||
{
|
||||
if ($ps->getLaststatus($ps->prestudent_id))
|
||||
{
|
||||
if(($ps->status_kurzbz === 'Student') || ($ps->status_kurzbz == 'Unterbrecher'))
|
||||
{
|
||||
$studiengang = new studiengang($ps->studiengang_kz);
|
||||
array_push($result, $studiengang);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$data['result']=$result;
|
||||
$data['error']='false';
|
||||
$data['errormsg']='';
|
||||
}
|
||||
else
|
||||
{
|
||||
$data['result']="";
|
||||
$data['error']='true';
|
||||
$data['errormsg']=$lv->errormsg;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -40,6 +40,17 @@ $p = new phrasen($sprache);
|
||||
//TODO
|
||||
$uid = get_uid();
|
||||
|
||||
if(isset($_GET['uid']))
|
||||
{
|
||||
// Administratoren duerfen die UID als Parameter uebergeben um den Studienplan
|
||||
// von anderen Personen anzuzeigen
|
||||
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
if($rechte->isBerechtigt('admin'))
|
||||
$uid=$_GET['uid'];
|
||||
}
|
||||
|
||||
$db = new basis_db();
|
||||
$rechte = new benutzerberechtigung();
|
||||
$rechte->getBerechtigungen($uid);
|
||||
@@ -302,6 +313,9 @@ $studiensemester->getAll();
|
||||
</td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<tr id="studiengang">
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="vertical-align: top; font-weight: bold;"><?php echo $p->t('global/anmerkung'); ?>: </td>
|
||||
<td>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
+26
-26
@@ -1,39 +1,39 @@
|
||||
{
|
||||
"repositories":
|
||||
[
|
||||
"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"
|
||||
}
|
||||
],
|
||||
|
||||
|
||||
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
||||
Regular → Executable
+83
-76
@@ -37,7 +37,7 @@ $db = new basis_db();
|
||||
$user = get_uid();
|
||||
$datum_obj = new datum();
|
||||
loadVariables($user);
|
||||
|
||||
|
||||
//Parameter holen
|
||||
$data = $_POST['data'];
|
||||
$studiensemester_kurzbz = $_GET['studiensemester_kurzbz'];
|
||||
@@ -46,7 +46,7 @@ loadVariables($user);
|
||||
$zeile=1;
|
||||
$zgv_arr=array();
|
||||
$zgvmas_arr=array();
|
||||
|
||||
|
||||
//ZGV laden
|
||||
$qry = "SELECT * FROM bis.tbl_zgv ORDER BY zgv_kurzbz";
|
||||
if($result = $db->db_query($qry))
|
||||
@@ -56,7 +56,7 @@ loadVariables($user);
|
||||
$zgv_arr[$row->zgv_code]=$row->zgv_kurzbz;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//ZGV Master laden
|
||||
$qry = "SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_kurzbz";
|
||||
if($result = $db->db_query($qry))
|
||||
@@ -66,7 +66,7 @@ loadVariables($user);
|
||||
$zgvmas_arr[$row->zgvmas_code]=$row->zgvmas_kurzbz;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Creating a workbook
|
||||
$workbook = new Spreadsheet_Excel_Writer();
|
||||
$workbook->setVersion(8);
|
||||
@@ -76,7 +76,7 @@ loadVariables($user);
|
||||
// Creating a worksheet
|
||||
$worksheet =& $workbook->addWorksheet("Studenten");
|
||||
$worksheet->setInputEncoding('utf-8');
|
||||
|
||||
|
||||
$format_bold =& $workbook->addFormat();
|
||||
$format_bold->setBold();
|
||||
|
||||
@@ -88,7 +88,7 @@ loadVariables($user);
|
||||
//Zeilenueberschriften ausgeben
|
||||
$i=0;
|
||||
$zeile=1;
|
||||
|
||||
|
||||
$worksheet->write($zeile,$i,"ANREDE", $format_bold);
|
||||
$maxlength[$i]=6;
|
||||
$worksheet->write($zeile,++$i,"TITELPRE", $format_bold);
|
||||
@@ -109,6 +109,8 @@ loadVariables($user);
|
||||
$maxlength[$i]=3;
|
||||
$worksheet->write($zeile,++$i,"ORT", $format_bold);
|
||||
$maxlength[$i]=3;
|
||||
$worksheet->write($zeile,++$i,"GEMEINDE", $format_bold);
|
||||
$maxlength[$i]=9;
|
||||
$worksheet->write($zeile,++$i,"NATION", $format_bold);
|
||||
$maxlength[$i]=6;
|
||||
$worksheet->write($zeile,++$i,"GEBURTSDATUM", $format_bold);
|
||||
@@ -127,7 +129,7 @@ loadVariables($user);
|
||||
$maxlength[$i]=17;
|
||||
$worksheet->write($zeile,++$i,"GESCHLECHT", $format_bold);
|
||||
$maxlength[$i]=10;
|
||||
|
||||
|
||||
$worksheet->write($zeile,++$i,"STUDIENGANG", $format_bold);
|
||||
$maxlength[$i]=11;
|
||||
$worksheet->write($zeile,++$i,"SEMESTER IM $studiensemester_kurzbz", $format_bold);
|
||||
@@ -138,7 +140,7 @@ loadVariables($user);
|
||||
$maxlength[$i]=7;
|
||||
$worksheet->write($zeile,++$i,"GRUPPE", $format_bold);
|
||||
$maxlength[$i]=6;
|
||||
|
||||
|
||||
$worksheet->write($zeile,++$i,"ZGV", $format_bold);
|
||||
$maxlength[$i]=10;
|
||||
$worksheet->write($zeile,++$i,"ZGV Ort", $format_bold);
|
||||
@@ -151,7 +153,7 @@ loadVariables($user);
|
||||
$maxlength[$i]=14;
|
||||
$worksheet->write($zeile,++$i,"ZGV Master Datum", $format_bold);
|
||||
$maxlength[$i]=16;
|
||||
|
||||
|
||||
$worksheet->write($zeile,++$i,"STATUS", $format_bold);
|
||||
$maxlength[$i]=6;
|
||||
$worksheet->write($zeile,++$i,"EMail Intern", $format_bold);
|
||||
@@ -175,13 +177,13 @@ loadVariables($user);
|
||||
$maxlength[$i]=8;
|
||||
$worksheet->write($zeile,++$i,"PRESTUDENTID", $format_bold);
|
||||
$maxlength[$i]=12;
|
||||
|
||||
|
||||
$zeile++;
|
||||
|
||||
|
||||
$ids = explode(';',$data);
|
||||
$prestudent_ids = '';
|
||||
|
||||
foreach ($ids as $id)
|
||||
|
||||
foreach ($ids as $id)
|
||||
{
|
||||
if($id!='')
|
||||
{
|
||||
@@ -190,12 +192,12 @@ loadVariables($user);
|
||||
$prestudent_ids .= "'".addslashes($id)."'";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($prestudent_ids!='')
|
||||
{
|
||||
// Student holen
|
||||
$qry = "SELECT *, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id) WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
|
||||
|
||||
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
while($row = $db->db_fetch_object($result))
|
||||
@@ -205,7 +207,7 @@ loadVariables($user);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function draw_content($row)
|
||||
{
|
||||
global $maxlength, $datum_obj;
|
||||
@@ -213,97 +215,102 @@ loadVariables($user);
|
||||
global $zgv_arr, $zgvmas_arr;
|
||||
global $studiensemester_kurzbz;
|
||||
$db = new basis_db();
|
||||
|
||||
|
||||
$prestudent = new prestudent();
|
||||
$prestudent->getLastStatus($row->prestudent_id);
|
||||
$status = $prestudent->status_kurzbz;
|
||||
$orgform = $prestudent->orgform_kurzbz;
|
||||
|
||||
|
||||
$i=0;
|
||||
|
||||
|
||||
//Anrede
|
||||
if(mb_strlen($row->anrede)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->anrede);
|
||||
$worksheet->write($zeile,$i, $row->anrede);
|
||||
$i++;
|
||||
|
||||
|
||||
//Titelpre
|
||||
if(mb_strlen($row->titelpre)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->titelpre);
|
||||
$worksheet->write($zeile,$i, $row->titelpre);
|
||||
$i++;
|
||||
|
||||
|
||||
//Nachname
|
||||
if(mb_strlen($row->nachname)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->nachname);
|
||||
$worksheet->write($zeile,$i, $row->nachname);
|
||||
$i++;
|
||||
|
||||
|
||||
//Vorname
|
||||
if(mb_strlen($row->vorname)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->vorname);
|
||||
$worksheet->write($zeile,$i, $row->vorname);
|
||||
$i++;
|
||||
|
||||
|
||||
//Titelpost
|
||||
if(mb_strlen($row->titelpost)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->titelpost);
|
||||
$worksheet->write($zeile,$i, $row->titelpost);
|
||||
$i++;
|
||||
|
||||
|
||||
//Email Privat
|
||||
//ZustellEmailAdresse aus der Datenbank holen und dazuhaengen
|
||||
$qry_1 = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$row->person_id' AND zustellung=true ORDER BY kontakt_id DESC LIMIT 1";
|
||||
if($result_1 = $db->db_query($qry_1))
|
||||
{
|
||||
if($row_1 = $db->db_fetch_object($result_1))
|
||||
{
|
||||
{
|
||||
if(mb_strlen($row_1->kontakt)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->kontakt);
|
||||
$worksheet->write($zeile,$i, $row_1->kontakt);
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Zustelladresse
|
||||
//Zustelladresse aus der Datenbank holen und dazuhaengen
|
||||
$qry_1 = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id' AND zustelladresse=true LIMIT 1";
|
||||
if($result_1 = $db->db_query($qry_1))
|
||||
{
|
||||
if($row_1 = $db->db_fetch_object($result_1))
|
||||
{
|
||||
{
|
||||
if(mb_strlen($row_1->strasse)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->strasse);
|
||||
$worksheet->write($zeile,$i, $row_1->strasse);
|
||||
$i++;
|
||||
|
||||
|
||||
if(mb_strlen($row_1->plz)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->plz);
|
||||
$worksheet->writeString($zeile,$i, $row_1->plz);
|
||||
$i++;
|
||||
|
||||
|
||||
if(mb_strlen($row_1->ort)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->ort);
|
||||
$worksheet->write($zeile,$i, $row_1->ort);
|
||||
$i++;
|
||||
|
||||
|
||||
if(mb_strlen($row_1->gemeinde)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->gemeinde);
|
||||
$worksheet->write($zeile,$i, $row_1->gemeinde);
|
||||
$i++;
|
||||
|
||||
if(mb_strlen($row_1->nation)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->nation);
|
||||
$worksheet->write($zeile,$i, $row_1->nation);
|
||||
$i++;
|
||||
}
|
||||
else
|
||||
$i+=4;
|
||||
else
|
||||
$i+=5;
|
||||
}
|
||||
else
|
||||
$i+=4;
|
||||
|
||||
else
|
||||
$i+=5;
|
||||
|
||||
//Geburtsdatum
|
||||
if(mb_strlen($row->gebdatum)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->gebdatum);
|
||||
$worksheet->write($zeile,$i, $datum_obj->convertISODate($row->gebdatum));
|
||||
$i++;
|
||||
|
||||
|
||||
//Geburtsort
|
||||
if(mb_strlen($row->gebort)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->gebort);
|
||||
@@ -315,7 +322,7 @@ loadVariables($user);
|
||||
$maxlength[$i] = mb_strlen($row->geburtsnation);
|
||||
$worksheet->write($zeile,$i,$row->geburtsnation);
|
||||
$i++;
|
||||
|
||||
|
||||
//Personenkennzeichen
|
||||
if(isset($row->matrikelnr))
|
||||
{
|
||||
@@ -324,37 +331,37 @@ loadVariables($user);
|
||||
$worksheet->writeString($zeile,$i, $row->matrikelnr);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Staatsbuergerschaft
|
||||
if(mb_strlen($row->staatsbuergerschaft)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->staatsbuergerschaft);
|
||||
$worksheet->write($zeile,$i, $row->staatsbuergerschaft);
|
||||
$i++;
|
||||
|
||||
|
||||
//SVNR
|
||||
if(mb_strlen($row->svnr)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->svnr);
|
||||
$worksheet->write($zeile,$i, $row->svnr);
|
||||
$i++;
|
||||
|
||||
|
||||
//Ersatzkennzeichen
|
||||
if(mb_strlen($row->ersatzkennzeichen)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->ersatzkennzeichen);
|
||||
$worksheet->write($zeile,$i, $row->ersatzkennzeichen);
|
||||
$i++;
|
||||
|
||||
|
||||
//Geschlecht
|
||||
if(mb_strlen($row->geschlecht)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->geschlecht);
|
||||
$worksheet->write($zeile,$i, $row->geschlecht);
|
||||
$i++;
|
||||
|
||||
//Studiengang
|
||||
|
||||
//Studiengang
|
||||
if(mb_strlen($row->stgbez)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->stgbez);
|
||||
$worksheet->write($zeile,$i, $row->stgbez);
|
||||
$i++;
|
||||
|
||||
|
||||
$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband JOIN public.tbl_student USING(student_uid) WHERE prestudent_id='$row->prestudent_id' AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
|
||||
if($result_sem = $db->db_query($qry))
|
||||
{
|
||||
@@ -365,7 +372,7 @@ loadVariables($user);
|
||||
$verband = $row_sem->verband;
|
||||
$gruppe = $row_sem->gruppe;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$qry = "SELECT public.tbl_prestudentstatus.ausbildungssemester FROM public.tbl_prestudentstatus WHERE prestudent_id='$row->prestudent_id' AND (status_kurzbz='Interessent' OR status_kurzbz='Bewerber') ORDER BY datum DESC LIMIT 1";
|
||||
if (($result_sem = $db->db_query($qry)) && ($row_sem = $db->db_fetch_object($result_sem)))
|
||||
@@ -377,10 +384,10 @@ loadVariables($user);
|
||||
$semester_aktuell = '';
|
||||
$verband = '';
|
||||
$gruppe = '';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//Semester im eingestellten Studiensemester
|
||||
//Semester im eingestellten Studiensemester
|
||||
if(isset($semester_studiensemester))
|
||||
{
|
||||
if(mb_strlen($semester_studiensemester)>$maxlength[$i])
|
||||
@@ -388,8 +395,8 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $semester_studiensemester);
|
||||
}
|
||||
$i++;
|
||||
|
||||
//Semester aktuell
|
||||
|
||||
//Semester aktuell
|
||||
if(isset($semester_aktuell))
|
||||
{
|
||||
if(mb_strlen($semester_aktuell)>$maxlength[$i])
|
||||
@@ -397,7 +404,7 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $semester_aktuell);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Verband
|
||||
if(isset($verband))
|
||||
{
|
||||
@@ -406,7 +413,7 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $verband);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Gruppe
|
||||
if(isset($gruppe))
|
||||
{
|
||||
@@ -415,8 +422,8 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $gruppe);
|
||||
}
|
||||
$i++;
|
||||
|
||||
//ZGV
|
||||
|
||||
//ZGV
|
||||
if($row->zgv_code!='' && isset($zgv_arr[$row->zgv_code]))
|
||||
{
|
||||
if(mb_strlen($zgv_arr[$row->zgv_code])>$maxlength[$i])
|
||||
@@ -424,19 +431,19 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $zgv_arr[$row->zgv_code]);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//ZGV Ort
|
||||
if(mb_strlen($row->zgvort)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->zgvort);
|
||||
$worksheet->write($zeile,$i, $row->zgvort);
|
||||
$i++;
|
||||
|
||||
|
||||
//ZGV Datum
|
||||
if(mb_strlen($row->zgvdatum)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->zgvdatum);
|
||||
$worksheet->write($zeile,$i, $row->zgvdatum);
|
||||
$i++;
|
||||
|
||||
|
||||
//ZGV Master
|
||||
if($row->zgvmas_code!='' && isset($zgvmas_arr[$row->zgvmas_code]))
|
||||
{
|
||||
@@ -445,25 +452,25 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $zgvmas_arr[$row->zgvmas_code]);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//ZGV Master Ort
|
||||
if(mb_strlen($row->zgvmaort)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->zgvmaort);
|
||||
$worksheet->write($zeile,$i, $row->zgvmaort);
|
||||
$i++;
|
||||
|
||||
|
||||
//ZGV Master Datum
|
||||
if(mb_strlen($row->zgvmadatum)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->zgvmadatum);
|
||||
$worksheet->write($zeile,$i, $row->zgvmadatum);
|
||||
$i++;
|
||||
|
||||
//Status
|
||||
|
||||
//Status
|
||||
if(mb_strlen($status)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($status);
|
||||
$worksheet->write($zeile,$i, $status);
|
||||
$i++;
|
||||
|
||||
|
||||
//Email Intern
|
||||
if(isset($row->student_uid))
|
||||
{
|
||||
@@ -472,35 +479,35 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $row->student_uid.'@'.DOMAIN);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Nebenwohnsitz
|
||||
//Nebenwohnsitz aus der Datenbank holen und dazuhaengen
|
||||
$qry_1 = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id' AND typ='n' LIMIT 1";
|
||||
if($result_1 = $db->db_query($qry_1))
|
||||
{
|
||||
if($row_1 = $db->db_fetch_object($result_1))
|
||||
{
|
||||
{
|
||||
if(mb_strlen($row_1->strasse)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->strasse);
|
||||
$worksheet->write($zeile,$i, $row_1->strasse);
|
||||
$i++;
|
||||
|
||||
|
||||
if(mb_strlen($row_1->plz)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->plz);
|
||||
$worksheet->writeString($zeile,$i, $row_1->plz);
|
||||
$i++;
|
||||
|
||||
|
||||
if(mb_strlen($row_1->ort)>$maxlength[$i])
|
||||
$maxlength[$i]=mb_strlen($row_1->ort);
|
||||
$worksheet->write($zeile,$i, $row_1->ort);
|
||||
$i++;
|
||||
}
|
||||
else
|
||||
else
|
||||
$i+=3;
|
||||
}
|
||||
else
|
||||
else
|
||||
$i+=3;
|
||||
|
||||
|
||||
//Telefon
|
||||
$qry_1 = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp in('mobil','telefon','so.tel') AND person_id='$row->person_id' AND zustellung=true LIMIT 1";
|
||||
if($result_1 = $db->db_query($qry_1))
|
||||
@@ -513,7 +520,7 @@ loadVariables($user);
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Spezialgruppen
|
||||
$grps='';
|
||||
$qry_1 = "SELECT gruppe_kurzbz FROM public.tbl_student JOIN public.tbl_benutzergruppe ON (student_uid=uid) WHERE tbl_student.prestudent_id='$row->prestudent_id' AND tbl_benutzergruppe.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
|
||||
@@ -523,7 +530,7 @@ loadVariables($user);
|
||||
{
|
||||
if($grps!='')
|
||||
$grps.=',';
|
||||
|
||||
|
||||
$grps.=$row_1->gruppe_kurzbz;
|
||||
}
|
||||
}
|
||||
@@ -531,7 +538,7 @@ loadVariables($user);
|
||||
$maxlength[$i]=mb_strlen($grps);
|
||||
$worksheet->write($zeile,$i, $grps);
|
||||
$i++;
|
||||
|
||||
|
||||
//UID
|
||||
if(isset($row->student_uid))
|
||||
{
|
||||
@@ -540,31 +547,31 @@ loadVariables($user);
|
||||
$worksheet->write($zeile,$i, $row->student_uid);
|
||||
}
|
||||
$i++;
|
||||
|
||||
|
||||
//Orgform
|
||||
if(mb_strlen($orgform)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($orgform);
|
||||
$worksheet->write($zeile,$i, $orgform);
|
||||
$i++;
|
||||
|
||||
|
||||
//Vornamen
|
||||
if(mb_strlen($row->vornamen)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->vornamen);
|
||||
$worksheet->write($zeile,$i, $row->vornamen);
|
||||
$i++;
|
||||
|
||||
|
||||
//PrestudentID
|
||||
if(mb_strlen($row->prestudent_id)>$maxlength[$i])
|
||||
$maxlength[$i] = mb_strlen($row->prestudent_id);
|
||||
$worksheet->write($zeile,$i, $row->prestudent_id);
|
||||
$i++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//Die Breite der Spalten setzen
|
||||
foreach($maxlength as $i=>$breite)
|
||||
$worksheet->setColumn($i, $i, $breite+2);
|
||||
|
||||
|
||||
$workbook->close();
|
||||
|
||||
?>
|
||||
|
||||
@@ -818,7 +818,7 @@ class betriebsmittel extends basis_db
|
||||
|
||||
* @return Daten Objekt wenn ok, false im Fehlerfall
|
||||
*/
|
||||
function betriebsmittel_inventar($order=null,$inventarnummer=null,$ort_kurzbz=null,$betriebsmittelstatus_kurzbz=null,$betriebsmitteltyp=null,$bestellung_id=null,$bestelldetail_id=null,$bestellnr=null,$hersteller=null,$afa=null,$jahr_monat=null,$firma_id=null,$inventur_jahr=null,$beschreibung=null,$oe_kurzbz=null,$seriennummer=null,$person_id=null,$betriebsmittel_id=null)
|
||||
function betriebsmittel_inventar($order=null,$inventarnummer=null,$ort_kurzbz=null,$betriebsmittelstatus_kurzbz=null,$betriebsmitteltyp=null,$bestellung_id=null,$bestelldetail_id=null,$bestellnr=null,$hersteller=null,$afa=null,$jahr_monat=null,$firma_id=null,$inventur_jahr=null,$beschreibung=null,$oe_kurzbz=null,$seriennummer=null,$person_id=null,$betriebsmittel_id=null,$anlage_jahr_monat=null)
|
||||
{
|
||||
// Init
|
||||
$this->errormsg='';
|
||||
@@ -853,7 +853,7 @@ class betriebsmittel extends basis_db
|
||||
LEFT JOIN public.tbl_firma ON(tbl_firma.firma_id=tbl_bestellung.firma_id )';
|
||||
|
||||
$qry.=" WHERE not tbl_betriebsmittel.betriebsmittel_id is null ";
|
||||
$where=$this->betriebsmittel_inventar_get_where($inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id);
|
||||
$where=$this->betriebsmittel_inventar_get_where($inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id,$anlage_jahr_monat);
|
||||
if ($where!='' && !$where)
|
||||
return $this->result;
|
||||
|
||||
@@ -957,7 +957,7 @@ class betriebsmittel extends basis_db
|
||||
* @param $betriebsmittel_id
|
||||
* @return unknown
|
||||
*/
|
||||
public function betriebsmittel_inventar_get_where($inventarnummer=null,$ort_kurzbz=null,$betriebsmittelstatus_kurzbz=null,$betriebsmitteltyp=null,$bestellung_id=null,$bestelldetail_id=null,$bestellnr=null,$hersteller=null,$afa=null,$jahr_monat=null,$firma_id=null,$inventur_jahr=null,$beschreibung=null,$oe_kurzbz=null,$seriennummer=null,$person_id=null,$betriebsmittel_id=null)
|
||||
public function betriebsmittel_inventar_get_where($inventarnummer=null,$ort_kurzbz=null,$betriebsmittelstatus_kurzbz=null,$betriebsmitteltyp=null,$bestellung_id=null,$bestelldetail_id=null,$bestellnr=null,$hersteller=null,$afa=null,$jahr_monat=null,$firma_id=null,$inventur_jahr=null,$beschreibung=null,$oe_kurzbz=null,$seriennummer=null,$person_id=null,$betriebsmittel_id=null,$anlage_jahr_monat=null)
|
||||
{
|
||||
$where='';
|
||||
// Inventarnummer oder Betriebsmittelnummer
|
||||
@@ -1115,11 +1115,24 @@ 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.insertamum, 'YYYYMMDD') = ".$this->db_add_param($jahr_monat)." ";
|
||||
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, '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.insertamum, 'YYYYMM') = ".$this->db_add_param($jahr_monat)." ";
|
||||
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, 'YYYYMM') = ".$this->db_add_param($jahr_monat)." ";
|
||||
elseif (!is_null($jahr_monat) && !empty($jahr_monat))
|
||||
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYY') = ".$this->db_add_param($jahr_monat)." ";
|
||||
$jm=" and to_char(tbl_betriebsmittel_betriebsmittelstatus.datum, '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) ";
|
||||
}
|
||||
elseif (!is_null($anlage_jahr_monat) && $anlage_jahr_monat!='')
|
||||
{
|
||||
$anlage_jahr_monat=mb_strtoupper(trim(str_replace(array('-','.','/','*','%',"'",'"'),'',trim($anlage_jahr_monat))));
|
||||
$jm='';
|
||||
if (!empty($anlage_jahr_monat) && is_numeric($anlage_jahr_monat) && strlen($anlage_jahr_monat)>6)
|
||||
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYYMMDD') = ".$this->db_add_param($anlage_jahr_monat)." ";
|
||||
elseif (!empty($anlage_jahr_monat) && is_numeric($anlage_jahr_monat) && strlen($anlage_jahr_monat)>4)
|
||||
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYYMM') = ".$this->db_add_param($anlage_jahr_monat)." ";
|
||||
elseif (!is_null($anlage_jahr_monat) && !empty($anlage_jahr_monat))
|
||||
$jm=" and to_char(tbl_betriebsmittel.insertamum, 'YYYY') = ".$this->db_add_param($anlage_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) ";
|
||||
}
|
||||
|
||||
@@ -1592,6 +1592,91 @@ class lehrveranstaltung extends basis_db
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Lädt alle Lehrveranstaltungen zu denen die übergebene LV ID kompatibel ist
|
||||
* @param $lehrveranstaltung_id ID der Lehrveranstaltung
|
||||
*/
|
||||
public function getLVkompatibelTo($lehrveranstaltung_id, $studienplan_ids=array())
|
||||
{
|
||||
if (!is_numeric($lehrveranstaltung_id))
|
||||
{
|
||||
$this->errormsg = 'Lehrveranstaltung_id muss eine gueltige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
|
||||
if((!is_array($studienplan_ids)) && (count($studienplan_ids) < 1))
|
||||
{
|
||||
$this->errormsg = 'Es muss ein Array von Studienplan_IDs mit mindestens einem Element übergeben werden.';
|
||||
return false;
|
||||
}
|
||||
|
||||
$studienplaene = "";
|
||||
foreach($studienplan_ids as $stplId)
|
||||
{
|
||||
$studienplaene .= $stplId.",";
|
||||
}
|
||||
$studienplaene = rtrim($studienplaene, ",");
|
||||
|
||||
$qry = "SELECT * FROM lehre.tbl_lehrveranstaltung
|
||||
JOIN lehre.tbl_studienplan_lehrveranstaltung USING (lehrveranstaltung_id)
|
||||
WHERE lehrveranstaltung_id IN (
|
||||
SELECT lehrveranstaltung_id
|
||||
FROM lehre.tbl_lehrveranstaltung_kompatibel
|
||||
WHERE lehrveranstaltung_id_kompatibel=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER).")
|
||||
AND studienplan_id IN(".$studienplaene.");";
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object())
|
||||
{
|
||||
$lv_obj = new lehrveranstaltung();
|
||||
|
||||
$lv_obj->lehrveranstaltung_id = $row->lehrveranstaltung_id;
|
||||
$lv_obj->studiengang_kz = $row->studiengang_kz;
|
||||
$lv_obj->bezeichnung = $row->bezeichnung;
|
||||
$lv_obj->kurzbz = $row->kurzbz;
|
||||
$lv_obj->lehrform_kurzbz = $row->lehrform_kurzbz;
|
||||
$lv_obj->semester = $row->semester;
|
||||
$lv_obj->ects = $row->ects;
|
||||
$lv_obj->semesterstunden = $row->semesterstunden;
|
||||
$lv_obj->anmerkung = $row->anmerkung;
|
||||
$lv_obj->lehre = $this->db_parse_bool($row->lehre);
|
||||
$lv_obj->lehreverzeichnis = $row->lehreverzeichnis;
|
||||
$lv_obj->aktiv = $this->db_parse_bool($row->aktiv);
|
||||
$lv_obj->ext_id = $row->ext_id;
|
||||
$lv_obj->insertamum = $row->insertamum;
|
||||
$lv_obj->insertvon = $row->insertvon;
|
||||
$lv_obj->planfaktor = $row->planfaktor;
|
||||
$lv_obj->planlektoren = $row->planlektoren;
|
||||
$lv_obj->planpersonalkosten = $row->planpersonalkosten;
|
||||
$lv_obj->plankostenprolektor = $row->plankostenprolektor;
|
||||
$lv_obj->updateamum = $row->updateamum;
|
||||
$lv_obj->updatevon = $row->updatevon;
|
||||
$lv_obj->sprache = $row->sprache;
|
||||
$lv_obj->sort = $row->sort;
|
||||
$lv_obj->incoming = $row->incoming;
|
||||
$lv_obj->zeugnis = $this->db_parse_bool($row->zeugnis);
|
||||
$lv_obj->projektarbeit = $this->db_parse_bool($row->projektarbeit);
|
||||
$lv_obj->koordinator = $row->koordinator;
|
||||
$lv_obj->bezeichnung_english = $row->bezeichnung_english;
|
||||
$lv_obj->orgform_kurzbz = $row->orgform_kurzbz;
|
||||
$lv_obj->lehrtyp_kurzbz = $row->lehrtyp_kurzbz;
|
||||
$lv_obj->farbe = $row->farbe;
|
||||
$lv_obj->benotung = $this->db_parse_bool($row->benotung);
|
||||
$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
|
||||
$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
|
||||
|
||||
$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
|
||||
$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
|
||||
if ($lv_obj->bezeichnung_arr['English'] == '')
|
||||
$lv_obj->bezeichnung_arr['English'] = $lv_obj->bezeichnung_arr['German'];
|
||||
|
||||
$this->lehrveranstaltungen[] = $lv_obj;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Speichert eine Kombination aus LV und ihrer kompatiblen Lehrveranstaltung
|
||||
* @param $lehrveranstaltung_id ID der Lehrveranstaltung
|
||||
|
||||
Regular → Executable
+70
-69
@@ -2,22 +2,22 @@
|
||||
|
||||
/*
|
||||
* Copyright 2014 fhcomplete.org
|
||||
*
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*
|
||||
*
|
||||
*
|
||||
* Authors: Stefan Puraner <puraner@technikum-wien.at>
|
||||
*/
|
||||
@@ -28,7 +28,7 @@ class pruefungCis extends basis_db
|
||||
{
|
||||
public $new;
|
||||
public $result = array();
|
||||
|
||||
|
||||
public $pruefung_id; //bigint
|
||||
public $mitarbeiter_uid; //varchar(32)
|
||||
public $studiensemester_kurzbz; //varchar(16)
|
||||
@@ -44,15 +44,15 @@ class pruefungCis extends basis_db
|
||||
public $updatevon; //varcahr(32)
|
||||
public $updateamum; //timestamp without timezone
|
||||
public $pruefungsintervall; //smallint
|
||||
|
||||
|
||||
public $lehrveranstaltungen = array(); //Lehrveranstaltungen zur Prüfung
|
||||
public $termine = array(); //Termine zur Prüfung
|
||||
|
||||
|
||||
/**
|
||||
* Konstruktor
|
||||
* @param pruefung_id ID der zu ladenden Prüfung
|
||||
*/
|
||||
public function __construct($pruefung_id = null)
|
||||
public function __construct($pruefung_id = null)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
@@ -87,52 +87,52 @@ class pruefungCis extends basis_db
|
||||
{
|
||||
return $this->$name;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prüft Attribute auf Ihre Richtigkeit
|
||||
* @return boolean true, wenn alle Prüfungen positiv verlaufen, andernfalls false
|
||||
*/
|
||||
public function validate()
|
||||
{
|
||||
{
|
||||
if(!is_numeric($this->pruefungsfenster_id) && $this->pruefungsfenster_id != null)
|
||||
{
|
||||
$this->errormsg = "pruefungsfenster_id muss eine gültige Zahl sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(mb_strlen($this->mitarbeiter_uid) > 32)
|
||||
{
|
||||
$this->errormsg = "mitarbeiter_uid darf nicht länger als 32 Zeichen sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(mb_strlen($this->studiensemester_kurzbz) > 16 && $this->studiensemester_kurzbz != null)
|
||||
{
|
||||
$this->errormsg = "studiensemester_kurzbz darf nicht länger als 16 Zeichen sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(mb_strlen($this->pruefungstyp_kurzbz) > 16 && $this->pruefungstyp_kurzbz != null)
|
||||
{
|
||||
$this->errormsg = "pruefungstyp_kurzbz darf nicht länger als 16 Zeichen sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(mb_strlen($this->titel) > 256)
|
||||
{
|
||||
$this->errormsg = "pruefungstyp_kurzbz darf nicht länger als 256 Zeichen sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(mb_strlen($this->methode) > 64)
|
||||
{
|
||||
$this->errormsg = "methode darf nicht länger als 64 Zeichen sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* speichert einen Prüfungs-Datensatz
|
||||
* @param boolean $new gibt an ob es ich um einen neuen Datensatz (true) oder um ein update (false) handelt
|
||||
@@ -178,15 +178,15 @@ class pruefungCis extends basis_db
|
||||
. 'pruefungsintervall='.$this->db_add_param($this->pruefungsintervall).' '
|
||||
. 'WHERE pruefung_id='.$this->db_add_param($this->pruefung_id).';';
|
||||
}
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
if ($new)
|
||||
if ($new)
|
||||
{
|
||||
$qry = "SELECT currval('campus.seq_pruefung_pruefung_id') as id";
|
||||
if ($this->db_query($qry))
|
||||
if ($this->db_query($qry))
|
||||
{
|
||||
if ($row = $this->db_fetch_object())
|
||||
if ($row = $this->db_fetch_object())
|
||||
{
|
||||
$this->pruefung_id = $row->id;
|
||||
foreach ($this->lehrveranstaltungen as $lv)
|
||||
@@ -209,7 +209,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
$this->db_query('COMMIT;');
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim Auslesen der Sequence';
|
||||
@@ -217,7 +217,7 @@ class pruefungCis extends basis_db
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim Auslesen der Sequence';
|
||||
$this->db_query('ROLLBACK');
|
||||
@@ -259,7 +259,7 @@ class pruefungCis extends basis_db
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt einen Datensatz aus der Datenbank
|
||||
* @param integer $pruefung_id ID der zu ladenden Prüfung
|
||||
@@ -272,14 +272,14 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Prüfung ID ist keine gültige Zahl";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'SELECT * FROM campus.tbl_pruefung WHERE pruefung_id='.$this->db_add_param($pruefung_id).';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Prüfung konnte nicht geladen werden";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if($row = $this->db_fetch_object())
|
||||
@@ -299,7 +299,7 @@ class pruefungCis extends basis_db
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt alle Prüfungen zu einer UID
|
||||
* @param String $uid UID deren Prüfungen geladen werden sollen
|
||||
@@ -318,8 +318,8 @@ class pruefungCis extends basis_db
|
||||
{
|
||||
$qry .= ' ORDER BY '.$order;
|
||||
}
|
||||
$qry .= ';';
|
||||
|
||||
$qry .= ';';
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Prüfungen konnten nicht geladen werden";
|
||||
@@ -347,7 +347,7 @@ class pruefungCis extends basis_db
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* speichert die zugehörigen LVs zu einer Prüfung
|
||||
* @param Integer $lehrveranstaltung_id ID einer Lehrveranstaltung
|
||||
@@ -361,17 +361,17 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Lehrveranstaltung ID muss eine gültige Zahl sein";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(!is_numeric($pruefung_id))
|
||||
{
|
||||
$this->errormsg = "Prüfung ID muss eine gültige Zahl sein";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'INSERT INTO campus.tbl_lehrveranstaltung_pruefung (lehrveranstaltung_id, pruefung_id) VALUES ('
|
||||
.$this->db_add_param($lehrveranstaltung_id).', '
|
||||
.$this->db_add_param($pruefung_id).');';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Lehrveranstaltungen konnten nicht gespeichert werden.";
|
||||
@@ -379,7 +379,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* lädt alle zum Objekt gehörenden Lehrveranstaltungen
|
||||
* @return boolean true, wenn ok; false, im Fehlerfall
|
||||
@@ -387,7 +387,7 @@ class pruefungCis extends basis_db
|
||||
public function getLehrveranstaltungenByPruefung()
|
||||
{
|
||||
$qry = 'SELECT * FROM campus.tbl_lehrveranstaltung_pruefung WHERE pruefung_id='.$this->db_add_param($this->pruefung_id).';';
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object())
|
||||
@@ -405,7 +405,7 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Zugehörige Lehrveranstaltungen konnten nicht geladen werden.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -424,7 +424,7 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Pruefung ID muss eine gültige Zahl sein";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'INSERT INTO campus.tbl_pruefungstermin (pruefung_id, von, bis, teilnehmer_max, teilnehmer_min, sammelklausur) VALUES ('
|
||||
. $this->db_add_param($pruefung_id).', '
|
||||
. $this->db_add_param($beginn).', '
|
||||
@@ -432,7 +432,7 @@ class pruefungCis extends basis_db
|
||||
. $this->db_add_param($max).', '
|
||||
. $this->db_add_param($min).', '
|
||||
. $this->db_add_param($sammelklausur).');';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Termine konnten nicht gespeichert werden!";
|
||||
@@ -440,15 +440,16 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt alle Termine zum Prüfungs-Objekt
|
||||
* @return boolean true, wenn ok; false, im Fehlerfall
|
||||
*/
|
||||
public function getTermineByPruefung()
|
||||
{
|
||||
$qry = 'SELECT * FROM campus.tbl_pruefungstermin WHERE pruefung_id='.$this->db_add_param($this->pruefung_id).';';
|
||||
|
||||
//$qry = 'SELECT * FROM campus.tbl_pruefungstermin WHERE pruefung_id='.$this->db_add_param($this->pruefung_id).';';
|
||||
$fromdate = date("Y-m-d", strtotime("-2 months"));
|
||||
$qry = "SELECT * FROM campus.tbl_pruefungstermin WHERE pruefung_id=".$this->db_add_param($this->pruefung_id)."and von > '".$fromdate."';";
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object())
|
||||
@@ -473,9 +474,9 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Zugehörige Termine konnten nicht geladen werden.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* ändert einen Termin zur Prüfung
|
||||
* @param integer $pruefungstermin_id ID eines Prüfungstermins
|
||||
@@ -493,7 +494,7 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Pruefungstermin ID muss eine gültige Zahl sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'UPDATE campus.tbl_pruefungstermin SET '
|
||||
. 'pruefung_id='.$this->db_add_param($pruefung_id).', '
|
||||
. 'von='.$this->db_add_param($beginn).', '
|
||||
@@ -501,7 +502,7 @@ class pruefungCis extends basis_db
|
||||
. 'teilnehmer_max='.$this->db_add_param($max).', '
|
||||
. 'teilnehmer_min='.$this->db_add_param($min).' '
|
||||
. 'WHERE pruefungstermin_id='.$this->db_add_param($pruefungstermin_id).';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Termin konnte nicht geändert werden.";
|
||||
@@ -509,7 +510,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Setzt den Storniert-Status einer Prüfung auf True
|
||||
* @param integer $pruefung_id ID einer Prüfung
|
||||
@@ -522,9 +523,9 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Pruefung ID muss eine gültige Zahl sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'UPDATE campus.tbl_pruefung SET storniert=true WHERE pruefung_id='.$this->db_add_param($pruefung_id).';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Prüfung konnte nicht storniert werden.";
|
||||
@@ -532,7 +533,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* löscht die Verknüpfung zwischen einer Lehrveranstaltung und einer Prüfung
|
||||
* @param integer $lehrveranstaltung_id ID einer Lehrveranstaltung
|
||||
@@ -550,9 +551,9 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Prüfung ID muss eine gültige Zahl sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'DELETE FROM campus.tbl_lehrveranstaltung_pruefung WHERE lehrveranstaltung_id='.$this->db_add_param($lehrveranstaltung_id).' AND pruefung_id='.$this->db_add_param($pruefung_id).';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = 'Lehrveranstaltung konnte nicht gelöscht werden.';
|
||||
@@ -560,7 +561,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* löscht einen Prüfungstermin einer Prüfung
|
||||
* @param integer $pruefungstermin_id ID eines Prüfungstermins
|
||||
@@ -573,9 +574,9 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Pruefungstermin ID muss eine gültige Zahl sein.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'DELETE FROM campus.tbl_pruefungstermin WHERE pruefungstermin_id='.$this->db_add_param($pruefungstermin_id).';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = 'Termin konnte nicht gelöscht werden.';
|
||||
@@ -583,7 +584,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt alle Prüfungen zur angebenen Lehrveranstaltung
|
||||
* @param String|Array $lehrveranstaltung_IDs einzelne ID einer Lehrveranstaltung oder ein Array von IDs
|
||||
@@ -596,7 +597,7 @@ class pruefungCis extends basis_db
|
||||
$this->errormsg = "Keine Lehrveranstaltungen übergeben.</br>";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$in = "";
|
||||
if (is_array($lehrveranstaltung_IDs))
|
||||
{
|
||||
@@ -610,9 +611,9 @@ class pruefungCis extends basis_db
|
||||
{
|
||||
$in = $lehrveranstaltung_IDs;
|
||||
}
|
||||
|
||||
|
||||
$qry = 'SELECT * FROM campus.tbl_lehrveranstaltung_pruefung WHERE lehrveranstaltung_id IN ('.$in.');';
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object())
|
||||
@@ -627,7 +628,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt alle Prüfung-Lehrveranstaltung Kombinationen
|
||||
* @return boolean true, wenn ok; false, im Fehlerfall
|
||||
@@ -635,7 +636,7 @@ class pruefungCis extends basis_db
|
||||
public function getAll()
|
||||
{
|
||||
$qry = 'SELECT * FROM campus.tbl_lehrveranstaltung_pruefung;';
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
while($row = $this->db_fetch_object())
|
||||
@@ -650,7 +651,7 @@ class pruefungCis extends basis_db
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt alle Prüfungen
|
||||
* @param String $mitarbeiter_uid UID des Mitarbeiters (optional)
|
||||
@@ -659,14 +660,14 @@ class pruefungCis extends basis_db
|
||||
public function getAllPruefungen($mitarbeiter_uid = NULL)
|
||||
{
|
||||
$qry = 'SELECT * FROM campus.tbl_pruefung';
|
||||
|
||||
|
||||
if(!is_null($mitarbeiter_uid))
|
||||
{
|
||||
$qry .= ' WHERE mitarbeiter_uid='.$this->db_add_param($mitarbeiter_uid);
|
||||
}
|
||||
|
||||
|
||||
$qry .= ';';
|
||||
|
||||
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->errormsg = "Prüfungen konnten nicht geladen werden";
|
||||
@@ -694,17 +695,17 @@ class pruefungCis extends basis_db
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Lädt den Wert des letzten Studenten in der Anmeldereihung
|
||||
* @param type $pruefungstermin_id Id eines Prüfungstermines
|
||||
* @return boolean|integer Wert des Letzten in der Reihung oder false, wenn ein Fehler auftritt
|
||||
* @return boolean|integer Wert des Letzten in der Reihung oder false, wenn ein Fehler auftritt
|
||||
*/
|
||||
public function getLastOfReihung($pruefungstermin_id)
|
||||
{
|
||||
$qry = 'SELECT MAX(reihung) FROM campus.tbl_pruefungsanmeldung WHERE '
|
||||
. 'pruefungstermin_id='.$this->db_add_param($pruefungstermin_id).';';
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
$row = $this->db_fetch_object();
|
||||
@@ -716,4 +717,4 @@ class pruefungCis extends basis_db
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,8 +32,6 @@ class statistik extends basis_db
|
||||
public $bezeichnung;
|
||||
public $url;
|
||||
public $sql;
|
||||
public $php;
|
||||
public $r;
|
||||
public $gruppe;
|
||||
public $publish;
|
||||
public $insertamum;
|
||||
@@ -92,8 +90,6 @@ class statistik extends basis_db
|
||||
$this->bezeichnung = $row->bezeichnung;
|
||||
$this->url = $row->url;
|
||||
$this->sql = $row->sql;
|
||||
$this->php = $row->php;
|
||||
$this->r = $row->r;
|
||||
$this->gruppe = $row->gruppe;
|
||||
$this->publish = $this->db_parse_bool($row->publish);
|
||||
$this->insertamum = $row->insertamum;
|
||||
@@ -141,8 +137,6 @@ class statistik extends basis_db
|
||||
$obj->bezeichnung = $row->bezeichnung;
|
||||
$obj->url = $row->url;
|
||||
$obj->sql = $row->sql;
|
||||
$obj->php = $row->php;
|
||||
$obj->r = $row->r;
|
||||
$obj->gruppe = $row->gruppe;
|
||||
$obj->publish = $this->db_parse_bool($row->publish);
|
||||
$obj->insertamum = $row->insertamum;
|
||||
@@ -187,8 +181,6 @@ class statistik extends basis_db
|
||||
$obj->bezeichnung = $row->bezeichnung;
|
||||
$obj->url = $row->url;
|
||||
$obj->sql = $row->sql;
|
||||
$obj->php = $row->php;
|
||||
$obj->r = $row->r;
|
||||
$obj->gruppe = $row->gruppe;
|
||||
$obj->publish = $this->db_parse_bool($row->publish);
|
||||
$obj->insertamum = $row->insertamum;
|
||||
@@ -267,14 +259,12 @@ class statistik extends basis_db
|
||||
if($new)
|
||||
{
|
||||
$qry = 'INSERT INTO public.tbl_statistik(statistik_kurzbz, content_id, bezeichnung, url, sql,
|
||||
php, r, gruppe, publish, insertamum, insertvon, updateamum, updatevon, preferences, berechtigung_kurzbz) VALUES('.
|
||||
gruppe, publish, insertamum, insertvon, updateamum, updatevon, preferences, berechtigung_kurzbz) VALUES('.
|
||||
$this->db_add_param($this->statistik_kurzbz).','.
|
||||
$this->db_add_param($this->content_id,FHC_INTEGER).','.
|
||||
$this->db_add_param($this->bezeichnung).','.
|
||||
$this->db_add_param($this->url).','.
|
||||
$this->db_add_param($this->sql).','.
|
||||
$this->db_add_param($this->php).','.
|
||||
$this->db_add_param($this->r).','.
|
||||
$this->db_add_param($this->gruppe).','.
|
||||
$this->db_add_param($this->publish, FHC_BOOLEAN).','.
|
||||
$this->db_add_param($this->insertamum).','.
|
||||
@@ -294,8 +284,6 @@ class statistik extends basis_db
|
||||
' statistik_kurzbz='.$this->db_add_param($this->statistik_kurzbz).','.
|
||||
' url='.$this->db_add_param($this->url).','.
|
||||
' sql='.$this->db_add_param($this->sql).','.
|
||||
' php='.$this->db_add_param($this->php).','.
|
||||
' r='.$this->db_add_param($this->r).','.
|
||||
' gruppe='.$this->db_add_param($this->gruppe).','.
|
||||
' publish='.$this->db_add_param($this->publish, FHC_BOOLEAN).','.
|
||||
' insertamum='.$this->db_add_param($this->insertamum).','.
|
||||
|
||||
@@ -6,12 +6,17 @@
|
||||
.panel-body-noheader {
|
||||
border-top-width: 1px;
|
||||
}
|
||||
.panel-header,
|
||||
.panel-body {
|
||||
|
||||
.panel {
|
||||
background-color: #EEE;
|
||||
color: #333;
|
||||
border-color: #888;
|
||||
border: 1px solid #888;
|
||||
}
|
||||
|
||||
.panel-body {
|
||||
background-color: #EEE;
|
||||
color: #333;
|
||||
font-size: 12px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -149,5 +149,7 @@ Die Prüfung zur LV %1$s wurde verschoben.
|
||||
Der neue Termin für die Prüfung ist am %2$s um %3$s Uhr.';
|
||||
$this->phrasen['pruefung/emailVerschiebungSubject'] = 'Verschiebung einer Prüfung';
|
||||
|
||||
$this->phrasen['pruefung/AnrechnungInStudiengang'] = 'Studiengang für Anrechnung';
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@@ -4,7 +4,7 @@ $this->phrasen['upload/auswaehlen']='';
|
||||
$this->phrasen['upload/benutzerKonnteNichtZugeordnetWerden']='';
|
||||
$this->phrasen['upload/dateiAufServerDateiformat']='Errore: il formato del file che si vuole caricare sul server non viene supportato';
|
||||
$this->phrasen['upload/dateien']='';
|
||||
$this->phrasen['upload/dateienAutomatischUeberschreiben']='';
|
||||
$this->phrasen['upload/dateienAutomatischUeberschreiben']='sovrascrivere file omonimi';
|
||||
$this->phrasen['upload/dateienImOrdner']='';
|
||||
$this->phrasen['upload/dateienInOrdnern']='';
|
||||
$this->phrasen['upload/dateiExistiertBereits']='Errore: il file è già esistente! Si prega di utilizzare l\'opzione "sovrascrivere automaticamente i file';
|
||||
@@ -21,18 +21,18 @@ $this->phrasen['upload/keineOrdnerGefunden']='impossibile trovare cartelle corri
|
||||
$this->phrasen['upload/keineSemesterDefiniert']='';
|
||||
$this->phrasen['upload/keineStudiengaengeDefiniert']='';
|
||||
$this->phrasen['upload/leeren']='';
|
||||
$this->phrasen['upload/maxUploadgroesse']='';
|
||||
$this->phrasen['upload/maxUploadgroesse']='Grandezza massima per file';
|
||||
$this->phrasen['upload/name']='';
|
||||
$this->phrasen['upload/neuesVerzeichnisErstellen']='';
|
||||
$this->phrasen['upload/neuesVerzeichnisErstellen']='crea nuova cartella';
|
||||
$this->phrasen['upload/studentenUploadEinsehen']='';
|
||||
$this->phrasen['upload/studentenUploadVerwalten']='';
|
||||
$this->phrasen['upload/studentenUploadverzeichnis']='';
|
||||
$this->phrasen['upload/studentenUploadverzeichnisLeeren']='';
|
||||
$this->phrasen['upload/umEinenOrdnerOderEineDatei']='';
|
||||
$this->phrasen['upload/umEinenOrdnerOderEineDatei']='Per cancellare o modificare un file o una cartella barrare la corrispettiva casella.';
|
||||
$this->phrasen['upload/unterordnerVon']='';
|
||||
$this->phrasen['upload/upload']='';
|
||||
$this->phrasen['upload/verzeichnisErstellen']='';
|
||||
$this->phrasen['upload/verzeichnisname']='';
|
||||
$this->phrasen['upload/verzeichnisname']='Nome cartella';
|
||||
$this->phrasen['upload/verzeichnisnameDarfNurBuchstaben']='';
|
||||
$this->phrasen['upload/wollenSieOrdnerWirklichLoeschen']='';
|
||||
$this->phrasen['upload/wollenSieUploadWirklichLeeren']='';
|
||||
|
||||
+88
-30
@@ -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>
|
||||
|
||||
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 7.4 KiB |
+30
-26
@@ -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>
|
||||
|
||||
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.5 KiB |
+528
-79
@@ -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>
|
||||
|
||||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 32 KiB |
+26
-23
@@ -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>
|
||||
|
||||
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
+28
-1
@@ -1431,6 +1431,33 @@ if($result = @$db->db_query("SELECT 1 FROM kommune.tbl_match"))
|
||||
echo 'kommune schema is dropped<br>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Removing column "r" from tbl_statistik
|
||||
if ($result = @$db->db_query("SELECT r FROM public.tbl_statistik LIMIT 1;"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_statistik DROP COLUMN r;";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_statistik: ' . $db->db_last_error() . '</strong><br>';
|
||||
else
|
||||
echo ' public.tbl_statistik: Spalte r entfernt.<br>';
|
||||
}
|
||||
|
||||
|
||||
// Removing column "php" from tbl_statistik
|
||||
if ($result = @$db->db_query("SELECT php FROM public.tbl_statistik LIMIT 1;"))
|
||||
{
|
||||
$qry = "ALTER TABLE public.tbl_statistik DROP COLUMN php;";
|
||||
|
||||
if (!$db->db_query($qry))
|
||||
echo '<strong>public.tbl_statistik: ' . $db->db_last_error() . '</strong><br>';
|
||||
else
|
||||
echo ' public.tbl_statistik: Spalte php entfernt.<br>';
|
||||
}
|
||||
|
||||
|
||||
|
||||
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
|
||||
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
|
||||
|
||||
@@ -1643,7 +1670,7 @@ $tabellen=array(
|
||||
"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id"),
|
||||
"public.tbl_sprache" => array("sprache","locale","flagge","index","content","bezeichnung"),
|
||||
"public.tbl_standort" => array("standort_id","adresse_id","kurzbz","bezeichnung","insertvon","insertamum","updatevon","updateamum","ext_id", "firma_id","code"),
|
||||
"public.tbl_statistik" => array("statistik_kurzbz","bezeichnung","url","r","gruppe","sql","php","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish","preferences"),
|
||||
"public.tbl_statistik" => array("statistik_kurzbz","bezeichnung","url","gruppe","sql","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish","preferences"),
|
||||
"public.tbl_student" => array("student_uid","matrikelnr","prestudent_id","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"public.tbl_studentlehrverband" => array("student_uid","studiensemester_kurzbz","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
|
||||
"public.tbl_studiengang" => array("studiengang_kz","kurzbz","kurzbzlang","typ","bezeichnung","english","farbe","email","telefon","max_semester","max_verband","max_gruppe","erhalter_kz","bescheid","bescheidbgbl1","bescheidbgbl2","bescheidgz","bescheidvom","orgform_kurzbz","titelbescheidvom","aktiv","ext_id","zusatzinfo_html","moodle","sprache","testtool_sprachwahl","studienplaetze","oe_kurzbz","lgartcode","mischform","projektarbeit_note_anzeige", "onlinebewerbung"),
|
||||
|
||||
+130
-29
@@ -26,6 +26,7 @@ require_once('../../include/studiensemester.class.php');
|
||||
require_once('../../include/datum.class.php');
|
||||
require_once('../../include/benutzerberechtigung.class.php');
|
||||
require_once('../../include/functions.inc.php');
|
||||
require_once('../../include/studiengang.class.php');
|
||||
|
||||
$uid = get_uid();
|
||||
|
||||
@@ -86,23 +87,50 @@ if($result = $db->db_query($qry))
|
||||
}
|
||||
}
|
||||
|
||||
$ba1_arr = array();
|
||||
$qry = "SELECT * FROM bis.tbl_beschaeftigungsart1";
|
||||
if($result = $db->db_query($qry))
|
||||
while($row = $db->db_fetch_object($result))
|
||||
$ba1_arr[$row->ba1code]=$row->ba1kurzbz;
|
||||
|
||||
$ba2_arr = array();
|
||||
$qry = "SELECT * FROM bis.tbl_beschaeftigungsart2";
|
||||
if($result = $db->db_query($qry))
|
||||
while($row = $db->db_fetch_object($result))
|
||||
$ba2_arr[$row->ba2code]=$row->ba2bez;
|
||||
|
||||
$verwendung_arr = array();
|
||||
$qry = "SELECT * FROM bis.tbl_verwendung";
|
||||
if($result = $db->db_query($qry))
|
||||
while($row = $db->db_fetch_object($result))
|
||||
$verwendung_arr[$row->verwendung_code]=$row->verwendungbez;
|
||||
|
||||
$ausmass_arr = array();
|
||||
$qry = "SELECT * FROM bis.tbl_beschaeftigungsausmass";
|
||||
if($result = $db->db_query($qry))
|
||||
while($row = $db->db_fetch_object($result))
|
||||
$ausmass_arr[$row->beschausmasscode]=$row->beschausmassbez;
|
||||
|
||||
$stg_obj = new studiengang();
|
||||
$stg_obj->getAll(null,false);
|
||||
|
||||
$qry="
|
||||
SELECT DISTINCT ON (UID) *
|
||||
FROM
|
||||
public.tbl_mitarbeiter
|
||||
SELECT DISTINCT ON (UID) *
|
||||
FROM
|
||||
public.tbl_mitarbeiter
|
||||
JOIN public.tbl_benutzer ON(mitarbeiter_uid=uid)
|
||||
JOIN public.tbl_person USING(person_id)
|
||||
JOIN bis.tbl_bisverwendung USING(mitarbeiter_uid)
|
||||
WHERE
|
||||
bismelden
|
||||
AND personalnummer>0
|
||||
WHERE
|
||||
bismelden
|
||||
AND personalnummer>0
|
||||
AND (tbl_bisverwendung.ende is NULL OR tbl_bisverwendung.ende>".$db->db_add_param($bisprevious).")
|
||||
ORDER BY uid, nachname,vorname
|
||||
";
|
||||
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
|
||||
|
||||
$datei.="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<Erhalter>
|
||||
<ErhKz>".$erhalter."</ErhKz>
|
||||
@@ -111,7 +139,7 @@ if($result = $db->db_query($qry))
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
$mitarbeiter_data=array();
|
||||
|
||||
|
||||
$error_person = false;
|
||||
$person_content='';
|
||||
$qryet="SELECT * FROM bis.tbl_entwicklungsteam WHERE mitarbeiter_uid=".$db->db_add_param($row->mitarbeiter_uid).";";
|
||||
@@ -123,7 +151,7 @@ if($result = $db->db_query($qry))
|
||||
}
|
||||
}
|
||||
$error_log='';
|
||||
|
||||
|
||||
if($row->gebdatum=='' || $row->gebdatum==NULL)
|
||||
{
|
||||
$error_log.=($error_log!=''?', ':'')."Geburtsdatum ('".$row->gebdatum."')";
|
||||
@@ -140,7 +168,9 @@ if($result = $db->db_query($qry))
|
||||
$mitarbeiter_data['personalnummer']=sprintf("%015s",$row->personalnummer);
|
||||
$mitarbeiter_data['vorname']=$row->vorname;
|
||||
$mitarbeiter_data['nachname']=$row->nachname;
|
||||
|
||||
$mitarbeiter_data['fixangestellt']=($row->fixangestellt=='t'?true:false);
|
||||
$mitarbeiter_data['lektor']=($row->lektor=='t'?true:false);
|
||||
|
||||
$person_content.="
|
||||
<Person>
|
||||
<PersonalNummer>".sprintf("%015s",$row->personalnummer)."</PersonalNummer>
|
||||
@@ -202,17 +232,17 @@ if($result = $db->db_query($qry))
|
||||
$verwendung_data[$key]['ba2code']=$rowvw->ba2code;
|
||||
$verwendung_data[$key]['beschausmasscode']=$rowvw->beschausmasscode;
|
||||
$verwendung_data[$key]['verwendung_code']=$rowvw->verwendung_code;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//Studiengangsleiter
|
||||
$qryslt="SELECT
|
||||
tbl_benutzerfunktion.*, tbl_studiengang.studiengang_kz
|
||||
FROM public.tbl_benutzerfunktion JOIN public.tbl_studiengang USING(oe_kurzbz)
|
||||
WHERE
|
||||
uid=".$db->db_add_param($row->mitarbeiter_uid)."
|
||||
AND funktion_kurzbz='Leitung'
|
||||
AND (datum_von<".$db->db_add_param($bisdatum)." OR datum_von is null)
|
||||
$qryslt="SELECT
|
||||
tbl_benutzerfunktion.*, tbl_studiengang.studiengang_kz
|
||||
FROM public.tbl_benutzerfunktion JOIN public.tbl_studiengang USING(oe_kurzbz)
|
||||
WHERE
|
||||
uid=".$db->db_add_param($row->mitarbeiter_uid)."
|
||||
AND funktion_kurzbz='Leitung'
|
||||
AND (datum_von<".$db->db_add_param($bisdatum)." OR datum_von is null)
|
||||
AND (datum_bis>".$db->db_add_param($bisprevious)." OR datum_bis is NULL)
|
||||
AND studiengang_kz>0
|
||||
AND studiengang_kz<10000;";
|
||||
@@ -259,7 +289,7 @@ if($result = $db->db_query($qry))
|
||||
$error_log.=($error_log!=''?', ':'')."BesondereQualifikationCode ('".$eteam[$rowfkt->studiengang_kz]."')";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$verwfkt_found=false;
|
||||
|
||||
// Wenn mehrere Verwendungen vorhanden sind fuer und funktionen fuer die gleichen Studiengaenge
|
||||
@@ -287,7 +317,7 @@ if($result = $db->db_query($qry))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$mitarbeiter_data['verwendung']=$verwendung_data;
|
||||
//Verwendungen ausgeben
|
||||
foreach($verwendung_data as $row_verwendung)
|
||||
{
|
||||
@@ -297,7 +327,7 @@ if($result = $db->db_query($qry))
|
||||
<BeschaeftigungsArt2>".$row_verwendung['ba2code']."</BeschaeftigungsArt2>
|
||||
<BeschaeftigungsAusmass>".$row_verwendung['beschausmasscode']."</BeschaeftigungsAusmass>
|
||||
<VerwendungsCode>".$row_verwendung['verwendung_code']."</VerwendungsCode>";
|
||||
|
||||
|
||||
if(isset($row_verwendung['stgltg']))
|
||||
{
|
||||
foreach($row_verwendung['stgltg'] as $row_stgl)
|
||||
@@ -340,14 +370,14 @@ if($result = $db->db_query($qry))
|
||||
}
|
||||
$person_content.="
|
||||
</Funktion>";
|
||||
}
|
||||
}
|
||||
}
|
||||
$person_content.="
|
||||
</Verwendung>";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$qry_count="SELECT 1 FROM bis.tbl_bisverwendung WHERE mitarbeiter_uid=".$db->db_add_param($row->mitarbeiter_uid);
|
||||
if($result_count=$db->db_query($qry_count))
|
||||
@@ -384,7 +414,7 @@ if($result = $db->db_query($qry))
|
||||
if($error_person)
|
||||
$v.='</span>';
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
if(!$error_person)
|
||||
{
|
||||
@@ -400,7 +430,10 @@ if($result = $db->db_query($qry))
|
||||
|
||||
echo ' <html><head><title>BIS - Meldung Mitarbeiter</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
|
||||
<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">';
|
||||
include('../../include/meta/jquery.php');
|
||||
include('../../include/meta/jquery-tablesorter.php');
|
||||
echo '
|
||||
</head><body>';
|
||||
echo "<H1>BIS - Mitarbeiterdaten werden überprüft (für Meldung ".$stsem." / $bisprevious - $bisdatum)</H1><br>";
|
||||
echo "Anzahl Mitarbeiter: Gesamt: ".$mitarbeiterzahl." / echter Dienstvertrag: ".$echt." / freier Dienstvertrag: ".$frei."<br><br>";
|
||||
@@ -416,13 +449,30 @@ fclose($dateiausgabe);
|
||||
|
||||
echo '<h2>Folgende Personen werden gemeldet</h2>
|
||||
Anzahl:'.count($mitarbeiter_gesamt).'
|
||||
<table>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function()
|
||||
{
|
||||
$("#t1").tablesorter(
|
||||
{
|
||||
sortList: [[2,0]],
|
||||
widgets: ["zebra"]
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<table class="tablesorter" id="t1">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>UID</th>
|
||||
<th>Vorname</th>
|
||||
<th>Nachname</th>
|
||||
<th>Personalnummer</th>
|
||||
<th>Fixangestellt</th>
|
||||
<th>Lektor</th>
|
||||
<th>BeschaeftigungsArt1</th>
|
||||
<th>BeschaeftigungsArt2</th>
|
||||
<th>Ausmass</th>
|
||||
<th>Verwendung</th>
|
||||
<th>Details (Funktion/Lehre)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>';
|
||||
@@ -434,6 +484,57 @@ foreach($mitarbeiter_gesamt as $row)
|
||||
echo '<td>'.$row['vorname'].'</td>';
|
||||
echo '<td>'.$row['nachname'].'</td>';
|
||||
echo '<td>'.$row['personalnummer'].'</td>';
|
||||
echo '<td>'.($row['fixangestellt']?'Ja':'Nein').'</td>';
|
||||
echo '<td>'.($row['lektor']?'Ja':'Nein').'</td>';
|
||||
foreach($row['verwendung'] as $row_verwendung)
|
||||
{
|
||||
// Ba1Code
|
||||
if(isset($ba1_arr[$row_verwendung['ba1code']]))
|
||||
echo '<td>'.$ba1_arr[$row_verwendung['ba1code']].'</td>';
|
||||
else
|
||||
echo '<td>'.$row_verwendung['ba1code'].'</td>';
|
||||
|
||||
// Ba2Code
|
||||
if(isset($ba2_arr[$row_verwendung['ba2code']]))
|
||||
echo '<td>'.$ba2_arr[$row_verwendung['ba2code']].'</td>';
|
||||
else
|
||||
echo '<td>'.$row_verwendung['ba2code'].'</td>';
|
||||
|
||||
// Ausmass
|
||||
if(isset($ausmass_arr[$row_verwendung['beschausmasscode']]))
|
||||
echo '<td>'.$ausmass_arr[$row_verwendung['beschausmasscode']].'</td>';
|
||||
else
|
||||
echo '<td>'.$row_verwendung['beschausmasscode'].'</td>';
|
||||
|
||||
// Verwendung
|
||||
if(isset($verwendung_arr[$row_verwendung['verwendung_code']]))
|
||||
echo '<td nowrap>'.$verwendung_arr[$row_verwendung['verwendung_code']].'</td>';
|
||||
else
|
||||
echo '<td nowrap>'.$row_verwendung['verwendung_code'].'</td>';
|
||||
|
||||
echo '<td nowrap>';
|
||||
// Details
|
||||
if(isset($row_verwendung['stgltg']))
|
||||
{
|
||||
|
||||
foreach($row_verwendung['stgltg'] as $row_stgl)
|
||||
{
|
||||
echo 'Leitung:'.$stg_obj->kuerzel_arr[$row_stgl];
|
||||
echo '<br>';
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($row_verwendung['fkt']))
|
||||
{
|
||||
foreach($row_verwendung['fkt'] as $row_fkt)
|
||||
{
|
||||
echo $stg_obj->kuerzel_arr[$row_fkt['stgkz']].': '.$row_fkt['sws'].' SWS';
|
||||
echo '<br>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</td>';
|
||||
}
|
||||
echo '</tr>';
|
||||
}
|
||||
echo '</tbody></table><br>';
|
||||
|
||||
@@ -72,6 +72,7 @@ if (!$uid = get_uid())
|
||||
$jahr_monat=trim(isset($_REQUEST['jahr_monat']) ? $_REQUEST['jahr_monat']:'');
|
||||
$afa=trim(isset($_REQUEST['afa']) ? $_REQUEST['afa']:'');
|
||||
$inventur_jahr=trim(isset($_REQUEST['inventur_jahr']) ? $_REQUEST['inventur_jahr']:'');
|
||||
$anlage_jahr_monat=trim(isset($_REQUEST['anlage_jahr_monat']) ? $_REQUEST['anlage_jahr_monat']:'');
|
||||
|
||||
$person_id=trim(isset($_REQUEST['person_id']) ? $_REQUEST['person_id']:'');
|
||||
if (!empty($person_id) && !is_numeric($person_id))
|
||||
@@ -503,6 +504,28 @@ if (!$uid = get_uid())
|
||||
<option <?php echo ($jahr_monat_select=='-' || empty($jahr_monat_select) ?' selected="selected" ':''); ?> value=""> - </option>
|
||||
</select>
|
||||
</td>
|
||||
<td><label for="anlage_jahr_monat">Anlagedatum</label>
|
||||
<select id="anlage_jahr_monat" name="anlage_jahr_monat">
|
||||
<?php
|
||||
$anlage_jahr_monat_select=trim((!isset($_REQUEST['anlage_jahr_monat'])? '-':$anlage_jahr_monat));
|
||||
$tmpJahr=(int)date("Y",mktime(0, 0, 0, 1, 1, date("Y")-12));
|
||||
for ($i=0;$i<12;$i++)
|
||||
{
|
||||
$tmpJahr=$tmpJahr + 1;
|
||||
$jjjjmm=$tmpJahr.'-00';
|
||||
echo '<option '.($anlage_jahr_monat_select==$tmpJahr?' selected="selected" ':'').' value="'.$tmpJahr.'"> --'.$tmpJahr.'-- </option>';
|
||||
for ($ii=1;$ii<=12;$ii++)
|
||||
{
|
||||
$jjjjmm=$tmpJahr.'-'.($ii<10?'0'."$ii":$ii);
|
||||
echo '<option '.($anlage_jahr_monat_select==$jjjjmm?' selected="selected" ':'').' value="'.$jjjjmm.'"> '.$jjjjmm.' </option>';
|
||||
if ($tmpJahr==date("Y") && $ii==date("m"))
|
||||
break;
|
||||
}
|
||||
}
|
||||
?>
|
||||
<option <?php echo ($anlage_jahr_monat_select=='-' || empty($anlage_jahr_monat_select) ?' selected="selected" ':''); ?> value=""> - </option>
|
||||
</select>
|
||||
</td>
|
||||
<td style="background-color: #FFFFDD;"> <a href="javascript:document.sendform.submit();"><img border="0" src="../../skin/images/application_go.png" alt="suchen"> suchen</a> <input style="display:none;" name="debug" value="<?php echo $debug;?>"></td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -824,12 +847,12 @@ if (!$uid = get_uid())
|
||||
if (empty($bestellung_id) && empty($bestellnr) )
|
||||
$bestelldetail_id='';
|
||||
|
||||
$check=$inventarnummer.$ort_kurzbz.$betriebsmittelstatus_kurzbz.$betriebsmitteltyp.$bestellung_id.$bestelldetail_id.$bestellnr.$hersteller.$afa.$jahr_monat.$firma_id.$inventur_jahr.$beschreibung.$oe_kurzbz.$seriennummer.$person_id.$betriebsmittel_id;
|
||||
$check=$inventarnummer.$ort_kurzbz.$betriebsmittelstatus_kurzbz.$betriebsmitteltyp.$bestellung_id.$bestelldetail_id.$bestellnr.$hersteller.$afa.$jahr_monat.$firma_id.$inventur_jahr.$beschreibung.$oe_kurzbz.$seriennummer.$person_id.$betriebsmittel_id.$anlage_jahr_monat;
|
||||
$order=null; // Sortierung
|
||||
|
||||
$oBetriebsmittel->result=array();
|
||||
$oBetriebsmittel->errormsg='';
|
||||
if ($check!='' && !$oBetriebsmittel->betriebsmittel_inventar($order,$inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id))
|
||||
if ($check!='' && !$oBetriebsmittel->betriebsmittel_inventar($order,$inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id, $anlage_jahr_monat))
|
||||
$errormsg[]=$oBetriebsmittel->errormsg;
|
||||
|
||||
echo '<form action="inventarliste.php" method="POST" target="_blank">
|
||||
@@ -851,6 +874,7 @@ if (!$uid = get_uid())
|
||||
<input type="hidden" name="seriennummer" value="'.$seriennummer.'">
|
||||
<input type="hidden" name="person_id" value="'.$person_id.'">
|
||||
<input type="hidden" name="betriebsmittel_id" value="'.$betriebsmittel_id.'">
|
||||
<input type="hidden" name="anlage_jahr_monat" value="'.$anlage_jahr_monat.'">
|
||||
<input type="submit" value="Excel Export" />
|
||||
</form>
|
||||
';
|
||||
|
||||
@@ -57,6 +57,7 @@ $afa=trim(isset($_REQUEST['afa']) ? $_REQUEST['afa']:'');
|
||||
$inventur_jahr=trim(isset($_REQUEST['inventur_jahr']) ? $_REQUEST['inventur_jahr']:'');
|
||||
$order = trim(isset($_REQUEST['order']) ? $_REQUEST['order']:'');
|
||||
$person_id = trim(isset($_REQUEST['person_id']) ? $_REQUEST['person_id']:'');
|
||||
$anlage_jahr_monat=trim(isset($_REQUEST['anlage_jahr_monat']) ? $_REQUEST['anlage_jahr_monat']:'');
|
||||
|
||||
$debug = false;
|
||||
$schreib_recht_administration=false;
|
||||
@@ -70,7 +71,7 @@ $oBetriebsmittelstatus->result=array();
|
||||
$resultBetriebsmittelstatus=$oBetriebsmittelstatus->result;
|
||||
|
||||
$oBetriebsmittel = new betriebsmittel();
|
||||
if (!$oBetriebsmittel->betriebsmittel_inventar($order,$inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id))
|
||||
if (!$oBetriebsmittel->betriebsmittel_inventar($order,$inventarnummer,$ort_kurzbz,$betriebsmittelstatus_kurzbz,$betriebsmitteltyp,$bestellung_id,$bestelldetail_id,$bestellnr,$hersteller,$afa,$jahr_monat,$firma_id,$inventur_jahr,$beschreibung,$oe_kurzbz,$seriennummer,$person_id,$betriebsmittel_id,$anlage_jahr_monat))
|
||||
$errormsg[]=$oBetriebsmittel->errormsg;
|
||||
|
||||
$resultBetriebsmittel = $oBetriebsmittel->result;
|
||||
|
||||
@@ -71,8 +71,6 @@ if(!$rechte->isBerechtigt('basis/statistik'))
|
||||
$sql = (isset($_POST['sql']) ? $_POST['sql'] : die('SQL fehlt'));
|
||||
$gruppe = (isset($_POST['gruppe']) ? $_POST['gruppe'] : die('Gruppe fehlt'));
|
||||
$content_id = (isset($_POST['content_id']) ? $_POST['content_id'] : die('ContentID fehlt'));
|
||||
$php = (isset($_POST['php']) ? $_POST['php'] : die('PHP fehlt'));
|
||||
$r = (isset($_POST['r']) ? $_POST['r'] : die('R fehlt'));
|
||||
$publish = (isset($_POST['publish']) ? true : false);
|
||||
$berechtigung_kurzbz = (isset($_POST['berechtigung_kurzbz']) ? $_POST['berechtigung_kurzbz'] : die('Berechtigungkurzbz fehlt'));
|
||||
$preferences = (isset($_POST['preferences']) ? $_POST['preferences'] : die('preferences fehlt'));
|
||||
@@ -91,8 +89,6 @@ if(!$rechte->isBerechtigt('basis/statistik'))
|
||||
$statistik->sql = $sql;
|
||||
$statistik->gruppe = $gruppe;
|
||||
$statistik->content_id = $content_id;
|
||||
$statistik->php = $php;
|
||||
$statistik->r = $r;
|
||||
$statistik->publish = $publish;
|
||||
$statistik->updateamum = date('Y-m-d H:i:s');
|
||||
$statistik->updatevon = $user;
|
||||
@@ -177,14 +173,6 @@ EOT;
|
||||
<td rowspan="3">SQL</td>
|
||||
<td rowspan="3"><textarea name="sql" cols="60" rows="5"><?php echo $statistik->sql ?></textarea></td>
|
||||
<td></td>
|
||||
<td>R</td>
|
||||
<td><input type="text" name="r" value="<?php echo $statistik->r ?>"></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td></td>
|
||||
<td>PHP</td>
|
||||
<td><input type="text" name="php" value="<?php echo $statistik->php ?>"></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td></td>
|
||||
<td>Publish</td>
|
||||
@@ -192,14 +180,18 @@ EOT;
|
||||
</tr>
|
||||
|
||||
<tr valign="top">
|
||||
<td></td>
|
||||
<td>Preferences</td>
|
||||
<td><textarea name="preferences" cols="60" rows="5"><?php echo $statistik->preferences ?></textarea></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="submit" value="Speichern" name="save"></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<div align="right" id="sub">
|
||||
<input type="submit" value="Speichern" name="save">
|
||||
</div>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Christian Paminger < christian.paminger@technikum-wien.at >
|
||||
* Authors: Christian Paminger < christian.paminger@technikum-wien.at > and
|
||||
* Andreas Moik < moik@technikum-wien.at >.
|
||||
*/
|
||||
require_once('../../config/vilesci.config.inc.php');
|
||||
require_once('../../include/globals.inc.php');
|
||||
@@ -50,41 +51,37 @@
|
||||
$filter->htmlattr = '';
|
||||
$filter->insertvon = $user;
|
||||
$filter->updatevon = $user;
|
||||
|
||||
if(isset($_POST["action"]) && isset($_REQUEST["filter_id"]))
|
||||
|
||||
if(isset($_POST["save"]) && isset($_REQUEST["filter_id"]))
|
||||
{
|
||||
if(!$rechte->isBerechtigt('basis/statistik', null, 'suid'))
|
||||
die('Sie haben keine Berechtigung fuer diese Aktion');
|
||||
|
||||
if ($_POST["action"]=='save')
|
||||
|
||||
if ($_REQUEST["filter_id"]!='')
|
||||
{
|
||||
if ($_REQUEST["filter_id"]!='')
|
||||
if($filter->load($_REQUEST["filter_id"]))
|
||||
{
|
||||
if($filter->load($_REQUEST["filter_id"]))
|
||||
{
|
||||
$filter->updatevon=$user;
|
||||
}
|
||||
else
|
||||
die('Fehlgeschlagen:'.$filter->errormsg);
|
||||
$filter->updatevon=$user;
|
||||
}
|
||||
|
||||
$filter->kurzbz = $_POST["kurzbz"];
|
||||
$filter->valuename = $_POST["valuename"];
|
||||
$filter->sql = $_POST["sql"];
|
||||
$filter->showvalue = isset($_POST["showvalue"]);
|
||||
$filter->type = $_POST["type"];
|
||||
$filter->htmlattr = $_POST["htmlattr"];
|
||||
|
||||
if(!$filter->save())
|
||||
{
|
||||
$errorstr .= $filter->errormsg;
|
||||
}
|
||||
|
||||
$reloadstr .= "<script type='text/javascript'>\n";
|
||||
$reloadstr .= " parent.frame_filter_overview.location.href='filter_overview.php';";
|
||||
$reloadstr .= "</script>\n";
|
||||
//echo '<pre>'.var_dump($filter).'</pre>';
|
||||
else
|
||||
die('Fehlgeschlagen:'.$filter->errormsg);
|
||||
}
|
||||
|
||||
$filter->kurzbz = $_POST["kurzbz"];
|
||||
$filter->valuename = $_POST["valuename"];
|
||||
$filter->sql = $_POST["sql"];
|
||||
$filter->showvalue = isset($_POST["showvalue"]);
|
||||
$filter->type = $_POST["type"];
|
||||
$filter->htmlattr = $_POST["htmlattr"];
|
||||
|
||||
if(!$filter->save())
|
||||
{
|
||||
$errorstr .= $filter->errormsg;
|
||||
}
|
||||
|
||||
$reloadstr .= "<script type='text/javascript'>\n";
|
||||
$reloadstr .= " parent.frame_filter_overview.location.href='filter_overview.php';";
|
||||
$reloadstr .= "</script>\n";
|
||||
}
|
||||
|
||||
if ((isset($_REQUEST['filter_id'])) && ((!isset($_REQUEST['neu'])) || ($_REQUEST['neu']!= "true")) && is_numeric($_REQUEST['filter_id']))
|
||||
@@ -94,12 +91,12 @@
|
||||
die($filter->errormsg);
|
||||
}
|
||||
|
||||
if($filter->filter_id > 0)
|
||||
$htmlstr .= "<br><div class='kopf'>Filter <b>".$filter->filter_id."</b></div>\n";
|
||||
else
|
||||
$htmlstr .="<br><div class='kopf'>Neuer Filter</div>\n";
|
||||
|
||||
if($filter->showvalue)
|
||||
if($filter->filter_id > 0)
|
||||
$htmlstr .= "<br><div class='kopf'>Filter <b>".$filter->filter_id."</b></div>\n";
|
||||
else
|
||||
$htmlstr .="<br><div class='kopf'>Neuer Filter</div>\n";
|
||||
|
||||
if($filter->showvalue)
|
||||
$chk = "checked";
|
||||
else
|
||||
$chk = '';
|
||||
@@ -126,8 +123,7 @@
|
||||
$htmlstr .= "<div align='right' id='sub'>\n";
|
||||
$htmlstr .= " <span id='submsg' style='color:red; visibility:hidden;'>Datensatz geändert! </span>\n";
|
||||
$htmlstr .= " <input type='hidden' name='filter_id' value='".$filter->filter_id."'>";
|
||||
$htmlstr .= " <input type='submit' value='save' name='action'>\n";
|
||||
$htmlstr .= " <input type='button' value='Reset' onclick='unchanged()'>\n";
|
||||
$htmlstr .= " <input type='submit' value='Speichern' name='save'>\n";
|
||||
$htmlstr .= "</div>";
|
||||
$htmlstr .= "</form>";
|
||||
$htmlstr .= "<div class='inserterror'>".$errorstr."</div>"
|
||||
@@ -139,13 +135,6 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
|
||||
<script type="text/javascript">
|
||||
function unchanged()
|
||||
{
|
||||
document.filterform.reset();
|
||||
document.filterform.schick.disabled = true;
|
||||
document.getElementById("submsg").style.visibility="hidden";
|
||||
checkrequired(document.filterform.filter_id);
|
||||
}
|
||||
|
||||
function checkrequired(feld)
|
||||
{
|
||||
|
||||
@@ -57,10 +57,10 @@ header( 'Content-Type: text/csv' );
|
||||
header( 'Content-Disposition: attachment;filename='.$filename);
|
||||
|
||||
|
||||
// Daten holen - Alle Personen mit akt. Status Student, Diplomand die bezahlt haben
|
||||
// Daten holen - Alle Personen mit akt. Status Student, Diplomand und Incoming die bezahlt haben
|
||||
$qry="
|
||||
SELECT * FROM (
|
||||
SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
|
||||
SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
|
||||
tbl_person.svnr,
|
||||
tbl_person.ersatzkennzeichen,
|
||||
tbl_person.gebdatum,
|
||||
@@ -69,28 +69,28 @@ SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
|
||||
tbl_person.geschlecht,
|
||||
tbl_student.studiengang_kz,
|
||||
tbl_student.student_uid,
|
||||
(SELECT plz FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_plz,
|
||||
(SELECT gemeinde FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_ort,
|
||||
(SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_strasse,
|
||||
(SELECT plz FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS heimat_plz,
|
||||
(SELECT gemeinde FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS heimat_ort,
|
||||
(SELECT plz FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_plz,
|
||||
(SELECT gemeinde FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_ort,
|
||||
(SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY zustelladresse desc LIMIT 1) AS zustell_strasse,
|
||||
(SELECT plz FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS heimat_plz,
|
||||
(SELECT gemeinde FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS heimat_ort,
|
||||
(SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS heimat_strasse,
|
||||
tbl_person.person_id
|
||||
FROM public.tbl_person
|
||||
JOIN public.tbl_konto as ka using(person_id)
|
||||
JOIN public.tbl_konto as kb using(person_id)
|
||||
JOIN public.tbl_benutzer using(person_id)
|
||||
FROM public.tbl_person
|
||||
JOIN public.tbl_konto as ka using(person_id)
|
||||
JOIN public.tbl_konto as kb using(person_id)
|
||||
JOIN public.tbl_benutzer using(person_id)
|
||||
JOIN public.tbl_student on(uid=student_uid)
|
||||
JOIN public.tbl_prestudent using(prestudent_id)
|
||||
JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id)
|
||||
WHERE
|
||||
tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand')
|
||||
WHERE
|
||||
tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Incoming','Absolvent')
|
||||
AND tbl_student.studiengang_kz<10000
|
||||
AND tbl_student.studiengang_kz>0
|
||||
AND tbl_student.studiengang_kz!='9".$erhalter_row->erhalter_kz."'
|
||||
AND ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=ka.studiengang_kz
|
||||
AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=kb.studiengang_kz
|
||||
AND ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=ka.studiengang_kz
|
||||
AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=kb.studiengang_kz
|
||||
AND kb.buchungsnr_verweis=ka.buchungsnr AND bismelden
|
||||
) a
|
||||
ORDER BY person_id";
|
||||
@@ -111,7 +111,7 @@ if($result = $db->db_query($qry))
|
||||
$data_row[2]=implode(';',$personenkennzeichen);
|
||||
$data_row[8]=implode(';',$studiengang_kz);
|
||||
|
||||
echo implode('|',$data_row)."\r\n";
|
||||
echo implode('|',$data_row)."|\r\n";
|
||||
$data_row = array();
|
||||
$personenkennzeichen = array();
|
||||
$studiengang_kz = array();
|
||||
@@ -124,7 +124,7 @@ if($result = $db->db_query($qry))
|
||||
|
||||
$data_row = array(
|
||||
sprintf('%1$03d',$erhalter_row->erhalter_kz),
|
||||
$erhalter_row->bezeichnung,
|
||||
$erhalter_row->bezeichnung,
|
||||
null,
|
||||
($row->svnr!=''?$row->svnr:$row->ersatzkennzeichen),
|
||||
$datum_obj->formatDatum($row->gebdatum,'Ymd'),
|
||||
@@ -140,7 +140,11 @@ if($result = $db->db_query($qry))
|
||||
$row->heimat_strasse,
|
||||
$row->student_uid.'@'.DOMAIN
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
$data_row[2]=implode(';',$personenkennzeichen);
|
||||
$data_row[8]=implode(';',$studiengang_kz);
|
||||
|
||||
echo implode('|',$data_row)."|\r\n";
|
||||
}
|
||||
|
||||
|
||||
@@ -121,3 +121,4 @@ $vars = $statistik->parseVars($variablenstring); ?>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user