Erfolgsnachweis korrekturen

This commit is contained in:
Andreas Österreicher
2014-12-17 15:01:54 +00:00
parent 9b384b4563
commit 8e9d0788b5
3 changed files with 60 additions and 49 deletions
+32 -21
View File
@@ -166,35 +166,46 @@ $lehrveranstaltungen = array();
{
$stpllv[$row->studienplan_lehrveranstaltung_id] = $row->lehrveranstaltung_id;
}
foreach($obj->result as $row)
{
if($row->studienplan_lehrveranstaltung_semester==$ausbildungssemester || $row->studienplan_lehrveranstaltung_semester==$ausbildungssemester2)
{
//Gruppieren der Module
//$lvs['1']['childs']['2']=$obj;
if($row->studienplan_lehrveranstaltung_id_parent=='')
$durchlauf=0;
// Zweimal durchlaufen weil sonst manche Submodule nicht richtig erfasst werden
while($durchlauf<2)
{
foreach($obj->result as $row)
{
// Nur die betreffenden Semester mitnehmen da sonst ein durcheinander entsteht wenn die gleiche LV in verschiedenen Semester in unterschiedlichen
// Modulen verwendet wird
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=='') // 1. Ebene (Module)
{
$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)
{
// 2. Ebene
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
{
// 3. Ebene
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;
}
}
}
}
}
}
}
}
}
$durchlauf++;
}
$ects_gesamt = 0;
+20 -20
View File
@@ -50,12 +50,12 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-row-properties style:min-row-height="0.4cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.A1" style:family="table-cell">
<style:table-cell-properties fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
<style:table-cell-properties fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
<style:style style:name="Lehrveranstaltungen.I1" style:family="table-cell">
<style:table-cell-properties fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border="0.05pt solid #000000">
<style:table-cell-properties fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
@@ -63,22 +63,22 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-row-properties style:min-row-height="0.6cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.A2" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
<style:style style:name="Lehrveranstaltungen.D2" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
<style:style style:name="Lehrveranstaltungen.I2" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#e6e6e6" fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.30pt solid #000000" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
<style:style style:name="Lehrveranstaltungen.A3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.147cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.147cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.B3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
@@ -87,25 +87,25 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.D3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.E3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.F3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.G3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.H3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.I3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.A4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.B4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
@@ -114,28 +114,28 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.D4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.E4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.F4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.G4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.H4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.I4" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="0.30pt solid #000000" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.5" style:family="table-row">
<style:table-row-properties style:row-height="0.527cm"/>
</style:style>
<style:style style:name="Lehrveranstaltungen.A5" style:family="table-cell">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="0.05pt solid #000000">
<style:table-cell-properties style:vertical-align="middle" fo:background-color="#b3b3b3" fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="0.30pt solid #000000">
<style:background-image/>
</style:table-cell-properties>
</style:style>
+8 -8
View File
@@ -145,31 +145,31 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<style:table-column-properties style:column-width="4.256cm"/>
</style:style>
<style:style style:name="Tabelle1.A1" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Tabelle1.B1" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.05pt solid #000000" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.30pt solid #000000" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Tabelle1.D1" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" fo:border-top="0.05pt solid #000000" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.30pt solid #000000" fo:border-top="0.30pt solid #000000" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Tabelle1.A2" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Tabelle1.B2" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border="none"/>
</style:style>
<style:style style:name="Tabelle1.D2" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="none"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.30pt solid #000000" fo:border-top="none" fo:border-bottom="none"/>
</style:style>
<style:style style:name="Tabelle1.A3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.05pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="0.30pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Tabelle1.B3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="Tabelle1.D3" style:family="table-cell">
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.05pt solid #000000" fo:border-top="none" fo:border-bottom="0.05pt solid #000000"/>
<style:table-cell-properties fo:padding="0.097cm" fo:border-left="none" fo:border-right="0.30pt solid #000000" fo:border-top="none" fo:border-bottom="0.30pt solid #000000"/>
</style:style>
<style:style style:name="MP1" style:family="paragraph" style:parent-style-name="Standard">
<style:paragraph-properties fo:text-align="end" style:justify-single-word="false"/>