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

Diplomasupplement, Studienerfolg, Zeugnis Dokumentvorlagen:

Browse Source 
- ECTS (Diplomasupplement, Studienerfolg, Zeugnis) and lv Gesamtstunden (studienerfolg) werden korrekt berechnet, nicht angezeigte negative Lvs werden ausgenommen.
This commit is contained in:
alex
2019-04-18 13:37:18 +02:00
parent d104ac6a7f
commit 86902a0d35
13 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rdf/diplomasupplement.xml.php
+14
View File
@@ -554,11 +554,13 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " <gradePrevLastYearEa>".sprintf("%01.1f",($noteArrayPrev[12]/$noten_anzahl*100))."</gradePrevLastYearEa>";
$ects_total = 0;
$ects_total_positiv = 0;
echo "<studiensemester>";
for($start = $semesterNumberStart; $start <= $semesterNumberEnd; $start++)
{
$semester_ects = 0;
$semester_ects_positiv = 0;
echo "<semesters>";
// alle semester für das ausbildungssemester holen
@@ -658,6 +660,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['sort'] = $row_stud->sort;
$ects_total += $row_stud->ects;
$semester_ects +=$row_stud->ects;
if ($arrayLvAusbildungssemester[$row_stud->lehrveranstaltung_id]['note_positiv'] === true)
{
$ects_total_positiv += $row_stud->ects;
$semester_ects_positiv += $row_stud->ects;
}
}
else
{
@@ -943,14 +950,21 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$ects_total +=$row_outgoing->ects;
$semester_ects+=$row_outgoing->ects;
if ($note_positiv_outgoing === true)
{
$ects_total_positiv += $row_outgoing->ects;
$semester_ects_positiv += $row_outgoing->ects;
}
}
}
}
echo '<ects_gesamt>'.$semester_ects.'</ects_gesamt>';
echo '<ects_gesamt_positiv>'.$semester_ects_positiv.'</ects_gesamt_positiv>';
echo "</semesters>";
}
echo "</studiensemester>";
echo " <ects_total>$ects_total</ects_total>";
echo " <ects_total_positiv>$ects_total_positiv</ects_total_positiv>";
echo ' </supplement>';
}
}
rdf/studienerfolg.rdf.php
+12
View File
@@ -209,8 +209,11 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$gesamtstunden=0;
$gesamtstunden_positiv=0;
$gesamtstunden_lv=0;
$gesamtstunden_lv_positiv=0;
$gesamtects=0;
$gesamtects_positiv=0;
$notensumme=0;
$anzahl=0;
@@ -256,6 +259,12 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
$gesamtstunden +=$sws;
$gesamtstunden_lv +=$sws_lv;
$gesamtects += $row->ects;
if ($row->note_positiv === true)
{
$gesamtstunden_positiv += $sws;
$gesamtstunden_lv_positiv += $sws_lv;
$gesamtects_positiv += $row->ects;
}
if($note_wert[$row->note]!='')
{
$notensumme += $note_wert[$row->note];
@@ -273,8 +282,11 @@ function draw_studienerfolg($uid, $studiensemester_kurzbz)
else
$schnitt = 0;
$xml .= " <gesamtstunden>".$gesamtstunden."</gesamtstunden>";
$xml .= " <gesamtstunden_positiv>".$gesamtstunden_positiv."</gesamtstunden_positiv>";
$xml .= " <gesamtstunden_lv>".$gesamtstunden_lv."</gesamtstunden_lv>";
$xml .= " <gesamtstunden_lv_positiv>".$gesamtstunden_lv_positiv."</gesamtstunden_lv_positiv>";
$xml .= " <gesamtects>$gesamtects</gesamtects>";
$xml .= " <gesamtects_positiv>$gesamtects_positiv</gesamtects_positiv>";
$xml .= " <schnitt>".sprintf('%.2f',$schnitt)."</schnitt>";
$xml .= " </studienerfolg>";
}
rdf/zeugnis.rdf.php
+5 -1
View File
@@ -258,7 +258,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$obj->getZeugnisnoten($lehrveranstaltung_id=null, $uid_arr[$i], $studiensemester_kurzbz);
$ects_gesamt = 0;
$ects_gesamt = $ects_gesamt_positiv = 0;
$prestudent_id = $row->prestudent_id;
foreach ($obj->result as $row)
{
@@ -415,6 +415,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
}
$ects_gesamt+=$ectspunkte;
if ($row->note_positiv === true)
$ects_gesamt_positiv += $ectspunkte;
$xml .= " <ects><![CDATA[".$ectspunkte."]]></ects>";
$xml .= " <lv_lehrform_kurzbz><![CDATA[".$row->lv_lehrform_kurzbz."]]></lv_lehrform_kurzbz>";
if($auslandssemester)
@@ -428,6 +431,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
}
}
$xml .= "<ects_gesamt><![CDATA[".$ects_gesamt."]]></ects_gesamt>";
$xml .= "<ects_gesamt_positiv><![CDATA[".$ects_gesamt_positiv."]]></ects_gesamt_positiv>";
$xml .= $xml_fussnote;
}
system/xsl/ZeugnisEng_0.xsl
+1 -1
View File
@@ -478,7 +478,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P13">-</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt_positiv"/></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
<text:p text:style-name="P9">-</text:p>
system/xsl/ZeugnisEng_Lehrgaenge.xsl
+1 -1
View File
@@ -466,7 +466,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P13">-</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt_positiv"/></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
<text:p text:style-name="P9">-</text:p>
system/xsl/Zeugnis_0.xsl
+1 -1
View File
@@ -450,7 +450,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P13">-</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt_positiv"/></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
<text:p text:style-name="P9">-</text:p>
system/xsl/Zeugnis_Lehrgaenge.xsl
+1 -1
View File
@@ -449,7 +449,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:p text:style-name="P13">-</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.C7" office:value-type="string">
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt"/></text:p>
<text:p text:style-name="P13"><xsl:value-of select="ects_gesamt_positiv"/></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle1.D7" office:value-type="string">
<text:p text:style-name="P9">-</text:p>
system/xsl/diplomaSupp_0.xsl
+2 -2
View File
@@ -2772,7 +2772,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table12.E5" office:value-type="string">
<text:p text:style-name="P65"><xsl:value-of select="ects_total"/></text:p>
<text:p text:style-name="P65"><xsl:value-of select="ects_total_positiv"/></text:p>
</table:table-cell>
<table:table-cell table:style-name="Table12.F5" office:value-type="string">
<text:p text:style-name="P65">
@@ -2890,7 +2890,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:table-cell table:style-name="Table12.E5" office:value-type="string">
<text:p text:style-name="P65">
<xsl:value-of select="ects_gesamt"/>
<xsl:value-of select="ects_gesamt_positiv"/>
</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table12.F5" office:value-type="string">
system/xsl/diplomaSupp_Lehrgaenge.xsl
+3 -3
View File
@@ -1652,10 +1652,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:table-cell table:style-name="Table4.C3" office:value-type="string">
<text:p text:style-name="P44">
<text:span text:style-name="Tabelleninhalt"><xsl:value-of select="semester"/> Semester | <xsl:value-of select="jahre"/> Jahre | <xsl:value-of select="ects_total"/> ECTS</text:span>
<text:span text:style-name="Tabelleninhalt"><xsl:value-of select="semester"/> Semester | <xsl:value-of select="jahre"/> Jahre | <xsl:value-of select="ects_total_positiv"/> ECTS</text:span>
</text:p>
<text:p text:style-name="P44">
<text:span text:style-name="Tabelleninhalt"><xsl:value-of select="semester"/> semester(s) | <xsl:value-of select="jahre"/> year(s) | <xsl:value-of select="ects_total"/> ECTS</text:span>
<text:span text:style-name="Tabelleninhalt"><xsl:value-of select="semester"/> semester(s) | <xsl:value-of select="jahre"/> year(s) | <xsl:value-of select="ects_total_positiv"/> ECTS</text:span>
</text:p>
</table:table-cell>
</table:table-row>
@@ -2896,7 +2896,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-cell>
<table:table-cell table:style-name="Table12.E5" office:value-type="string">
<text:p text:style-name="P65">
<xsl:value-of select="ects_gesamt"/>
<xsl:value-of select="ects_gesamt_positiv"/>
</text:p>
</table:table-cell>
<table:table-cell table:style-name="Table12.F5" office:value-type="string">
system/xsl/studienerfolgEng_0.xsl
+2 -2
View File
@@ -574,10 +574,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P25"/>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtects" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtects_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23">Average:</text:p>
system/xsl/studienerfolgEng_Lehrgaenge.xsl
+2 -2
View File
@@ -565,10 +565,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P25"/>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtects" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtects_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23">Average:</text:p>
system/xsl/studienerfolg_0.xsl
+2 -2
View File
@@ -572,10 +572,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P25"/>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtects" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtects_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23">Schnitt:</text:p>
system/xsl/studienerfolg_Lehrgaenge.xsl
+2 -2
View File
@@ -563,10 +563,10 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
<text:p text:style-name="P25"/>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtstunden_lv_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23"><xsl:value-of select="gesamtects" /></text:p>
<text:p text:style-name="P23"><xsl:value-of select="gesamtects_positiv" /></text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A2" office:value-type="string">
<text:p text:style-name="P23">Schnitt:</text:p>