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

Merge branch 'master' into feature/Anrechnungen_NEU

Browse Source
This commit is contained in:
cris-technikum
2021-06-21 17:18:07 +02:00
parent 2d6bd0af34 a3adce8776
commit bf3c8a344b
27 changed files with 411 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/xsl/StudienblattEng_0.xsl
+35 -3
View File
@@ -463,7 +463,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Current Semester of Study</text:p>
<xsl:choose>
<xsl:when test = "abbrecher='true'">
<text:p text:style-name="P4">Semester resigned from Study</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Current Semester of Study</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P2">
@@ -482,7 +492,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Current Semester in Degree Program</text:p>
<xsl:choose>
<xsl:when test = "abbrecher='true'">
<text:p text:style-name="P4">Resignation Semester in Degree Program</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Current Semester in Degree Program</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P2">
@@ -516,6 +536,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</text:span></text:p>
</table:table-cell>
</table:table-row>
<xsl:if test="abbrecher='false'">
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Expected Final Semester of Study</text:p>
@@ -535,9 +556,20 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</text:span></text:p>
</table:table-cell>
</table:table-row>
</xsl:if>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Expected Date of Graduation</text:p>
<xsl:choose>
<xsl:when test="abbrecher='true'">
<text:p text:style-name="P4">Resignation Date</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Expected Date of Graduation</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P15"><xsl:value-of select="voraussichtlichLetztesStudiensemester_datum"/></text:p>
system/xsl/Studienblatt_0.xsl
+36 -3
View File
@@ -426,7 +426,16 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Aktuelles Studiensemester</text:p>
<xsl:choose>
<xsl:when test = "abbrecher='true'">
<text:p text:style-name="P4">Abgemeldet im Studiensemester</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Aktuelles Studiensemester</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P2">
@@ -435,7 +444,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
</table:table-row>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Aktuelles Ausbildungssemester</text:p>
<xsl:choose>
<xsl:when test = "abbrecher='true'">
<text:p text:style-name="P4">Abgemeldet im Ausbildungssemester</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Aktuelles Ausbildungssemester</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P2">
@@ -451,6 +470,9 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:span text:style-name="T4"><xsl:value-of select="studierendenstatus_aktuell"/></text:span></text:p>
</table:table-cell>
</table:table-row>
<xsl:if test="abbrecher='false'">
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Voraussichtlich letztes Studiensemester</text:p>
@@ -460,9 +482,20 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
<text:span text:style-name="T4"><xsl:value-of select="voraussichtlichLetztesStudiensemester"/></text:span></text:p>
</table:table-cell>
</table:table-row>
</xsl:if>
<table:table-row table:style-name="Tabelle3.1">
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P4">Voraussichtliches Abschlussdatum</text:p>
<xsl:choose>
<xsl:when test="abbrecher='true'">
<text:p text:style-name="P4">Abgemeldet am</text:p>
</xsl:when>
<xsl:otherwise>
<text:p text:style-name="P4">Voraussichtliches Abschlussdatum</text:p>
</xsl:otherwise>
</xsl:choose>
</table:table-cell>
<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
<text:p text:style-name="P15"><xsl:value-of select="voraussichtlichLetztesStudiensemester_datum"/></text:p>