mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
This commit is contained in:
Andreas Österreicher
+12
-3
@@ -8,8 +8,6 @@
|
||||
Die Liste ist in Module geteilt. Innerhalb eines Moduls erfolgt die
|
||||
Auflistung nach Priorität (höchste oben).<br>
|
||||
<h2>Änderungen</h2>
|
||||
<li>Emailversand an Privatadressen</li>
|
||||
<li>Filter fuer alle Studenten mit offenen Buchungen</li>
|
||||
<li>Ansicht fuer alle Gruppen in denen sich der Student befindet</li>
|
||||
|
||||
<br>
|
||||
@@ -42,11 +40,22 @@ content/statistik/lvplanung.php muss noch erstellt werden)</li>
|
||||
<br>
|
||||
<ul>
|
||||
<li>Absolventen Beendigungsdatum bei allen auf einmal setzbar</li>
|
||||
<li>Gegenbuchung fuer mehrere Buchungen auf einmal</li>
|
||||
</ul>
|
||||
<hr>
|
||||
<h2>Erledigte Anforderungen</h2>
|
||||
<ul>
|
||||
<li>Gegenbuchung fuer mehrere Buchungen auf einmal<br>
|
||||
22.08.2007<br><br></li>
|
||||
<li>Auf Zahlungsbestätigung immer den Absoluten Betrag anzeigen<br>
|
||||
22.08.2007 oesi<br><br></li>
|
||||
<li>In der Lehrauftragsliste soll Studiensemester/Studiengang/Ausbildungsseemster angezeigt werden<br>
|
||||
22.08.2007 oesi<br><br></li>
|
||||
<li>Wenn Semesterstunden bei Lektorenzuteilung geändert wird, dann sollen die Planstunden auch geändert werden<br>
|
||||
22.08.2007 oesi<br><br></li>
|
||||
<li>Emailversand an Privatadressen<br>
|
||||
22.08.2007 oesi<br><br></li>
|
||||
<li>Filter fuer alle Studenten mit offenen Buchungen<br>
|
||||
22.08.2007 oesi<br><br></li>
|
||||
<li>Bachelorarbeiten und Themengebiet am Zeugnis anzeigen<br>
|
||||
21.08.2007 <br><br></li>
|
||||
<li>Studiensemester am Lehrauftrag besser hervorheben<br>
|
||||
|
||||
@@ -644,8 +644,10 @@ function StatistikPrintLehrauftragsliste()
|
||||
var col;
|
||||
col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
|
||||
var studiengang_kz=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["sem"] : "sem";
|
||||
var semester=tree.view.getCellText(tree.currentIndex,col);
|
||||
|
||||
window.open('<?php echo APP_ROOT ?>content/statistik/lehrauftragsliste_gst.xls.php?studiengang_kz='+studiengang_kz,'Lehrauftragsliste');
|
||||
window.open('<?php echo APP_ROOT ?>content/statistik/lehrauftragsliste_gst.xls.php?studiengang_kz='+studiengang_kz+'&semester='+semester,'Lehrauftragsliste');
|
||||
}
|
||||
|
||||
// ****
|
||||
|
||||
@@ -349,7 +349,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
</row>
|
||||
<row>
|
||||
<label control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" value="Semesterstunden: "/>
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" disabled="true" maxlength="6" flex="1" oninput="LeMitarbeiterValueChanged();"/>
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-semesterstunden" disabled="true" maxlength="6" flex="1" oninput="LeMitarbeiterValueChanged(); if(parseInt(this.value)) document.getElementById('lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden').value= parseInt(this.value)"/>
|
||||
<label control="lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden" value="Planstunden: "/>
|
||||
<textbox id="lehrveranstaltung-lehreinheitmitarbeiter-textbox-planstunden" disabled="true" maxlength="3" flex="1" oninput="LeMitarbeiterValueChanged();"/>
|
||||
</row>
|
||||
|
||||
@@ -35,6 +35,11 @@ if(isset($_GET['studiengang_kz']) && is_numeric($_GET['studiengang_kz']))
|
||||
$studiengang_kz=$_GET['studiengang_kz'];
|
||||
else
|
||||
die('studiengangs_kz muss uebergeben werden');
|
||||
|
||||
if(isset($_GET['semester']) && is_numeric($_GET['semester']))
|
||||
$semester=$_GET['semester'];
|
||||
else
|
||||
$semester='';
|
||||
|
||||
$user = get_uid();
|
||||
loadVariables($conn, $user);
|
||||
@@ -46,7 +51,7 @@ $studiengang = new studiengang($conn, $studiengang_kz);
|
||||
$workbook = new Spreadsheet_Excel_Writer();
|
||||
|
||||
// sending HTTP headers
|
||||
$workbook->send("Lehrauftragsliste_GST_" . date("Y_m_d") . ".xls");
|
||||
$workbook->send("Lehrauftragsliste_".$semester_aktuell."_".$studiengang->kuerzel.($semester!=''?'_'.$semester:'').".xls");
|
||||
|
||||
// Creating a worksheet
|
||||
$worksheet =& $workbook->addWorksheet("Lehrauftragsliste");
|
||||
@@ -63,27 +68,29 @@ $format_number_bold->setNumFormat('0,0.00');
|
||||
$format_number_bold->setBold();
|
||||
|
||||
$i=0;
|
||||
|
||||
$worksheet->write(0,0,'Erstellt am '.date('d.m.Y').' '.$semester_aktuell.' '.$studiengang->kuerzel.' '.$semester, $format_bold);
|
||||
//Ueberschriften
|
||||
$worksheet->write(0,$i,"Studiengang", $format_bold);
|
||||
$worksheet->write(0,++$i,"Personalnr", $format_bold);
|
||||
$worksheet->write(0,++$i,"Titel", $format_bold);
|
||||
$worksheet->write(0,++$i,"Vorname", $format_bold);
|
||||
$worksheet->write(0,++$i,"Familienname", $format_bold);
|
||||
$worksheet->write(0,++$i,"Stunden", $format_bold);
|
||||
$worksheet->write(0,++$i,"Kosten", $format_bold);
|
||||
$worksheet->write(2,$i,"Studiengang", $format_bold);
|
||||
$worksheet->write(2,++$i,"Personalnr", $format_bold);
|
||||
$worksheet->write(2,++$i,"Titel", $format_bold);
|
||||
$worksheet->write(2,++$i,"Vorname", $format_bold);
|
||||
$worksheet->write(2,++$i,"Familienname", $format_bold);
|
||||
$worksheet->write(2,++$i,"Stunden", $format_bold);
|
||||
$worksheet->write(2,++$i,"Kosten", $format_bold);
|
||||
|
||||
//Daten holen
|
||||
$qry = "SELECT vw_lehreinheit.*, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre, tbl_mitarbeiter.personalnummer, tbl_person.person_id
|
||||
FROM campus.vw_lehreinheit, public.tbl_mitarbeiter, public.tbl_benutzer, public.tbl_person WHERE
|
||||
tbl_person.person_id = tbl_benutzer.person_id AND tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid AND
|
||||
vw_lehreinheit.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid AND
|
||||
studiengang_kz='$studiengang_kz' AND studiensemester_kurzbz='$semester_aktuell'
|
||||
ORDER BY nachname, vorname, mitarbeiter_uid";
|
||||
studiengang_kz='$studiengang_kz' AND studiensemester_kurzbz='$semester_aktuell'";
|
||||
if($semester!='')
|
||||
$qry.=" AND semester='$semester'";
|
||||
$qry.=" ORDER BY nachname, vorname, mitarbeiter_uid";
|
||||
|
||||
if($result = pg_query($conn, $qry))
|
||||
{
|
||||
$zeile=1;
|
||||
$zeile=3;
|
||||
$gesamtkosten = 0;
|
||||
$liste=array();
|
||||
|
||||
@@ -117,6 +124,8 @@ if($result = pg_query($conn, $qry))
|
||||
AND tbl_lehreinheit.lehreinheit_id=tbl_projektarbeit.lehreinheit_id AND tbl_lehreinheit.lehrfach_id=tbl_lehrfach.lehrfach_id AND
|
||||
tbl_lehreinheit.studiensemester_kurzbz='$semester_aktuell' AND tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
|
||||
tbl_lehrveranstaltung.studiengang_kz='$studiengang_kz'";
|
||||
if($semester!='')
|
||||
$qry.=" AND tbl_lehrveranstaltung.semester='$semester'";
|
||||
if($result = pg_query($conn, $qry))
|
||||
{
|
||||
while($row = pg_fetch_object($result))
|
||||
|
||||
@@ -873,46 +873,62 @@ if(!$error)
|
||||
elseif(isset($_POST['type']) && $_POST['type']=='savegegenbuchung')
|
||||
{
|
||||
//Speichert eine Buchung
|
||||
if(isset($_POST['buchungsnr']) && is_numeric($_POST['buchungsnr']))
|
||||
if(isset($_POST['buchungsnr']))
|
||||
{
|
||||
$buchung = new konto($conn, null, true);
|
||||
|
||||
if($buchung->load($_POST['buchungsnr']))
|
||||
$bnr_arr = explode(';',$_POST['buchungsnr']);
|
||||
$errormsg='';
|
||||
foreach ($bnr_arr as $buchungsnr)
|
||||
{
|
||||
if($buchung->buchungsnr_verweis=='')
|
||||
if(is_numeric($buchungsnr))
|
||||
{
|
||||
$kto = new konto($conn, null, true);
|
||||
//$buchung->betrag*(-1);
|
||||
$buchung->betrag = $kto->getDifferenz($_POST['buchungsnr']);
|
||||
$buchung->buchungsdatum = date('Y-m-d');
|
||||
$buchung->mahnspanne = '0';
|
||||
$buchung->buchungsnr_verweis = $buchung->buchungsnr;
|
||||
$buchung->new = true;
|
||||
$buchung->insertamum = date('Y-m-d H:i:s');
|
||||
$buchung->insertvon = $user;
|
||||
|
||||
if($buchung->save())
|
||||
$buchung = new konto($conn, null, true);
|
||||
|
||||
if($buchung->load($buchungsnr))
|
||||
{
|
||||
$data = $buchung->buchungsnr;
|
||||
$return = true;
|
||||
if($buchung->buchungsnr_verweis=='')
|
||||
{
|
||||
$kto = new konto($conn, null, true);
|
||||
//$buchung->betrag*(-1);
|
||||
$buchung->betrag = $kto->getDifferenz($buchungsnr);
|
||||
$buchung->buchungsdatum = date('Y-m-d');
|
||||
$buchung->mahnspanne = '0';
|
||||
$buchung->buchungsnr_verweis = $buchung->buchungsnr;
|
||||
$buchung->new = true;
|
||||
$buchung->insertamum = date('Y-m-d H:i:s');
|
||||
$buchung->insertvon = $user;
|
||||
|
||||
if($buchung->save())
|
||||
{
|
||||
//$data = $buchung->buchungsnr;
|
||||
$return = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg .= "\n".'Fehler beim Speichern:'.$buchung->errormsg;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg .= "\n".'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$errormsg .= "\n".'Buchung wurde nicht gefunden:'.$_POST['buchungsnr'];
|
||||
$return = false;
|
||||
$errormsg = 'Fehler beim Speichern:'.$buchung->errormsg;
|
||||
}
|
||||
}
|
||||
if($errormsg!='')
|
||||
{
|
||||
$return = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = 'Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden';
|
||||
$return = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$errormsg = 'Buchung wurde nicht gefunden:'.$_POST['buchungsnr'];
|
||||
$return = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1727,6 +1743,57 @@ if(!$error)
|
||||
$errormsg = 'Fehlerhafte Parameteruebergabe';
|
||||
}
|
||||
}
|
||||
elseif(isset($_POST['type']) && $_POST['type']=='getprivatemailadress')
|
||||
{
|
||||
if(isset($_POST['person_ids']))
|
||||
{
|
||||
$pers_arr = explode(';',$_POST['person_ids']);
|
||||
$data='';
|
||||
$anz_error=0;
|
||||
|
||||
foreach ($pers_arr as $person_id)
|
||||
{
|
||||
if(is_numeric($person_id))
|
||||
{
|
||||
$qry = "SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id='$person_id' ORDER BY zustellung LIMIT 1";
|
||||
if($result = pg_query($conn, $qry))
|
||||
{
|
||||
if($row = pg_fetch_object($result))
|
||||
{
|
||||
if($data!='')
|
||||
$data.=','.$row->kontakt;
|
||||
else
|
||||
$data = $row->kontakt;
|
||||
}
|
||||
else
|
||||
{
|
||||
$anz_error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if($data!='')
|
||||
{
|
||||
if($anz_error==0)
|
||||
$return = true;
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = "Bei $anz_error Personen wurde keine Emailadresse gefunden!";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = 'Es wurde keine Privatadresse gefunden';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
$errormsg = 'Fehlerhafte Parameteruebergabe';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$return = false;
|
||||
|
||||
@@ -100,89 +100,89 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
|
||||
context="student-tree-popup"
|
||||
>
|
||||
<treecols>
|
||||
<treecol id="student-treecol-uid" label="UID" flex="1" primary="false"
|
||||
<treecol id="student-treecol-uid" label="UID" flex="1" primary="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#uid" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-titelpre" label="TitelPre" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-titelpre" label="TitelPre" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#titelpre" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-nachname" label="Nachname" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-nachname" label="Nachname" flex="1" hidden="false" persist="hidden"
|
||||
sortActive="true"
|
||||
sortDirection="ascending"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#nachname" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-vorname" label="Vorname" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-vorname" label="Vorname" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#vorname" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-vornamen" label="Vornamen" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-vornamen" label="Vornamen" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#vornamen" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-titelpost" label="TitelPost" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-titelpost" label="TitelPost" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#titelpost" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-svnr" label="SVNR" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-svnr" label="SVNR" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#svnr" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-ersatzkennzeichen" label="Ersatzkennzeichen" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-ersatzkennzeichen" label="Ersatzkennzeichen" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-geburtsdatum" label="Geburtsdatum" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum_iso" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-semester" label="Sem." flex="1" hidden="false"
|
||||
<treecol id="student-treecol-semester" label="Sem." flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#semester" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-verband" label="Verb." flex="1" hidden="false"
|
||||
<treecol id="student-treecol-verband" label="Verb." flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#verband" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-gruppe" label="Grp." flex="1" hidden="false"
|
||||
<treecol id="student-treecol-gruppe" label="Grp." flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#gruppe" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-studiengang" label="Studiengang" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-studiengang" label="Studiengang" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-studiengang_kz" label="Studiengang_kz" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-studiengang_kz" label="Studiengang_kz" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#studiengang_kz" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-matrikelnummer" label="Personenkennzeichen" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-matrikelnummer" label="Personenkennzeichen" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#matrikelnummer" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-prestudent_id" label="PreStudentID" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#prestudent_id" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-person_id" label="PersonID" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-person_id" label="PersonID" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#person_id" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-status" label="Status" flex="1" hidden="false"
|
||||
<treecol id="student-treecol-status" label="Status" flex="1" hidden="false" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#status" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-mail_privat" label="EMail (Privat)" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-mail_privat" label="EMail (Privat)" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#mail_privat" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-mail_intern" label="EMail (Intern)" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-mail_intern" label="EMail (Intern)" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#mail_intern" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="student-treecol-anmerkungen" label="Anmerkungen" flex="1" hidden="true"
|
||||
<treecol id="student-treecol-anmerkungen" label="Anmerkungen" flex="1" hidden="true" persist="hidden"
|
||||
class="sortDirectionIndicator"
|
||||
sort="rdf:http://www.technikum-wien.at/student/rdf#anmerkungen" onclick="StudentTreeSort()"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
|
||||
@@ -44,13 +44,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<hbox flex="1">
|
||||
<grid id="student-konto-grid-detail" style="margin:4px;" flex="1">
|
||||
<columns >
|
||||
<column flex="1"/>
|
||||
<column flex="4"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<hbox>
|
||||
<spacer flex="1" />
|
||||
<button id="student-konto-button-filterstudenten" oncommand="StudentKontoFilterStudenten()" label="Filter" tooltiptext="Liste aller Studenten mit offenen Buchungen"/>
|
||||
<button id="student-konto-button-filter" value="alle" oncommand="StudentKontoFilter()" label="offene" disabled="true"/>
|
||||
</hbox>
|
||||
<spacer />
|
||||
|
||||
@@ -1593,11 +1593,11 @@ function StudentKontoTreeSelectBuchung()
|
||||
{
|
||||
//Alle subtrees oeffnen weil rowCount nur die Anzahl der sichtbaren
|
||||
//Zeilen zurueckliefert
|
||||
for(var i=items-1;i>=0;i--)
|
||||
{
|
||||
if(!tree.view.isContainerOpen(i))
|
||||
tree.view.toggleOpenState(i);
|
||||
}
|
||||
//for(var i=items-1;i>=0;i--)
|
||||
//{
|
||||
// if(!tree.view.isContainerOpen(i))
|
||||
// tree.view.toggleOpenState(i);
|
||||
//}
|
||||
|
||||
//Jetzt die wirkliche Anzahl (aller) Zeilen holen
|
||||
items = tree.view.rowCount;
|
||||
@@ -1736,6 +1736,65 @@ function StudentKontoFilter()
|
||||
kontotree.builder.addListener(StudentKontoTreeListener);
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Zeigt im Studententree nur diejenigen Studenten an die noch nicht alle Dokumente abgegeben haben
|
||||
// ****
|
||||
function StudentKontoFilterStudenten()
|
||||
{
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
var tree=document.getElementById('tree-verband');
|
||||
|
||||
//Wenn nichts markiert wurde -> beenden
|
||||
if(tree.currentIndex==-1)
|
||||
return;
|
||||
|
||||
// Progressmeter starten. Ab jetzt keine 'return's mehr.
|
||||
document.getElementById('statusbar-progressmeter').setAttribute('mode','undetermined');
|
||||
//globalProgressmeter.StartPM();
|
||||
|
||||
var col;
|
||||
col = tree.columns ? tree.columns["stg_kz"] : "stg_kz";
|
||||
var stg_kz=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["sem"] : "sem";
|
||||
var sem=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["ver"] : "ver";
|
||||
var ver=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["grp"] : "grp";
|
||||
var grp=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["gruppe"] : "gruppe";
|
||||
var gruppe=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["typ"] : "typ";
|
||||
var typ=tree.view.getCellText(tree.currentIndex,col);
|
||||
col = tree.columns ? tree.columns["stsem"] : "stsem";
|
||||
var stsem=tree.view.getCellText(tree.currentIndex,col);
|
||||
|
||||
stsem = getStudiensemester();
|
||||
url = "<?php echo APP_ROOT; ?>rdf/student.rdf.php?studiengang_kz="+stg_kz+"&semester="+sem+"&verband="+ver+"&gruppe="+grp+"&gruppe_kurzbz="+gruppe+"&studiensemester_kurzbz="+stsem+"&typ=student&filter2=konto&"+gettimestamp();
|
||||
var treeStudent=document.getElementById('student-tree');
|
||||
|
||||
//Alte DS entfernen
|
||||
var oldDatasources = treeStudent.database.GetDataSources();
|
||||
while(oldDatasources.hasMoreElements())
|
||||
{
|
||||
treeStudent.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
StudentTreeDatasource.removeXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.removeListener(StudentTreeListener);
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
StudentTreeDatasource = rdfService.GetDataSource(url);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
StudentTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
treeStudent.database.AddDataSource(StudentTreeDatasource);
|
||||
StudentTreeDatasource.addXMLSinkObserver(StudentTreeSinkObserver);
|
||||
treeStudent.builder.addListener(StudentTreeListener);
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Aktiviert / Deaktiviert die Konto Felder
|
||||
// ****
|
||||
@@ -1824,16 +1883,37 @@ function StudentKontoGegenbuchung()
|
||||
|
||||
StudentKontoDetailDisableFields(false);
|
||||
|
||||
var start = new Object();
|
||||
var end = new Object();
|
||||
var numRanges = tree.view.selection.getRangeCount();
|
||||
var paramList= '';
|
||||
|
||||
for (var t = 0; t < numRanges; t++)
|
||||
{
|
||||
tree.view.selection.getRangeAt(t,start,end);
|
||||
for (var v = start.value; v <= end.value; v++)
|
||||
{
|
||||
if(!tree.view.getParentIndex(v))
|
||||
{
|
||||
alert('Zum Drucken der Bestaetigung bitte die oberste Buchung waehlen');
|
||||
return false;
|
||||
}
|
||||
var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
|
||||
var buchungsnr=tree.view.getCellText(v,col);
|
||||
paramList += ';'+buchungsnr;
|
||||
}
|
||||
}
|
||||
|
||||
//Ausgewaehlte Nr holen
|
||||
var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
|
||||
var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
|
||||
//var col = tree.columns ? tree.columns["student-konto-tree-buchungsnr"] : "student-konto-tree-buchungsnr";
|
||||
//var buchungsnr=tree.view.getCellText(tree.currentIndex,col);
|
||||
|
||||
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
|
||||
var req = new phpRequest(url,'','');
|
||||
|
||||
req.add('type', 'savegegenbuchung');
|
||||
|
||||
req.add('buchungsnr', buchungsnr);
|
||||
req.add('buchungsnr', paramList);
|
||||
|
||||
var response = req.executePOST();
|
||||
|
||||
@@ -1842,13 +1922,15 @@ function StudentKontoGegenbuchung()
|
||||
if (!val.dbdml_return)
|
||||
{
|
||||
if(val.dbdml_errormsg=='')
|
||||
alert(response)
|
||||
alert(response);
|
||||
else
|
||||
alert(val.dbdml_errormsg)
|
||||
alert(val.dbdml_errormsg);
|
||||
StudentKontoTreeDatasource.Refresh(false); //non blocking
|
||||
}
|
||||
else
|
||||
{
|
||||
StudentKontoSelectBuchung=val.dbdml_data;
|
||||
//StudentKontoSelectBuchung=val.dbdml_data;
|
||||
StudentKontoSelectBuchung=null;
|
||||
StudentKontoTreeDatasource.Refresh(false); //non blocking
|
||||
SetStatusBarText('Daten wurden gespeichert');
|
||||
}
|
||||
@@ -2016,12 +2098,7 @@ function StudentCreateZeugnis()
|
||||
{
|
||||
tree.view.selection.getRangeAt(t,start,end);
|
||||
for (var v = start.value; v <= end.value; v++)
|
||||
{
|
||||
if(!tree.view.getParentIndex(v))
|
||||
{
|
||||
alert('Zum Drucken der Bestaetigung bitte die oberste Buchung waehlen');
|
||||
return false;
|
||||
}
|
||||
{
|
||||
var col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
|
||||
var uid=tree.view.getCellText(v,col);
|
||||
paramList += ';'+uid;
|
||||
@@ -3168,37 +3245,49 @@ function StudentSendMail()
|
||||
// ****
|
||||
function StudentSendMailPrivat()
|
||||
{
|
||||
mailempfaenger='';
|
||||
var tree=document.getElementById('student-tree');
|
||||
var numRanges = tree.view.selection.getRangeCount();
|
||||
var start = new Object();
|
||||
var end = new Object();
|
||||
var anzfault=0;
|
||||
var end = new Object();
|
||||
var person_ids='';
|
||||
|
||||
//Markierte Datensaetze holen
|
||||
for (var t=0; t<numRanges; t++)
|
||||
{
|
||||
tree.view.selection.getRangeAt(t,start,end);
|
||||
for (v=start.value; v<=end.value; v++)
|
||||
{
|
||||
var col = tree.columns ? tree.columns["student-treecol-mail_privat"] : "student-treecol-mail_privat";
|
||||
if(tree.view.getCellText(v,col).length>1)
|
||||
{
|
||||
if(mailempfaenger!='')
|
||||
mailempfaenger=mailempfaenger+','+tree.view.getCellText(v,col);
|
||||
else
|
||||
mailempfaenger='mailto:'+tree.view.getCellText(v,col);
|
||||
}
|
||||
else
|
||||
{
|
||||
anzfault=anzfault+1;
|
||||
}
|
||||
var col = tree.columns ? tree.columns["student-treecol-person_id"] : "student-treecol-person_id";
|
||||
person_ids=person_ids+';'+tree.view.getCellText(v,col);
|
||||
}
|
||||
}
|
||||
if(anzfault!=0)
|
||||
alert(anzfault+' Student konnten nicht hinzugefuegt werden weil keine Privatemailadresse eingetragen ist!');
|
||||
|
||||
if(mailempfaenger!='')
|
||||
window.location.href=mailempfaenger;
|
||||
|
||||
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
|
||||
var req = new phpRequest(url,'','');
|
||||
|
||||
req.add('type', 'getprivatemailadress');
|
||||
req.add('person_ids', person_ids);
|
||||
|
||||
var response = req.executePOST();
|
||||
|
||||
var val = new ParseReturnValue(response)
|
||||
|
||||
if (!val.dbdml_return)
|
||||
{
|
||||
if(val.dbdml_errormsg=='')
|
||||
alert(response)
|
||||
else
|
||||
{
|
||||
alert(val.dbdml_errormsg)
|
||||
if(val.dbdml_data!='')
|
||||
window.location.href='mailto:'+val.dbdml_data;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(val.dbdml_data!='')
|
||||
window.location.href='mailto:'+val.dbdml_data;
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
|
||||
Reference in New Issue
Block a user