From 3c5e5e347de04e4f08dd1b85e915d244dbcd2635 Mon Sep 17 00:00:00 2001 From: kindlm Date: Fri, 19 Feb 2016 16:49:45 +0100 Subject: [PATCH] Zeugnisvorlage bearbeitet Spalte Note als letzte Spalte; Nachname in Kleinbuchstaben --- rdf/zeugnis.rdf.php | 2 +- system/xsl/ZeugnisEngNeu_0.xsl | 44 ++++++++++++------------- system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl | 44 ++++++++++++------------- system/xsl/ZeugnisNeu_0.xsl | 42 +++++++++++------------ system/xsl/ZeugnisNeu_Lehrgaenge.xsl | 42 +++++++++++------------ 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php index ee7ce62a1..805b29aa0 100644 --- a/rdf/zeugnis.rdf.php +++ b/rdf/zeugnis.rdf.php @@ -186,7 +186,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml") $xml .= "\n ".$row->anrede.""; $xml .= "\n ".$row->vorname.""; $xml .= " ".$row->nachname.""; - $xml .= " ".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.mb_strtoupper($row->nachname).($row->titelpost!=''?', '.$row->titelpost:'')).""; + $xml .= " ".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.$row->nachname.($row->titelpost!=''?', '.$row->titelpost:'')).""; $gebdatum = date('d.m.Y',strtotime($row->gebdatum)); $xml .= " ".$gebdatum.""; $xml .= " ".trim($row->matrikelnr).""; diff --git a/system/xsl/ZeugnisEngNeu_0.xsl b/system/xsl/ZeugnisEngNeu_0.xsl index cbe495b24..361fc76ee 100644 --- a/system/xsl/ZeugnisEngNeu_0.xsl +++ b/system/xsl/ZeugnisEngNeu_0.xsl @@ -446,13 +446,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn Course - Grade1 + SP/W1 - SP/W2 + ECTS - ECTS + Grade2 @@ -464,19 +464,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - - ¹ Grades:excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar), + ¹ 1 Semester period per week = 45 minutes + ² Grades:excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar), Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg) - ² 1 Semester period per week = 45 minutes @@ -549,21 +549,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - + - - + - - - - - - - - - - @@ -571,6 +563,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn + + + + - + + + + @@ -649,19 +649,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - + + + diff --git a/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl b/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl index 4afd673f2..3240ac416 100644 --- a/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl +++ b/system/xsl/ZeugnisEngNeu_Lehrgaenge.xsl @@ -434,13 +434,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn Course - Grade1 + SP/W1 - SP/W2 + ECTS - ECTS + Grade2 @@ -452,19 +452,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - - ¹ Grades:excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar), + ¹ 1 Semester period per week = 45 minutes + ² Grades:excellent (1), very good (2), good (3), satisfactory (4), fail (5), not graded (nb), Credit based on previous experience/work (ar), Participated with success (met), passed (b), successfully completed (ea), not successfully completed (nea), did not participate (nt), participated(tg) - ² 1 Semester period per week = 45 minutes @@ -537,21 +537,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - + - - + - - - - - - - - - - @@ -559,6 +551,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn + + + + - + + + + @@ -637,19 +637,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - + + + diff --git a/system/xsl/ZeugnisNeu_0.xsl b/system/xsl/ZeugnisNeu_0.xsl index 81718283f..9d531ab1b 100644 --- a/system/xsl/ZeugnisNeu_0.xsl +++ b/system/xsl/ZeugnisNeu_0.xsl @@ -416,15 +416,15 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn Lehrveranstaltung - - Note - SWS - + ECTS + + Note + @@ -435,10 +435,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - @@ -494,21 +494,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - + - - + - - - - - - - - - - @@ -516,6 +508,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn + + + + - + + + + @@ -542,19 +542,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - + + + diff --git a/system/xsl/ZeugnisNeu_Lehrgaenge.xsl b/system/xsl/ZeugnisNeu_Lehrgaenge.xsl index 99fc13d81..1974c4671 100644 --- a/system/xsl/ZeugnisNeu_Lehrgaenge.xsl +++ b/system/xsl/ZeugnisNeu_Lehrgaenge.xsl @@ -416,15 +416,15 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn Lehrveranstaltung - - Note - SWS - + ECTS + + Note + @@ -435,10 +435,10 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - @@ -494,21 +494,13 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - + - - + - - - - - - - - - - @@ -516,6 +508,14 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn + + + + - + + + + @@ -542,19 +542,19 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn - - - + - + - + + +