mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 10:22:18 +00:00
Merge Branche Cristina
This commit is contained in:
ma0068
@@ -54,7 +54,7 @@ $data = array
|
||||
'rolle_kurzbz' => 'admin',
|
||||
'berechtigung' => array
|
||||
(
|
||||
'admin', 'assistenz', 'basis/addon', 'basis/ampel', 'basis/ampeluebersicht', 'basis/benutzer', 'basis/berechtigung', 'basis/betriebsmittel', 'basis/cms', 'basis/cms_review', 'basis/cms_sperrfreigabe', 'basis/cronjob', 'basis/dms', 'basis/fas', 'basis/ferien', 'basis/fhausweis','basis/firma', 'basis/infoscreen', 'basis/moodle', 'basis/moodle','basis/news', 'basis/notiz', 'basis/organisationseinheit', 'basis/ort', 'basis/orgform', 'basis/person', 'basis/planner', 'basis/service', 'basis/statistik', 'basis/studiengang', 'basis/tempus', 'basis/testtool', 'basis/variable', 'basis/vilesci', 'buchung/typen', 'buchung/mitarbeiter', 'inout/incoming', 'inout/outgoing', 'inout/uebersicht', 'lehre', 'lehre/abgabetool', 'lehre/freifach', 'lehre/lehrfach', 'lehre/lehrveranstaltung', 'lehre/lvplan', 'lehre/lvinfo', 'lehre/pruefungsanmeldungAdmin', 'lehre/pruefungsbeurteilung', 'lehre/pruefungsbeurteilungAdmin', 'lehre/pruefungsterminAdmin', 'lehre/pruefungsfenster', 'lehre/reihungstest', 'lehre/reservierung', 'lehre/studienordnung', 'lehre/studienordnungInaktiv', 'lehre/studienplan', 'lehre/vorrueckung', 'lv-plan', 'lv-plan/gruppenentfernen', 'lv-plan/lektorentfernen', 'mitarbeiter', 'mitarbeiter/bankdaten', 'mitarbeiter/personalnummer', 'mitarbeiter/stammdaten', 'mitarbeiter/urlaube', 'mitarbeiter/zeitsperre', 'news', 'planner', 'preinteressent', 'raumres', 'reihungstest', 'sdTools', 'soap/lv', 'soap/lvplan', 'soap/mitarbeiter', 'soap/ort', 'soap/pruefungsfenster', 'soap/student', 'soap/studienordnung', 'soap/benutzer', 'soap/buchungen', 'student/bankdaten', 'student/anrechnung', 'student/anwesenheit', 'student/dokumente', 'student/noten', 'system/phrase', 'system/vorlage', 'system/vorlagestudiengang', 'student/stammdaten', 'student/vorrueckung', 'system/developer', 'system/loginasuser', 'user', 'veranstaltung', 'vertrag/mitarbeiter', 'vertrag/typen', 'wawi/berichte', 'wawi/bestellung', 'wawi/bestellung_advanced', 'wawi/budget', 'wawi/delete_advanced', 'wawi/firma', 'wawi/freigabe', 'wawi/freigabe_advanced', 'wawi/inventar', 'wawi/konto', 'wawi/kostenstelle', 'wawi/rechnung', 'wawi/rechnung_freigeben', 'wawi/rechnung_transfer', 'wawi/storno'
|
||||
'admin', 'assistenz', 'basis/addon', 'basis/ampel', 'basis/ampeluebersicht', 'basis/benutzer', 'basis/berechtigung', 'basis/betriebsmittel', 'basis/cms', 'basis/cms_review', 'basis/cms_sperrfreigabe', 'basis/cronjob', 'basis/dms', 'basis/fas', 'basis/ferien', 'basis/fhausweis','basis/firma', 'basis/infoscreen', 'basis/moodle', 'basis/moodle','basis/news', 'basis/notiz', 'basis/organisationseinheit', 'basis/ort', 'basis/orgform', 'basis/person', 'basis/planner', 'basis/service', 'basis/statistik', 'basis/studiengang', 'basis/tempus', 'basis/testtool', 'basis/variable', 'basis/vilesci', 'buchung/typen', 'buchung/mitarbeiter', 'inout/incoming', 'inout/outgoing', 'inout/uebersicht', 'lehre', 'lehre/abgabetool', 'lehre/freifach', 'lehre/lehrfach', 'lehre/lehrveranstaltung', 'lehre/lvplan', 'lehre/lvinfo', 'lehre/pruefungsanmeldungAdmin', 'lehre/pruefungsbeurteilung', 'lehre/pruefungsbeurteilungAdmin', 'lehre/pruefungsterminAdmin', 'lehre/pruefungsfenster', 'lehre/reihungstest', 'lehre/reservierung', 'lehre/studienordnung', 'lehre/studienordnungInaktiv', 'lehre/studienplan', 'lehre/vorrueckung', 'lv-plan', 'lv-plan/gruppenentfernen', 'lv-plan/lektorentfernen', 'mitarbeiter', 'mitarbeiter/bankdaten', 'mitarbeiter/personalnummer', 'mitarbeiter/stammdaten', 'mitarbeiter/urlaube', 'mitarbeiter/zeitsperre', 'mitarbeiter/zeitwuensche', 'news', 'planner', 'preinteressent', 'raumres', 'reihungstest', 'sdTools', 'soap/lv', 'soap/lvplan', 'soap/mitarbeiter', 'soap/ort', 'soap/pruefungsfenster', 'soap/student', 'soap/studienordnung', 'soap/benutzer', 'soap/buchungen', 'student/bankdaten', 'student/anrechnung', 'student/anwesenheit', 'student/dokumente', 'student/noten', 'system/phrase', 'system/vorlage', 'system/vorlagestudiengang', 'student/stammdaten', 'student/vorrueckung', 'system/developer', 'system/loginasuser', 'user', 'veranstaltung', 'vertrag/mitarbeiter', 'vertrag/typen', 'wawi/berichte', 'wawi/bestellung', 'wawi/bestellung_advanced', 'wawi/budget', 'wawi/delete_advanced', 'wawi/firma', 'wawi/freigabe', 'wawi/freigabe_advanced', 'wawi/inventar', 'wawi/konto', 'wawi/kostenstelle', 'wawi/rechnung', 'wawi/rechnung_freigeben', 'wawi/rechnung_transfer', 'wawi/storno'
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
@@ -171,6 +171,7 @@ $berechtigungen = array(
|
||||
array('mitarbeiter/stammdaten','Stammdaten der Mitarbeiter'),
|
||||
array('mitarbeiter/urlaube','Mit diesem Recht werden im CIS die Urlaube von allen Mitarbeiter sichtbar'),
|
||||
array('mitarbeiter/zeitsperre','Zeitsperren- und Urlaubsverwaltung'),
|
||||
array('mitarbeiter/zeitwuensche','Berechtigung um Zeitwünsche zu editieren'),
|
||||
array('news','News eintragen'),
|
||||
array('planner','Planner Verwaltung'),
|
||||
array('preinteressent','Verwaltung der Preinteressenten'),
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user