blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

PreIncoming

Browse Source 
- ECTS am Learnungagreement und in LV-Liste anzeigen
- Thesis und Research Area bei LVs auswählbar
- Anmeldung zu Deutschkursen
This commit is contained in:
Andreas Österreicher
2011-11-03 14:09:53 +00:00
parent 7406060d50
commit ac132ab06d
10 changed files with 347 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/public/incoming/akteupload.php
+9 -4
View File
@@ -145,11 +145,15 @@ if(isset($_GET['person_id']))
echo " <form method='POST' enctype='multipart/form-data' action='$PHP_SELF?person_id=".$_GET['person_id']."'>
<table>
<tr>
<td>".$p->t('incoming/dokument').": <input type='file' name='bild' />
<input type='submit' name='submitbild' value='Upload' /></td>
<td>".$p->t('incoming/dokument').":</td>
<td>
<input type='file' name='bild' />
</td>
</tr>
<tr>
<td>Typ: <SELECT name='dokumenttyp'>";
<td>".$p->t('incoming/dokumenttyp').":</td>
<td>
<SELECT name='dokumenttyp'>";
foreach ($dokument->result as $dok)
{
if($dok->dokument_kurzbz == 'Lebenslf' || $dok->dokument_kurzbz == 'Motivat' || $dok->dokument_kurzbz == 'Zeugnis' || $dok->dokument_kurzbz == 'Lichtbil' || $dok->dokument_kurzbz == 'LearnAgr')
@@ -165,7 +169,8 @@ echo " </select>
</tr>
<tr><td>&nbsp;</td></tr>
<tr>
<td><input type='button' value='close' onclick='window.opener.location.reload();window.close();'></td>
<td></td>
<td><input type='submit' name='submitbild' value='Upload' /></td>
</tr>
</table>
</form>";
cis/public/incoming/incoming.php
+183 -36
View File
@@ -88,7 +88,7 @@ $firma->getFirmen('Partneruniversität');
?>
<html>
<head>
<title>Incomming-Verwaltung</title>
<title>Incoming-Verwaltung</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
<link href="../../../include/js/tablesort/table.css" rel="stylesheet" type="text/css">
@@ -207,14 +207,61 @@ else if($method=="lehrveranstaltungen")
echo $p->t('global/fehleraufgetreten');
}
}
if(isset($_GET['mode']) && $_GET['mode'] == "thesis")
{
switch($_GET['thesis'])
{
case 'bachelor':
$preincoming->bachelorthesis=true;
$preincoming->masterthesis=true;
$preincoming->research_area=$_GET['research_area'];
if(!$preincoming->save(false))
echo $preincoming->errormsg;
break;
case 'master':
$preincoming->bachelorthesis=false;
$preincoming->masterthesis=true;
$preincoming->research_area=$_GET['research_area'];
if(!$preincoming->save(false))
echo $preincoming->errormsg;
break;
case '':
$preincoming->bachelorthesis=false;
$preincoming->masterthesis=false;
$preincoming->research_area='';
if(!$preincoming->save(false))
echo $preincoming->errormsg;
break;
}
}
if(isset($_GET['type']))
{
if(isset($_GET['mode']) && $_GET['mode']=='add')
{
if($_GET['type']=='deutschkurs1')
$preincoming->deutschkurs1=true;
elseif($_GET['type']=='deutschkurs2')
$preincoming->deutschkurs2=true;
if(!$preincoming->save(false))
echo $preincoming->errormsg;
}
elseif(isset($_GET['mode']) && $_GET['mode']=='delete')
{
if($_GET['type']=='deutschkurs1')
$preincoming->deutschkurs1=false;
if($_GET['type']=='deutschkurs2')
$preincoming->deutschkurs2=false;
if(!$preincoming->save(false))
echo $preincoming->errormsg;
}
}
// Übersicht der eigenen LVs
if(isset($_GET['view']))
{
if($_GET['view']=="own")
{
$lvs = $preincoming->getLehrveranstaltungen($preincoming->preincoming_id);
echo '<br><br><br>
echo '<br><br><br>
<table border ="0" width="100%">
<tr>
<td width="25%"></td>
@@ -223,7 +270,41 @@ else if($method=="lehrveranstaltungen")
<td width="25%"></td>
</tr>
<tr><td>&nbsp;</td></tr>
</table>
</table>';
if($preincoming->deutschkurs1 || $preincoming->deutschkurs2)
{
//Uebersicht Deutschkurse
echo '<table width="90%" border="0" align="center" class="table-stripeclass:alternate table-autostripe">
<thead align="center">
<tr class="liste">
<th width="6%"></th>
<th>'.$p->t('incoming/deutschkurse').'</th>
</tr>
</thead>
<tbody>';
//Deutschkurs1
if($preincoming->deutschkurs1)
{
echo '<tr>';
echo '<td> <a href="incoming.php?method=lehrveranstaltungen&mode=delete&type=deutschkurs1&view=own">'.$p->t('global/löschen').'</a></td>';
echo '<td>'.$p->t('incoming/deutschkurs1').'</td>';
echo '</tr>';
}
//Deutschkurs2
if($preincoming->deutschkurs2)
{
echo '<tr>';
echo '<td> <a href="incoming.php?method=lehrveranstaltungen&mode=delete&type=deutschkurs2&view=own">'.$p->t('global/löschen').'</a></td>';
echo '<td>'.$p->t('incoming/deutschkurs2').'</td>';
echo '</tr>';
}
echo '</tbody></table><br><br>';
}
echo '
<table width="90%" border="0" align="center" class="table-autosort:1 table-stripeclass:alternate table-autostripe">
<thead>
<tr class="liste">
@@ -269,9 +350,76 @@ else if($method=="lehrveranstaltungen")
<td width="25%" align="center"><input type="button" value="'.$p->t('incoming/hauptmenue').'" onclick="document.location.href = \'incoming.php\'";></td>
</tr>
</table> <br><br>';
//Uebersicht Deutschkurse
echo '<table width="90%" border="0" align="center" class="table-stripeclass:alternate table-autostripe">
<thead align="center">
<tr class="liste">
<th colspan="2">'.$p->t('incoming/deutschkurse').'</th>
</tr>
</thead>
<tbody>';
//Deutschkurs1
echo '<tr>';
if(!$preincoming->deutschkurs1)
echo '<td width="6%"><a href="incoming.php?method=lehrveranstaltungen&mode=add&type=deutschkurs1">'.$p->t('global/anmelden').'</a></td>';
else
echo '<td width="6%">'.$p->t('global/angemeldet').'</td>';
echo '<td>'.$p->t('incoming/deutschkurs1').'</td>';
echo '</tr>';
//Deutschkurs2
echo '<tr>';
if(!$preincoming->deutschkurs2)
echo '<td><a href="incoming.php?method=lehrveranstaltungen&mode=add&type=deutschkurs2">'.$p->t('global/anmelden').'</a></td>';
else
echo '<td>'.$p->t('global/angemeldet').'</td>';
echo '<td>'.$p->t('incoming/deutschkurs2').'</td>';
echo '</tr>';
echo '</tbody></table><br><br>';
echo '
<table width="90%" border="0" align="center" class="table-autosort:1 table-stripeclass:alternate table-autostripe">
<thead>
<tr class="liste">
<th>'.$p->t('incoming/thesis').'</th>
</tr>
</thead>
<tbody>
<tr valign="top">
<td>
<form action="incoming.php" method="GET">
<input type="hidden" name="mode" value="thesis" />
<input type="hidden" name="method" value="lehrveranstaltungen" />
<table>
<tr>
<td width="30%">
<input type="radio" name="thesis" value="" '.((!$preincoming->bachelorthesis && !$preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/nothesis').'<br>
<input type="radio" name="thesis" value="master" '.(($preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'<br>
<input type="radio" name="thesis" value="bachelor" '.(($preincoming->bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').'
</td>
<td valign="top">
'.$p->t('incoming/researcharea').'
</td>
<td>
<textarea name="research_area">'.$preincoming->research_area.'</textarea>
</td>
<td valign="bottom">
<input type="submit" value="'.$p->t('global/speichern').'">
</td>
</tr>
</table>
</form>
</tr>
</tbody>
</table>
<br><br>
';
//Uebersicht LVs
$qry = "SELECT
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz,
tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.ects,
tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.semester,
tbl_lehrveranstaltung.bezeichnung_english, tbl_lehrveranstaltung.incoming,
(
@@ -317,8 +465,7 @@ else if($method=="lehrveranstaltungen")
AND tbl_studiengang.aktiv order by studiengang_kz
";
echo ' <form action="incoming.php?method=lehrveranstaltungen" method="POST">
<table width="90%" border="0" align="center" class="table-autosort:1 table-stripeclass:alternate table-autostripe">
echo '<table width="90%" border="0" align="center" class="table-autosort:1 table-stripeclass:alternate table-autostripe">
<thead align="center">
<tr class="liste">
<th width="6%"></th>
@@ -326,6 +473,7 @@ else if($method=="lehrveranstaltungen")
<th class="table-sortable:numeric">'.$p->t('global/semester').'</th>
<th class="table-sortable:default">'.$p->t('global/lehrveranstaltung').'</th>
<th class="table-sortable:default">'.$p->t('global/lehrveranstaltung').' '.$p->t('global/englisch').'</th>
<th class="table-sortable:numeric">'.$p->t('incoming/ects').'</th>
<th>Info</th>
<th class="table-sortable:numeric">'.$p->t('incoming/freieplätze').'</th>
</tr>
@@ -351,6 +499,7 @@ else if($method=="lehrveranstaltungen")
echo '<td>',$row->semester,'</td>';
echo '<td>',$row->bezeichnung,'</td>';
echo '<td>',$row->bezeichnung_english,'</td>';
echo '<td>',$row->ects,'</td>';
echo '<td>
<a href="#Deutsch" class="Item" onclick="javascript:window.open(\'lvinfo.php?lv='.$row->lehrveranstaltung_id.'&amp;language=de\',\'Lehrveranstaltungsinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">Deutsch&nbsp;</a>
<a href="#Englisch" class="Item" onclick="javascript:window.open(\'lvinfo.php?lv='.$row->lehrveranstaltung_id.'&amp;language=en\',\'Lehrveranstaltungsinformation\',\'width=700,height=750,resizable=yes,menuebar=no,toolbar=no,status=yes,scrollbars=yes\');return false;">Englisch</a>
@@ -1298,7 +1447,7 @@ echo' <td>'.$p->t('incoming/abgelegtin').'</td>
<tr>
<td></td>
<td></td>
<td align="center"><input type="button" value="'.$p->t('incoming/uploadCv').'" onclick=FensterOeffnen("'.APP_ROOT.'/cis/public/incoming/akteupload.php?person_id='.$person->person_id.'&dokumenttyp=Lebenslf");></td>
<td align="center"><input type="button" value="'.$p->t('incoming/uploadCv').'" onclick=FensterOeffnen("'.APP_ROOT.'cis/public/incoming/akteupload.php?person_id='.$person->person_id.'&dokumenttyp=Lebenslf");></td>
<td></td>
</tr>
<tr>
@@ -1326,7 +1475,7 @@ echo' <td>'.$p->t('incoming/abgelegtin').'</td>
function FensterOeffnen(adresse)
{
MeinFenster = window.open(adresse, "Info", "width=500,height=500,left=100,top=200");
MeinFenster = window.open(adresse, "Info", "width=600,height=200");
MeinFenster.focus();
}
@@ -1365,40 +1514,38 @@ else if($method == 'files')
echo($p->t('global/fehleraufgetreten'));
}
}
echo '<script type="text/javascript">
echo '<script type="text/javascript">
function FensterOeffnen (adresse)
{
MeinFenster = window.open(adresse, "Info", "width=500,height=500,left=100,top=200");
MeinFenster = window.open(adresse, "Info", "width=600,height=200");
MeinFenster.focus();
}
</script>
<br><br><br>
<table border ="0" width="100%">
<tr>
<td width="25%"></td>
<td width="25%" align="center"><a href="'.APP_ROOT.'/cis/public/incoming/akteupload.php?person_id='.$person->person_id.'" onclick="FensterOeffnen(this.href); return false;">Upload File</a></td>
<td width="25%"></td>
<td width="25%"></td>
</tr>
<tr><td>&nbsp;</td></tr>
</table>';
<center>
<a href="'.APP_ROOT.'cis/public/incoming/akteupload.php?person_id='.$person->person_id.'" onclick="FensterOeffnen(this.href); return false;">',$p->t('incoming/fileupload'),'</a></td>
</center><br><br>';
$akte->getAkten($person->person_id);
echo '<table align="center" border="0">
<tr>
<th></th>
<th>'.$p->t('incoming/name').'</th>
<th>'.$p->t('global/bezeichnung').'</th>
</tr>';
foreach ($akte->result as $ak)
{
echo '<tr>
<td><a href="'.$_SERVER['PHP_SELF'].'?method=files&mode=delete&id='.$ak->akte_id.'"><img src="'.APP_ROOT.'skin/images/delete_round.png"</a></td>
<td><a href="'.APP_ROOT.'cis/public/incoming/akte.php?id='.$ak->akte_id.'">'.$ak->titel.'</a></td>
<td>'.$ak->bezeichnung.'</td>
</tr>';
if(count($akte->result)>0)
{
echo '<table align="center" border="0">
<tr>
<th></th>
<th>'.$p->t('incoming/name').'</th>
<th>'.$p->t('global/bezeichnung').'</th>
</tr>';
foreach ($akte->result as $ak)
{
echo '<tr>
<td><a href="'.$_SERVER['PHP_SELF'].'?method=files&mode=delete&id='.$ak->akte_id.'" title="delete"><img src="'.APP_ROOT.'skin/images/delete_round.png"</a></td>
<td><a href="'.APP_ROOT.'cis/public/incoming/akte.php?id='.$ak->akte_id.'">'.$ak->titel.'</a></td>
<td>'.$ak->bezeichnung.'</td>
</tr>';
}
echo '</table>';
}
echo '</table>';
}
// Ausgabe Menü
@@ -1423,7 +1570,7 @@ else
<td>5. <a href="learningAgreementPdf.php?id='.$preincoming->preincoming_id.'">'.$p->t('incoming/learningagreementerstellen').'</a></td>
</tr>
<tr>
<td>6. <a href="'.APP_ROOT.'/cis/public/incoming/akteupload.php?person_id='.$person->person_id.'&dokumenttyp=LearnAgr" onclick="FensterOeffnen(this.href); return false;">'.$p->t("incoming/uploadLearningAgreement").'</a></td>
<td>6. <a href="'.APP_ROOT.'cis/public/incoming/akteupload.php?person_id='.$person->person_id.'&dokumenttyp=LearnAgr" onclick="FensterOeffnen(this.href); return false;">'.$p->t("incoming/uploadLearningAgreement").'</a></td>
</tr>
<tr>
<td>7. <a href="incoming.php?method=files">'.$p->t("incoming/uploadvondateien").'</a></td>
@@ -1438,7 +1585,7 @@ else
echo '<script type="text/javascript">
function FensterOeffnen (adresse)
{
MeinFenster = window.open(adresse, "Info", "width=500,height=500,left=100,top=200");
MeinFenster = window.open(adresse, "Info", "width=500,height=200");
MeinFenster.focus();
}
</script>';
include/preincoming.class.php
+39 -20
View File
@@ -64,7 +64,9 @@ class preincoming extends basis_db
public $person_id_emergency;
public $person_id_coordinator_dep;
public $person_id_coordinator_int;
public $research_area;
public $deutschkurs1;
public $deutschkurs2;
/**
* Konstruktor
@@ -137,6 +139,9 @@ class preincoming extends basis_db
$this->person_id_emergency = $row->person_id_emergency;
$this->person_id_coordinator_dep = $row->person_id_coordinator_dep;
$this->person_id_coordinator_int = $row->person_id_coordinator_int;
$this->deutschkurs1 = ($row->deutschkurs1=='t'?true:false);
$this->deutschkurs2 = ($row->deutschkurs2=='t'?true:false);
$this->research_area = $row->research_area;
}
else
{
@@ -196,7 +201,10 @@ class preincoming extends basis_db
$obj->person_id_emergency = $row->person_id_emergency;
$obj->person_id_coordinator_dep = $row->person_id_coordinator_dep;
$obj->person_id_coordinator_int = $row->person_id_coordinator_int;
$obj->deutschkurs1 = ($row->deutschkurs1=='t'?true:false);
$obj->deutschkurs2 = ($row->deutschkurs2=='t'?true:false);
$obj->research_area = $row->research_area;
$this->result[] = $obj;
}
return true;
@@ -251,7 +259,8 @@ class preincoming extends basis_db
firma_id, anmerkung, universitaet, aktiv, bachelorthesis, masterthesis,
von, bis, code, uebernommen, insertamum, insertvon, updateamum, updatevon,
zgv, zgv_ort, zgv_datum, zgv_name, zgvmaster, zgvmaster_name, zgvmaster_datum, zgvmaster_ort, program_name,
bachelor, master, jahre, person_id_emergency, person_id_coordinator_dep, person_id_coordinator_int)
bachelor, master, jahre, person_id_emergency, person_id_coordinator_dep, person_id_coordinator_int,
deutschkurs1, deutschkurs2, research_area)
VALUES('.
$this->addslashes($this->person_id).', '.
$this->addslashes($this->mobilitaetsprogramm_code).', '.
@@ -282,7 +291,10 @@ class preincoming extends basis_db
$this->addslashes($this->jahre).', '.
$this->addslashes($this->person_id_emergency).', '.
$this->addslashes($this->person_id_coordinator_dep).', '.
$this->addslashes($this->person_id_coordinator_int).');';
$this->addslashes($this->person_id_coordinator_int).', '.
($this->deutschkurs1?'true':'false').', '.
($this->deutschkurs2?'true':'false').', '.
$this->addslashes($this->research_area).' );';
}
else
{
@@ -323,7 +335,10 @@ class preincoming extends basis_db
' jahre='.$this->addslashes($this->jahre).', '.
' person_id_emergency='.$this->addslashes($this->person_id_emergency).', '.
' person_id_coordinator_dep='.$this->addslashes($this->person_id_coordinator_dep).', '.
' person_id_coordinator_int='.$this->addslashes($this->person_id_coordinator_int).
' person_id_coordinator_int='.$this->addslashes($this->person_id_coordinator_int).', '.
' deutschkurs1='.($this->deutschkurs1?'true':'false').', '.
' deutschkurs2='.($this->deutschkurs2?'true':'false').', '.
' research_area='.$this->addslashes($this->research_area).' '.
' WHERE preincoming_id='.$this->preincoming_id.';';
}
@@ -576,21 +591,25 @@ class preincoming extends basis_db
$obj->insertamum = $row->insertamum;
$obj->insertvon = $row->insertvon;
$this->zgv = $row->zgv;
$this->zgv_ort = $row->zgv_ort;
$this->zgv_datum = $row->zgv_datum;
$this->zgv_name = $row->zgv_name;
$this->zgvmaster = $row->zgvmaster;
$this->zgvmaster_name = $row->zgvmaster_name;
$this->zgvmaster_datum = $row->zgvmaster_datum;
$this->zgvmaster_ort = $row->zgvmaster_ort;
$this->program_name = $row->program_name;
$this->bachelor = ($row->bachelor=='t'?true:false);
$this->master = ($row->master=='t'?true:false);
$this->jahre = $row->jahre;
$this->person_id_emergency = $row->person_id_emergency;
$this->person_id_coordinator_dep = $row->person_id_coordinator_dep;
$this->person_id_coordinator_int = $row->person_id_coordinator_int;
$obj->zgv = $row->zgv;
$obj->zgv_ort = $row->zgv_ort;
$obj->zgv_datum = $row->zgv_datum;
$obj->zgv_name = $row->zgv_name;
$obj->zgvmaster = $row->zgvmaster;
$obj->zgvmaster_name = $row->zgvmaster_name;
$obj->zgvmaster_datum = $row->zgvmaster_datum;
$obj->zgvmaster_ort = $row->zgvmaster_ort;
$obj->program_name = $row->program_name;
$obj->bachelor = ($row->bachelor=='t'?true:false);
$obj->master = ($row->master=='t'?true:false);
$obj->jahre = $row->jahre;
$obj->person_id_emergency = $row->person_id_emergency;
$obj->person_id_coordinator_dep = $row->person_id_coordinator_dep;
$obj->person_id_coordinator_int = $row->person_id_coordinator_int;
$obj->deutschkurs1 = ($row->deutschkurs1=='t'?true:false);
$obj->deutschkurs2 = ($row->deutschkurs2=='t'?true:false);
$obj->research_area = $row->research_area;
$obj->vorname = $row->vorname;
$obj->nachname = $row->nachname;
locale/de-AT/incoming.php
+12 -1
View File
@@ -46,4 +46,15 @@ $this->phrasen['incoming/nation']='Nation';
$this->phrasen['incoming/hauptmenue']='Hauptmenü';
$this->phrasen['incoming/welcomeToUAS']='Willkommen bei der Online Registrierung für Incomingstudierende an der Fachhochschule Technikum Wien!';
$this->phrasen['incoming/registration']='Registration';
?>
$this->phrasen['incoming/ects']='ECTS';
$this->phrasen['incoming/dokumenttyp']='Typ';
$this->phrasen['incoming/fileupload']='Neue Datei hochladen';
$this->phrasen['incoming/deutschkurse']='Deutschkurse';
$this->phrasen['incoming/deutschkurs1']='Deutsch für Anfänger';
$this->phrasen['incoming/deutschkurs2']='Deutsch Intensivkurs';
$this->phrasen['incoming/thesis']='Projektarbeiten';
$this->phrasen['incoming/nothesis']='keine Projektarbeit';
$this->phrasen['incoming/masterthesis']='Master Thesis';
$this->phrasen['incoming/bachelorthesis']='Bachelor Thesis';
$this->phrasen['incoming/researcharea']='Gebiet';
?>
locale/en-US/incoming.php
+12 -1
View File
@@ -46,4 +46,15 @@ $this->phrasen['incoming/nation']='Country';
$this->phrasen['incoming/hauptmenue']='Main Menu';
$this->phrasen['incoming/welcomeToUAS']='Welcome at the Online Registration Platform for Incoming Students at UAS Technikum Wien!';
$this->phrasen['incoming/registration']='Registration';
?>
$this->phrasen['incoming/ects']='ECTS';
$this->phrasen['incoming/dokumenttyp']='Type';
$this->phrasen['incoming/fileupload']='Upload new File';
$this->phrasen['incoming/deutschkurse']='German Courses';
$this->phrasen['incoming/deutschkurs1']='German for Beginners';
$this->phrasen['incoming/deutschkurs2']='Advanced German';
$this->phrasen['incoming/thesis']='[BA] [MA] Program (at UAS)';
$this->phrasen['incoming/nothesis']='no Thesis';
$this->phrasen['incoming/masterthesis']='Master Thesis';
$this->phrasen['incoming/bachelorthesis']='Bachelor Thesis';
$this->phrasen['incoming/researcharea']='Research Area';
?>
rdf/learningagreement.rdf.php
+1
View File
@@ -81,6 +81,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " <lehrveranstaltung>\n";
echo " <bezeichnung><![CDATA[$lehrveranstaltung->bezeichnung]]></bezeichnung>\n";
echo " <semester><![CDATA[$lehrveranstaltung->semester]]></semester>\n";
echo " <ects><![CDATA[$lehrveranstaltung->ects]]></ects>\n";
echo " <studiengang><![CDATA[$studiengang->english]]></studiengang>\n";
echo " </lehrveranstaltung>\n";
}
system/FH-Complete.txp
+41 -41
View File
@@ -40685,8 +40685,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>564</Top>
<Left>77</Left>
<Top>551</Top>
<Left>42</Left>
<z>0</z>
<Width>1013</Width>
<Height>590</Height>
@@ -40764,8 +40764,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>2127</Top>
<Left>1227</Left>
<Top>2131</Top>
<Left>1194</Left>
<z>0</z>
<Width>1053</Width>
<Height>356</Height>
@@ -41947,8 +41947,8 @@
<WorkSpaceShape2>
<Id>{B39C63FA-F416-40B5-A65C-C3CFA65D7A85}</Id>
</WorkSpaceShape2>
<NamePositionX>1250</NamePositionX>
<NamePositionY>954</NamePositionY>
<NamePositionX>1232</NamePositionX>
<NamePositionY>948</NamePositionY>
<Points>
<Point>
<x>1522</x>
@@ -41959,12 +41959,12 @@
<y>897</y>
</Point>
<Point>
<x>1121</x>
<y>859</y>
<x>1086</x>
<y>846</y>
</Point>
<Point>
<x>1090</x>
<y>859</y>
<x>1055</x>
<y>846</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -41990,16 +41990,16 @@
<WorkSpaceShape2>
<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
</WorkSpaceShape2>
<NamePositionX>1047</NamePositionX>
<NamePositionY>2023</NamePositionY>
<NamePositionX>1030</NamePositionX>
<NamePositionY>2025</NamePositionY>
<Points>
<Point>
<x>1754</x>
<y>2127</y>
<x>1720</x>
<y>2131</y>
</Point>
<Point>
<x>1754</x>
<y>2096</y>
<x>1720</x>
<y>2100</y>
</Point>
<Point>
<x>1668</x>
@@ -42205,16 +42205,16 @@
<WorkSpaceShape2>
<Id>{20F41636-8E77-4350-B677-A3F3B4033D9D}</Id>
</WorkSpaceShape2>
<NamePositionX>2108</NamePositionX>
<NamePositionY>317</NamePositionY>
<NamePositionX>2091</NamePositionX>
<NamePositionY>320</NamePositionY>
<Points>
<Point>
<x>2280</x>
<y>2246</y>
<x>2247</x>
<y>2250</y>
</Point>
<Point>
<x>2311</x>
<y>2246</y>
<x>2278</x>
<y>2250</y>
</Point>
<Point>
<x>2453</x>
@@ -42893,16 +42893,16 @@
<WorkSpaceShape2>
<Id>{6419EE86-CB44-41FA-9E2B-1C2555508A93}</Id>
</WorkSpaceShape2>
<NamePositionX>1027</NamePositionX>
<NamePositionY>2295</NamePositionY>
<NamePositionX>1011</NamePositionX>
<NamePositionY>2297</NamePositionY>
<Points>
<Point>
<x>1227</x>
<y>2246</y>
<x>1194</x>
<y>2250</y>
</Point>
<Point>
<x>1196</x>
<y>2246</y>
<x>1163</x>
<y>2250</y>
</Point>
<Point>
<x>1058</x>
@@ -42979,16 +42979,16 @@
<WorkSpaceShape2>
<Id>{5FEF0B42-3911-4B97-A654-2AD1A67125FC}</Id>
</WorkSpaceShape2>
<NamePositionX>1058</NamePositionX>
<NamePositionY>2629</NamePositionY>
<NamePositionX>1041</NamePositionX>
<NamePositionY>2632</NamePositionY>
<Points>
<Point>
<x>1227</x>
<y>2364</y>
<x>1194</x>
<y>2368</y>
</Point>
<Point>
<x>1196</x>
<y>2364</y>
<x>1163</x>
<y>2368</y>
</Point>
<Point>
<x>1120</x>
@@ -43151,16 +43151,16 @@
<WorkSpaceShape2>
<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
</WorkSpaceShape2>
<NamePositionX>2590</NamePositionX>
<NamePositionY>2098</NamePositionY>
<NamePositionX>2574</NamePositionX>
<NamePositionY>2100</NamePositionY>
<Points>
<Point>
<x>2280</x>
<y>2364</y>
<x>2247</x>
<y>2368</y>
</Point>
<Point>
<x>2311</x>
<y>2364</y>
<x>2278</x>
<y>2368</y>
</Point>
<Point>
<x>3069</x>
@@ -46321,7 +46321,7 @@
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
<ModifiedDate>2011-10-17T16:45:22.409+02:00</ModifiedDate>
<ModifiedDate>2011-10-25T17:15:48.845+02:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
system/checksystem.php
+20 -1
View File
@@ -2901,6 +2901,25 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_ampel"))
else
echo 'public.tbl_ampel: Tabellen fuer Ampelsystem hinzugefuegt!<br>';
}
//public.tbl_preincoming
if(!$result = @$db->db_query("SELECT research_area FROM public.tbl_preincoming LIMIT 1"))
{
$qry = "ALTER TABLE public.tbl_preincoming ADD COLUMN deutschkurs1 boolean;
ALTER TABLE public.tbl_preincoming ADD COLUMN deutschkurs2 boolean;
ALTER TABLE public.tbl_preincoming ADD COLUMN research_area text;
GRANT USAGE ON SCHEMA fue TO wawi;
GRANT SELECT ON fue.tbl_ressource TO wawi;
GRANT SELECT ON fue.tbl_projekt_ressurce TO wawi;
";
if(!$db->db_query($qry))
echo '<strong>public.tbl_preincoming: '.$db->db_last_error().'</strong><br>';
else
echo 'public.tbl_preincoming: Spalten hinzugefuegt!<br>';
}
echo '<br>';
$tabellen=array(
@@ -3035,7 +3054,7 @@ $tabellen=array(
"public.tbl_organisationseinheittyp" => array("organisationseinheittyp_kurzbz", "bezeichnung", "beschreibung"),
"public.tbl_person" => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode"),
"public.tbl_personfunktionstandort" => array("personfunktionstandort_id","funktion_kurzbz","person_id","standort_id","position","anrede"),
"public.tbl_preincoming" => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code"),
"public.tbl_preincoming" => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code","deutschkurs1","deutschkurs2","research_area"),
"public.tbl_preincoming_lehrveranstaltung" => array("preincoming_id","lehrveranstaltung_id","insertamum","insertvon"),
"public.tbl_preinteressent" => array("preinteressent_id","person_id","studiensemester_kurzbz","firma_id","erfassungsdatum","einverstaendnis","absagedatum","anmerkung","maturajahr","infozusendung","aufmerksamdurch_kurzbz","kontaktmedium_kurzbz","insertamum","insertvon","updateamum","updatevon"),
"public.tbl_preinteressentstudiengang" => array("studiengang_kz","preinteressent_id","freigabedatum","uebernahmedatum","prioritaet","insertamum","insertvon","updateamum","updatevon"),
system/xsl/learningAgreement_0_v1.xsl
+15 -3
View File
@@ -45,9 +45,10 @@
</fo:block-container>
<fo:block-container position="absolute" top="85mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="collapse" border-width="0.2pt" border-style="solid">
<fo:table-column column-width="95mm"/>
<fo:table-column column-width="65mm"/>
<fo:table-column column-width="85mm"/>
<fo:table-column column-width="60mm"/>
<fo:table-column column-width="20mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
@@ -65,6 +66,11 @@
Semester
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" font-weight="bold" content-width="15mm" text-align="center">
ECTS
</fo:block>
</fo:table-cell>
</fo:table-row>
<xsl:apply-templates select="lehrveranstaltung"/>
</fo:table-body>
@@ -103,7 +109,7 @@
</fo:block-container>
<fo:block-container position="absolute" top="250mm" left="159mm">
<fo:block line-height="10pt" font-family="arial" font-size="9pt">
<xsl:text>Institutinal Stamp</xsl:text>
<xsl:text>Institutional Stamp</xsl:text>
</fo:block>
</fo:block-container>
</fo:flow>
@@ -130,6 +136,12 @@
<xsl:value-of select="semester"/>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="15mm" text-align="center">
<xsl:text> </xsl:text>
<xsl:value-of select="ects"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >
vilesci/personen/incoming_detail.php
+15 -2
View File
@@ -1058,10 +1058,23 @@ function print_lehrveranstaltungen()
echo '<td>'.$row->semester.'. Semester</td>';
echo '</tr>';
}
echo '</tbody></table>';
echo '
<table class="tablesorter">
<thead>
<tr>
<th>Zusatzfächer</th>
</tr>
</thead>
<tbody>';
if($inc->bachelorthesis)
echo '<tr><td>Bachelor Thesis</td></tr>';
echo '<tr><td>Bachelor Thesis: '.$inc->research_area.'</td></tr>';
if($inc->masterthesis)
echo '<tr><td>Master Thesis</td></tr>';
echo '<tr><td>Master Thesis: '.$inc->research_area.'</td></tr>';
if($inc->deutschkurs1)
echo '<tr><td>Deutsch für Anfänger</td></tr>';
if($inc->deutschkurs2)
echo '<tr><td>Deutsch Intensivkurs</td></tr>';
echo '</tbody></table>';
echo '</fieldset>';
}