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

Erfolgsnachweis korrekturen

Browse Source
This commit is contained in:
Andreas Österreicher
2014-12-17 13:42:53 +00:00
parent 5c3d4abf9c
commit 9b384b4563
3 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rdf/erfolgsnachweis.rdf.php
+24 -17
View File
@@ -108,7 +108,11 @@ $lehrveranstaltungen = array();
$ausbildungssemester = $row_sem->semester;
}
}
if($ausbildungssemester/2==0)
$ausbildungssemester2=$ausbildungssemester-1;
else
$ausbildungssemester2=$ausbildungssemester+1;
$student_studienjahr = round($ausbildungssemester/2);
$jahr1=mb_substr($studiensemester_kurzbz,2);
@@ -155,7 +159,7 @@ $lehrveranstaltungen = array();
$obj = new zeugnisnote();
$obj->getZeugnisnotenStudienplan($uid, array($studiensemester_kurzbz, $studiensemester_kurzbz2),$prestudent->studienplan_id);
foreach ($obj->result as $row)
@@ -164,29 +168,32 @@ $lehrveranstaltungen = array();
}
foreach($obj->result as $row)
{
//Gruppieren der Module
//$lvs['1']['childs']['2']=$obj;
if($row->studienplan_lehrveranstaltung_id_parent=='')
{
if($row->studienplan_lehrveranstaltung_semester==$ausbildungssemester || $row->studienplan_lehrveranstaltung_semester==$ausbildungssemester2)
{
$lehrveranstaltungen[$row->lehrveranstaltung_id]['data']=$row;
}
else
{
if(isset($lehrveranstaltungen[$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]))
//Gruppieren der Module
//$lvs['1']['childs']['2']=$obj;
if($row->studienplan_lehrveranstaltung_id_parent=='')
{
$lehrveranstaltungen[$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]['childs'][$row->lehrveranstaltung_id]['data'] = $row;
$lehrveranstaltungen[$row->lehrveranstaltung_id]['data']=$row;
}
else
{
foreach($lehrveranstaltungen as $key=>$row_module)
if(isset($lehrveranstaltungen[$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]))
{
if(isset($lehrveranstaltungen[$key]['childs'][$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]))
$lehrveranstaltungen[$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]['childs'][$row->lehrveranstaltung_id]['data'] = $row;
}
else
{
foreach($lehrveranstaltungen as $key=>$row_module)
{
$lehrveranstaltungen[$key]['childs'][$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]['childs'][$row->lehrveranstaltung_id]['data']=$row;
if(isset($lehrveranstaltungen[$key]['childs'][$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]))
{
$lehrveranstaltungen[$key]['childs'][$stpllv[$row->studienplan_lehrveranstaltung_id_parent]]['childs'][$row->lehrveranstaltung_id]['data']=$row;
}
}
}
}
}
}
}
@@ -210,7 +217,7 @@ function getLVRow($obj)
$row = $obj['data'];
if($row->zeugnis)
{
if ($row->note)
if ($row->note!=='')
$note = $note_arr[$row->note]['anmerkung'];
else
$note = "";
system/xsl/FHB_erfolgsnachweis_0_v1.xsl
+13 -4
View File
@@ -20,13 +20,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-properties style:width="17.006cm" fo:margin-left="0cm" table:align="left"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.A" style:family="table-column">
<style:table-column-properties style:column-width="2.200cm"/>
<style:table-column-properties style:column-width="2.700cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.B" style:family="table-column">
<style:table-column-properties style:column-width="0.326cm"/>
<style:table-column-properties style:column-width="0.126cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.C" style:family="table-column">
<style:table-column-properties style:column-width="7.549cm"/>
<style:table-column-properties style:column-width="7.249cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.D" style:family="table-column">
<style:table-column-properties style:column-width="1.362cm"/>
@@ -404,7 +404,16 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="PLegend">Internationale Beurteilung (ECTS Notenskala): A/B=Sehr Gut, C=Gut, D=Befriedigend, E=Genügend, F=Nicht Genügend</text:p>
<text:p text:style-name="PLegendEmpty"/>
<text:p text:style-name="PLegendEmpty"/>
<text:p text:style-name="PDatumOrt">Pinkafeld, am <xsl:value-of select="datum_aktuell"/></text:p>
<xsl:choose>
<xsl:when test="studiengang_kz='265' or studiengang_kz='268' or studiengang_kz='761' or studiengang_kz='760' or studiengang_kz='266' or studiengang_kz='267' or studiengang_kz='764' or studiengang_kz='269' or studiengang_kz='400'">
<text:p text:style-name="PDatumOrt">Pinkafeld, am <xsl:value-of select="datum_aktuell"/></text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="PDatumOrt">Eisenstadt, am <xsl:value-of select="datum_aktuell"/></text:p>
</xsl:otherwise>
</xsl:choose>
<table:table table:name="Tabelle2" table:style-name="Tabelle2">
<table:table-column table:style-name="Tabelle2.A"/>
<table:table-column table:style-name="Tabelle2.B"/>
system/xsl/FHB_erfolgsnachweis_head_0.xsl
+12
View File
@@ -63,6 +63,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:tab-stop style:position="17cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
</style:style>
<style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
<style:paragraph-properties text:number-lines="false" text:line-number="0">
<style:tab-stops>
<style:tab-stop style:position="8.5cm" style:type="center"/>
<style:tab-stop style:position="17cm" style:type="right"/>
</style:tab-stops>
</style:paragraph-properties>
</style:style>
<text:outline-style style:name="Outline">
<text:outline-level-style text:level="1" style:num-format="">
@@ -274,6 +282,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table>
<text:p text:style-name="MP4"/>
</style:header>
<style:footer>
<text:p text:style-name="Footer"></text:p>
<text:p text:style-name="Footer"></text:p>
</style:footer>
</style:master-page>
</office:master-styles>
</office:document-styles>