blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-06 22:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Andreas Österreicher
2007-09-25 06:51:51 +00:00
parent 752df70ddf
commit 19e6f7ecaa
8 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/mailverteiler.php
+2 -2
View File
@@ -157,7 +157,7 @@
$qry_stud = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row->studiengang_kz' AND student_uid NOT LIKE '_Dummy%'";
if(!$row_stud=pg_fetch_object(pg_query($conn, $qry_stud)))
echo 'Fehler beim laden der Studenten';
echo 'Fehler beim Laden der Studenten';
if($row_stud->anzahl>0)
{
@@ -194,7 +194,7 @@
echo "\n";
foreach($lv_obj->result as $row1)
{
if((!is_null($row1->semester)) AND ($row1->semester != "") AND ($row1->semester<=$row->max_semester)) //($row1->semester<'10'))
if((!is_null($row1->semester)) && ($row1->semester != "") && ($row1->semester<=$row->max_semester) && ($row1->semester>'0')) //($row1->semester<'10'))
{
$qry_cnt = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row1->studiengang_kz' AND semester='$row1->semester' AND student_uid NOT LIKE '_Dummy%'";
if(trim($row1->verband)!='')
cis/private/stud_in_grp.php
+1 -1
View File
@@ -29,7 +29,7 @@
}
else
{
$qry = "SELECT vorname, nachname, uid FROM campus.vw_student WHERE studiengang_kz='".addslashes($_GET['kz'])."'";
$qry = "SELECT vorname, nachname, uid FROM campus.vw_student WHERE aktiv=true AND studiengang_kz='".addslashes($_GET['kz'])."'";
if(isset($_GET['sem']))
$qry.=" AND semester='".addslashes($_GET['sem'])."'";
content/student/studentenoverlay.xul.php
+1 -1
View File
@@ -257,7 +257,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
<tab id="student-tab-dokumente" label="Dokumente" />
<tab id="student-tab-konto" label="Konto" />
<tab id="student-tab-betriebsmittel" label="Betriebsmittel" />
<tab id="student-tab-io" label="Incoming/Outgoing" />
<tab id="student-tab-io" label="Inc/Out" />
<tab id="student-tab-noten" label="Noten" />
<tab id="student-tab-zeugnis" label="Zeugnis" />
<tab id="student-tab-pruefung" label="Prüfung" />
content/student/studentoverlay.js.php
+16 -10
View File
@@ -3310,21 +3310,27 @@ function StudentSuche()
treeStudent.builder.addListener(StudentTreeListener);
//Detailfelder Deaktivieren
StudentDetailReset();
StudentDetailDisableFields(true);
StudentPrestudentDisableFields(true);
StudentKontoDisableFields(true);
StudentAkteDisableFields(true);
document.getElementById('student-betriebsmittel').setAttribute('src','');
StudentIODisableFields(true);
StudentNoteDisableFields(true);
document.getElementById('student-kontakt').setAttribute('src','');
StudentAbschlusspruefungDisableFields(true);
StudentDisableDetails();
}
else
alert('Es muessen mindestens 3 Zeichen eingegeben werden');
}
function StudentDisableDetails()
{
StudentDetailReset();
StudentDetailDisableFields(true);
StudentPrestudentDisableFields(true);
StudentKontoDisableFields(true);
StudentAkteDisableFields(true);
document.getElementById('student-betriebsmittel').setAttribute('src','');
StudentIODisableFields(true);
StudentNoteDisableFields(true);
document.getElementById('student-kontakt').setAttribute('src','');
StudentAbschlusspruefungDisableFields(true);
StudentProjektarbeitDisableAll();
}
// ****
// * Wenn im Suchfeld Enter gedrueckt wird, dann die Suchfunktion starten
// ****
content/student/studentprojektarbeit.js.php
+27 -8
View File
@@ -134,6 +134,26 @@ function StudentProjektarbeitTreeLoad(uid)
StudentProjektarbeitDisableFields(false);
}
// ****
// * Deaktiviert alle Felder in diesem Tab
// ****
function StudentProjektarbeitDisableAll()
{
//Tree Leeren
var tree = document.getElementById('student-projektarbeit-tree');
//Alte DS entfernen
var oldDatasources = tree.database.GetDataSources();
while(oldDatasources.hasMoreElements())
{
tree.database.RemoveDataSource(oldDatasources.getNext());
}
//Refresh damit die entfernten DS auch wirklich entfernt werden
tree.builder.rebuild();
StudentProjektarbeitDisableFields(true);
}
// ****
// * De-/Aktiviert die ProjektarbeitFelder
// ****
@@ -143,7 +163,9 @@ function StudentProjektarbeitDisableFields(val)
document.getElementById('student-projektarbeit-button-loeschen').disabled=val;
if(val)
{
StudentProjektarbeitDetailDisableFields(val);
}
}
// ****
@@ -398,16 +420,13 @@ function StudentProjektarbeitSpeichern()
anmerkung = document.getElementById('student-projektarbeit-textbox-anmerkung').value;
neu = document.getElementById('student-projektarbeit-checkbox-neu').checked;
var tree = document.getElementById('student-tree');
if (tree.currentIndex==-1)
student_uid =document.getElementById('student-detail-textbox-uid').value;
if(student_uid=='')
{
alert('Student muss ausgewaehlt sein');
return;
alert('UID dieser Person konnte nicht ermittelt werden');
return false;
}
var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
var student_uid=tree.view.getCellText(tree.currentIndex,col);
//Datum pruefen
if(beginn!='' && !CheckDatum(beginn))
{
rdf/diplomasupplement.xml.php
+1 -1
View File
@@ -136,7 +136,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$qry = "SELECT bezeichnung FROM lehre.tbl_abschlusspruefung JOIN lehre.tbl_abschlussbeurteilung USING(abschlussbeurteilung_kurzbz) WHERE student_uid='".$uid_arr[$i]."' ORDER BY datum DESC LIMIT 1";
if($result1 = pg_query($conn, $qry))
{
if($row1 = pg_fetch_object($result))
if($row1 = pg_fetch_object($result1))
{
echo " <beurteilung>$row1->bezeichnung</beurteilung>";
}
rdf/studienerfolg.rdf.php
+1 -1
View File
@@ -111,7 +111,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$xml .= " <semester>".$row->semester."</semester>";
$xml .= " <semester_aktuell>".$semester_aktuell.($semester_aktuell!=''?'. Semester':'')."</semester_aktuell>";
$xml .= " <studiengang>".$row->bezeichnung."</studiengang>";
$xml .= " <studiengang_kz>".$row->studiengang_kz."</studiengang_kz>";
$xml .= " <studiengang_kz>".sprintf('%04s',$row->studiengang_kz)."</studiengang_kz>";
$xml .= " <titelpre>".$row->titelpre."</titelpre>";
$xml .= " <titelpost>".$row->titelpost."</titelpost>";
$xml .= " <vorname>".$row->vorname."</vorname>";
vilesci/admin/xslvorlagen/studienerfolg.xsl
+31 -15
View File
@@ -17,22 +17,38 @@
<xsl:template match="studienerfolg">
<fo:page-sequence master-reference="PageMaster">
<fo:flow flow-name="xsl-region-body" >
<fo:block-container position="absolute" top="35mm" left="15mm" height="20mm">
<!-- Logo -->
<fo:block>
<fo:external-graphic src="../skin/images/logo.jpg" posx="140" posy="15" width="60mm" height="20mm" />
</fo:block>
<!-- Titel -->
<fo:block-container position="absolute" top="20mm" left="15mm">
<fo:block font-size="16pt">Fachhochschule Technikum Wien</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="26mm" left="15mm">
<fo:block font-size="12pt">Höchstädtplatz 5\nA-1200 Wien</fo:block>
<fo:block font-size="6pt">ZVR-Nr.: 074476426, DVR-Nr.: 0928381</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="45mm" left="15mm">
<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="16pt">
Bestätigung des Studienerfolges
</fo:block>
</fo:block-container>
<!--FINANZAMT-->
<fo:block-container position="absolute" top="45mm" left="15mm" height="20mm">
<fo:block-container position="absolute" top="55mm" left="15mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="8pt">
<xsl:value-of select="finanzamt" />
</fo:block>
</fo:block-container>
<!-- NAME - GEBURTSDATUM - MATRIKELNUMMER -->
<fo:block-container position="absolute" top="50mm" left="15mm" height="10mm">
<fo:block-container position="absolute" top="60mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="30mm"/>
@@ -59,25 +75,25 @@
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="55mm" left="16mm" height="20mm">
<fo:block-container position="absolute" top="65mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="titelpre" /><xsl:text> </xsl:text><xsl:value-of select="nachname" /><xsl:text> </xsl:text><xsl:value-of select="vorname" /><xsl:text> </xsl:text><xsl:value-of select="titelpost" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="55mm" left="137mm" height="20mm">
<fo:block-container position="absolute" top="65mm" left="137mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="gebdatum" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="55mm" left="167mm" height="20mm">
<fo:block-container position="absolute" top="65mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="matrikelnr" />
</fo:block>
</fo:block-container>
<!--STUDIENGANG UND KENNZAHL -->
<fo:block-container position="absolute" top="60.8mm" left="15mm" height="10mm">
<fo:block-container position="absolute" top="70.8mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="150.4mm"/>
<fo:table-column column-width="30mm"/>
@@ -98,19 +114,19 @@
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="66mm" left="16mm" height="20mm">
<fo:block-container position="absolute" top="76mm" left="16mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="66mm" left="167mm" height="20mm">
<fo:block-container position="absolute" top="76mm" left="167mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiengang_kz" />
</fo:block>
</fo:block-container>
<!-- Studiensemester - Ausbildungssemester -->
<fo:block-container position="absolute" top="71.6mm" left="15mm" height="10mm">
<fo:block-container position="absolute" top="81.6mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate">
<fo:table-column column-width="120mm"/>
<fo:table-column column-width="60.4mm"/>
@@ -131,26 +147,26 @@
</fo:table>
</fo:block-container>
<fo:block-container position="absolute" top="77mm" left="16mm" height="20mm">
<fo:block-container position="absolute" top="87mm" left="16mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="studiensemester_aktuell" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="77mm" left="137mm" height="20mm">
<fo:block-container position="absolute" top="87mm" left="137mm">
<fo:block text-align="left" line-height="10pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
<xsl:value-of select="semester_aktuell" />
</fo:block>
</fo:block-container>
<!-- TABELLE -->
<fo:block-container position="absolute" top="100mm" left="15mm" height="20mm">
<fo:block-container position="absolute" top="110mm" left="15mm">
<fo:block text-align="left" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
Folgende Prüfungen wurden erfolgreich abgelegt:
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="110mm" left="15mm">
<fo:block-container position="absolute" top="120mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="separate" border-width="0.2mm" border-style="solid">
<fo:table-column column-width="70mm"/>
<fo:table-column column-width="24mm"/>