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

Browse Source
This commit is contained in:
Andreas Österreicher
2007-09-12 13:15:13 +00:00
parent 1a517593a7
commit 0ed0b655d2
7 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+2 -2
View File
@@ -1395,7 +1395,7 @@ if(!$error)
{
$zeugnisnote = new zeugnisnote($conn, null, true);
$error = false;
if(!is_numeric($_POST['matrikelnummer_'.$i]) || !is_numeric($_POST['note_'.$i]))
if(!is_numeric(trim($_POST['matrikelnummer_'.$i])) || !is_numeric($_POST['note_'.$i]))
{
$error = true;
$errormsg = "\nMatrikelnummer oder Note ist ungueltig: ".$_POST['matrikelnummer_'.$i].' - '.$_POST['note_'.$i];
@@ -1403,7 +1403,7 @@ if(!$error)
if(!$error)
{
$qry = "SELECT student_uid FROM public.tbl_student WHERE matrikelnr='".$_POST['matrikelnummer_'.$i]."'";
$qry = "SELECT student_uid FROM public.tbl_student WHERE trim(matrikelnr)='".trim($_POST['matrikelnummer_'.$i])."'";
if($result = pg_query($conn, $qry))
{
if($row = pg_fetch_object($result))
content/student/studentdetailoverlay.xul.php
+2 -2
View File
@@ -81,7 +81,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
<menulist id="student-detail-menulist-geburtsnation" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/nation/liste" >
<template>
<menupopup>
@@ -104,7 +104,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<row>
<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
ref="http://www.technikum-wien.at/nation/liste" >
<template>
<menupopup>
content/student/studentenoverlay.xul.php
+1 -1
View File
@@ -68,7 +68,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
<toolbarbutton id="student-toolbar-buchung" label="Neue Buchung" oncommand="StudentKontoNeu()" disabled="false" tooltiptext="neue Buchung anlegen"/>
<toolbarbutton label="Status ändern " type="menu">
<toolbarbutton label="Status ändern " id="student-toolbar-status" type="menu">
<menupopup id="student-status-menu-popup" >
<menuitem id="student-toolbar-abbrecher" label="-> Abbrecher" oncommand="StudentAddRolle('Abbrecher','0')" disabled="false" tooltiptext="Student zum Abbrecher machen" hidden="true"/>
<menuitem id="student-toolbar-unterbrecher" label="-> Unterbrecher" oncommand="StudentAddRolle('Unterbrecher','0')" disabled="false" tooltiptext="Student zum Unterbrecher machen" hidden="true"/>
content/student/studentoverlay.js.php
+7
View File
@@ -741,6 +741,13 @@ function StudentAuswahl()
verband=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verband" ));
gruppe=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gruppe" ));
prestudent_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#prestudent_id" ));
status=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#status" ));
//Bei Incoming wird das Menue zur Statusaenderung deaktiviert
if(status=='Incoming')
document.getElementById('student-toolbar-status').disabled=true;
else
document.getElementById('student-toolbar-status').disabled=false;
//Daten den Feldern zuweisen
rdf/nation.rdf.php
+19
View File
@@ -36,6 +36,25 @@ $rdf_url='http://www.technikum-wien.at/nation';
>
<RDF:Seq about="<?php echo $rdf_url ?>/liste">
<?php
if(isset($_GET['optional']) && $_GET['optional']=='true')
{
?>
<RDF:li>
<RDF:Description id="" about="<?php echo $rdf_url.'/'; ?>" >
<NATION:nation_code><![CDATA[]]></NATION:nation_code>
<NATION:entwicklungsstand><![CDATA[]]></NATION:entwicklungsstand>
<NATION:eu><![CDATA[]]></NATION:eu>
<NATION:ewr><![CDATA[]]></NATION:ewr>
<NATION:kontinent><![CDATA[]]></NATION:kontinent>
<NATION:kurztext><![CDATA[-- keine Auswahl --]]></NATION:kurztext>
<NATION:langtext><![CDATA[-- keine Auswahl --]]></NATION:langtext>
<NATION:engltext><![CDATA[-- keine Auswahl --]]></NATION:engltext>
<NATION:sperre><![CDATA[false]]></NATION:sperre>
</RDF:Description>
</RDF:li>
<?php
}
foreach ($nation->nation as $row)
{
?>
rdf/studienerfolg.rdf.php
+1 -1
View File
@@ -146,7 +146,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$xml .= " <unterrichtsfach>";
$xml .= " <bezeichnung><![CDATA[".$row->lehrveranstaltung_bezeichnung."]]></bezeichnung>";
$xml .= " <note>".$note."</note>";
$xml .= " <sws>".sprintf('%.1f',$row->semesterstunden/$wochen)."</sws>";
$xml .= " <sws>".sprintf('%.1f',$row->semesterstunden)."</sws>"; ///$wochen
$xml .= " <ects>".$row->ects."</ects>";
if($row->benotungsdatum!='')
$xml .= " <benotungsdatum>".date('d.m.Y',$datum->mktime_fromtimestamp($row->benotungsdatum))."</benotungsdatum>";
vilesci/admin/xslvorlagen/zeugnis.xsl
+21 -20
View File
@@ -18,7 +18,7 @@
<fo:page-sequence master-reference="PageMaster">
<fo:flow flow-name="xsl-region-body" >
<fo:block-container position="absolute" top="42mm" left="25mm" height="20mm">
<fo:block-container position="absolute" top="25mm" left="30mm" height="20mm">
<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="18pt">
<fo:inline font-weight="900">
<xsl:text>Zeugnis </xsl:text><xsl:value-of select="studiensemester" />
@@ -27,7 +27,7 @@
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="63mm" left="25mm" height="20mm">
<fo:block-container position="absolute" top="46mm" left="30mm" height="20mm">
<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="18pt">
<fo:inline font-weight="900">
<xsl:value-of select="studiengang_art" />\n
@@ -38,30 +38,31 @@
<fo:block-container position="absolute" top="85mm" left="145mm">
<fo:block-container position="absolute" top="68mm" left="140mm">
<fo:block line-height="14pt" font-family="sans-serif" font-size="10pt">
<xsl:text>Personenkennzahl: </xsl:text>
<xsl:text>Personenkennzeichen: </xsl:text>
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="85mm" left="177mm">
<fo:block-container position="absolute" top="68mm" left="177mm">
<fo:block content-width="80mm" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="matrikelnr" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="90mm" left="143mm">
<fo:block-container position="absolute" top="73mm" left="143mm">
<fo:block line-height="14pt" font-family="sans-serif" font-size="10pt">
<xsl:text>Kennzahl des Studiengangs: </xsl:text>
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="90mm" left="189mm">
<fo:block-container position="absolute" top="73mm" left="189mm">
<fo:block content-width="80mm" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang_kz" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="102mm" left="25mm" height="10mm">
<fo:block-container position="absolute" top="85mm" left="30mm" height="10mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="45mm"/>
<fo:table-column column-width="100mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell>
@@ -70,7 +71,7 @@
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-family="sans-serif" font-size="12pt" content-width="45mm" text-align="left">
<fo:block font-family="sans-serif" font-size="12pt" content-width="100mm" text-align="left">
<fo:inline font-weight="900"><xsl:value-of select="name" /></fo:inline>
</fo:block>
</fo:table-cell>
@@ -91,7 +92,7 @@
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="118mm" left="25mm">
<fo:block-container position="absolute" top="101mm" left="30mm">
<fo:table table-layout="fixed" border-collapse="separate" border-width="2pt" border-style="solid">
<fo:table-column column-width="85mm"/>
<fo:table-column column-width="30mm"/>
@@ -157,7 +158,7 @@
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="250mm" left="25mm" height="10mm">
<fo:block-container position="absolute" top="250mm" left="30mm" height="10mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="75mm"/>
<fo:table-column column-width="15mm"/>
@@ -174,7 +175,7 @@
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="8pt" content-width="75mm" text-align="center">
<fo:block font-size="10pt" content-width="75mm" text-align="center">
<xsl:value-of select="ort_datum" />
</fo:block>
</fo:table-cell>
@@ -195,16 +196,16 @@
<fo:table-row line-height="12pt">
<fo:table-cell>
<fo:block font-size="8pt" content-width="75mm" text-align="center">
<fo:block font-size="10pt" content-width="75mm" text-align="center">
<xsl:value-of select="studiengangsleiter" />
<xsl:text>\nStudiengangsleiter</xsl:text>
<xsl:text>\nStudiengangsleitung</xsl:text>
</fo:block></fo:table-cell>
<fo:table-cell>
<fo:block>
</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size="8pt" content-width="75mm" text-align="center">
<fo:block font-size="10pt" content-width="75mm" text-align="center">
Ort, Datum
</fo:block>
</fo:table-cell>
@@ -212,7 +213,7 @@
<fo:table-row line-height="10pt">
<fo:table-cell number-columns-spanned="3">
<fo:block font-size="8pt" content-width="165mm" text-align="center">
<fo:block font-size="10pt" content-width="165mm" text-align="center">
<xsl:text>Fachhochschule Technikum Wien\nHöchstädtplatz 5\nA-1200 Wien\nZVR-Nr.: 074476426\nDVR-Nr.:0928381</xsl:text>
</fo:block></fo:table-cell>
</fo:table-row>
@@ -233,10 +234,10 @@
<xsl:template match="unterrichtsfach">
<fo:table-row line-height="16pt">
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="85mm"><xsl:text> </xsl:text><xsl:value-of select="bezeichnung" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="30mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="85mm"><xsl:text> </xsl:text><xsl:value-of select="bezeichnung" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="30mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
</fo:table-row>
</xsl:template>