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

Browse Source
This commit is contained in:
Andreas Österreicher
2008-10-01 14:42:00 +00:00
parent 041463402e
commit 0bfcefb20a
8 changed files with 5907 additions and 5534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/ToDo_CIS.html
+5
View File
@@ -105,6 +105,11 @@ Hausordnung, Brandschutzordnung, ...), WebMail, Bibliothek</span></li>
<br>
<h2>Erledigte Anforderungen</h2>
<ul>
<li>Bei der Personensuche zus&auml;tzlich den Alias anzeigen</li>
<ul>
<li>01.10.2008<br>
</li>
</ul>
<li>Bei der Detailansicht einer Lehrveranstaltung werden die
LV-Leiter nun am Anfang und in Fett dargestellt.</li>
<ul>
cis/private/tools/psearch.php
+31 -7
View File
@@ -113,11 +113,11 @@
{
if($cmbChoice == "all")
{
$sql_query = "SELECT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe as teltw,(uid || '@".DOMAIN."') AS emailtw, foto,-1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort FROM campus.vw_mitarbeiter UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort FROM campus.vw_student WHERE semester<10 ORDER BY nachname, vorname";
$sql_query = "SELECT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe as teltw,(uid || '@".DOMAIN."') AS emailtw, foto,-1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias FROM campus.vw_mitarbeiter UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, vw_student.semester, ''::varchar as ort, alias FROM campus.vw_student WHERE vw_student.semester<10 ORDER BY nachname, vorname";
}
else
{
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion using(uid) WHERE funktion_kurzbz='$cmbChoice' AND aktiv UNION SELECT DISTINCT uid, titelpre,titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, semester, ''::varchar as ort FROM campus.vw_student JOIN public.tbl_benutzerfunktion using(uid) WHERE semester<10 AND funktion_kurzbz='$cmbChoice' AND aktiv ORDER BY nachname, vorname";
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion using(uid) WHERE funktion_kurzbz='$cmbChoice' AND aktiv UNION SELECT DISTINCT uid, titelpre,titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, vw_student.semester, ''::varchar as ort, alias FROM campus.vw_student JOIN public.tbl_benutzerfunktion using(uid) WHERE vw_student.semester<10 AND funktion_kurzbz='$cmbChoice' AND aktiv ORDER BY nachname, vorname";
}
}
else
@@ -125,11 +125,11 @@
$txtSearchQuery = addslashes($txtSearchQuery);
if($cmbChoice == "all")
{
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort FROM campus.vw_mitarbeiter WHERE (LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND aktiv=TRUE UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort FROM campus.vw_student WHERE semester<10 AND (LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) ORDER BY nachname, vorname";
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias FROM campus.vw_mitarbeiter WHERE (LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND aktiv=TRUE UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort, alias FROM campus.vw_student WHERE semester<10 AND (LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) ORDER BY nachname, vorname";
}
else
{
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion USING(uid) WHERE ((LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND funktion_kurzbz='$cmbChoice') AND aktiv=TRUE UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, semester, ''::varchar as ort FROM campus.vw_student JOIN public.tbl_benutzerfunktion USING(uid) WHERE semester <10 AND ((LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND funktion_kurzbz='$cmbChoice') AND aktiv=TRUE ORDER BY nachname, vorname";
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion USING(uid) WHERE ((LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND funktion_kurzbz='$cmbChoice') AND aktiv=TRUE UNION SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, vw_student.semester, ''::varchar as ort, alias FROM campus.vw_student JOIN public.tbl_benutzerfunktion USING(uid) WHERE vw_student.semester <10 AND ((LOWER(nachname) LIKE LOWER('%$txtSearchQuery%') OR uid LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(nachname || ' ' || vorname) LIKE LOWER('%$txtSearchQuery%') OR LOWER(vorname || ' ' || nachname) LIKE LOWER('%$txtSearchQuery%')) AND funktion_kurzbz='$cmbChoice') AND aktiv=TRUE ORDER BY nachname, vorname";
}
}
@@ -149,7 +149,8 @@
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Raum</font></td>
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Studiengang</font></td>
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Semester</font></td>
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Hauptverteiler</font></td>";
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Hauptverteiler</font></td>
<td align=\"left\" class=\"ContentHeader\" class='tdwrap'><font class=\"ContentHeader\">&nbsp;Alias</font></td>";
echo "</tr>
@@ -270,7 +271,11 @@
{
if($i % 2 == 0)
{
echo " <td align=\"left\" class='tdwrap'>&nbsp;<a href=\"mailto:$row->emailtw\" class=\"Item\">$row->emailtw</a></td>";
echo " <td align=\"left\" class='tdwrap'>&nbsp;";
echo "<a href=\"mailto:$row->emailtw\" class=\"Item\">$row->emailtw</a>";
//if($row->alias!='')
// echo "<br>&nbsp;<a href=\"mailto:$row->alias@".DOMAIN."\" class=\"Item\">$row->alias@".DOMAIN."</a>";
echo "</td>";
}
else
{
@@ -392,7 +397,26 @@
}
}
if($row->alias!='')
{
if($i%2==0)
echo "<td class='tdwrap'>";
else
echo '<td class="MarkLine">';
echo "<a href='mailto:$row->alias@".DOMAIN."' class='Item'>$row->alias@".DOMAIN."</a></td>";
}
else
{
if($i % 2 == 0)
{
echo " <td align=\"center\" class='tdwrap'>&nbsp;</td>";
}
else
{
echo " <td align=\"center\" class=\"MarkLine\" class='tdwrap'>&nbsp;</td>";
}
}
echo "</tr>";
}
content/FASo.pdf
+5779 -5511
View File
File diff suppressed because it is too large Load Diff
content/ToDo_FASo.html
+6
View File
@@ -436,6 +436,12 @@ Geburtsdatums<br>
<h2>Erledigte Anforderungen</h2>
<br>
<ul>
<li>Excel File das an die Gesch&auml;ftsstelle geschickt wird,
soll nur noch jene Lehrauftr&auml;ge enthalten bei denen auch eine
Gruppe zugeordnet ist<br>
01.10.2008 oesi<br>
<br>
</li>
<li>Anwesenheitslisten/Kontrolllisten mit Fotos<br>
29.09.2008 oesi - sind nun auf der CIS verf&uuml;gbar<br>
<br>
content/bildupload.php
+13 -1
View File
@@ -162,7 +162,19 @@ if(isset($_POST['submitbild']))
$person->foto = $content;
$person->new = false;
if($person->save())
echo "<b>Bild wurde erfolgreich gespeichert</b><script language='Javascript'>opener.StudentAuswahl(); opener.MitarbeiterAuswahl(); window.close();</script><br />";
echo "<b>Bild wurde erfolgreich gespeichert</b>
<script language='Javascript'>
if(typeof(opener.StudentAuswahl) == 'function')
opener.StudentAuswahl();
if(typeof(opener.MitarbeiterAuswahl) == 'function')
opener.MitarbeiterAuswahl();
if(typeof(opener.RefreshImage) == 'function' ||
typeof(opener.RefreshImage) == 'object')
{
opener.RefreshImage();
}
window.close();
</script><br />";
else
echo '<b>'.$person->errormsg.'</b><br />';
}
content/statistik/lehrauftragsliste_mail.xls.php
+16 -11
View File
@@ -158,6 +158,7 @@ if($result_stg = pg_query($conn, $qry_stg))
studiengang_kz='$studiengang_kz' AND studiensemester_kurzbz='$semester_aktuell' AND
tbl_lehreinheitmitarbeiter.semesterstunden<>0 AND tbl_lehreinheitmitarbeiter.semesterstunden is not null
AND tbl_lehreinheitmitarbeiter.stundensatz<>0 AND tbl_lehreinheitmitarbeiter.faktor<>0
AND EXISTS (SELECT lehreinheit_id FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
ORDER BY nachname, vorname, tbl_mitarbeiter.mitarbeiter_uid";
if($result = pg_query($conn, $qry))
@@ -222,23 +223,27 @@ if($result_stg = pg_query($conn, $qry_stg))
tbl_lehreinheitmitarbeiter.semesterstunden is not null AND
tbl_lehreinheitmitarbeiter.stundensatz<>0 AND
tbl_lehreinheitmitarbeiter.faktor<>0 AND
EXISTS (SELECT lehreinheit_id FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=tbl_lehreinheit.lehreinheit_id) AND
tbl_lehreinheit.studiensemester_kurzbz='$semester_aktuell');";
if($result = pg_query($conn, $qry))
{
while($row = pg_fetch_object($result))
{
$liste[$row->uid]['personalnummer'] = $row->personalnummer;
$liste[$row->uid]['titelpre'] = $row->titelpre;
$liste[$row->uid]['vorname'] = $row->vorname;
$liste[$row->uid]['nachname'] = $row->nachname;
$liste[$row->uid]['geaendert']=false;
$liste[$row->uid]['gesamtstunden'] = 0;
$liste[$row->uid]['gesamtkosten'] = 0;
$liste[$row->uid]['lvstunden'] = 0;
$liste[$row->uid]['lvkosten'] = 0;
$liste[$row->uid]['betreuergesamtstunden'] = 0;
$liste[$row->uid]['betreuergesamtkosten'] = 0;
if(!isset($liste[$row->uid]))
{
$liste[$row->uid]['personalnummer'] = $row->personalnummer;
$liste[$row->uid]['titelpre'] = $row->titelpre;
$liste[$row->uid]['vorname'] = $row->vorname;
$liste[$row->uid]['nachname'] = $row->nachname;
$liste[$row->uid]['geaendert']=false;
$liste[$row->uid]['gesamtstunden'] = 0;
$liste[$row->uid]['gesamtkosten'] = 0;
$liste[$row->uid]['lvstunden'] = 0;
$liste[$row->uid]['lvkosten'] = 0;
$liste[$row->uid]['betreuergesamtstunden'] = 0;
$liste[$row->uid]['betreuergesamtkosten'] = 0;
}
}
}
include/akte.class.php
+1
View File
@@ -42,6 +42,7 @@ class akte
var $insertamum;
var $insertvon;
var $uid;
var $ext_id;
// ***********************************************
// * Konstruktor
vilesci/personen/personen_details.php
+56 -4
View File
@@ -33,6 +33,7 @@ require_once('../../include/mitarbeiter.class.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/nation.class.php');
require_once('../../include/ort.class.php');
require_once('../../include/fckeditor/fckeditor.php');
if(!$conn=pg_pconnect(CONN_STRING))
die("Fehler beim Connecten zur Datenbank");
@@ -43,6 +44,28 @@ echo '
<title>Details</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<script language="javascript">
// ****
// * Liefert einen Timestamp in Sekunden
// * zum anhaengen an eine URL um Caching zu verhindern
// ****
function gettimestamp()
{
var now = new Date();
var ret = now.getHours()*60*60*60;
ret = ret + now.getMinutes()*60*60;
ret = ret + now.getSeconds()*60;
ret = ret + now.getMilliseconds();
return ret;
}
function RefreshImage()
{
path=document.getElementById("personimage").src;
document.getElementById("personimage").src="";
document.getElementById("personimage").src=path+"&"+gettimestamp();
}
</script>
</head>
<body class="background_main">
@@ -92,7 +115,8 @@ $ort_kurzbz = (isset($_POST['ort_kurzbz'])?$_POST['ort_kurzbz']:'');
$standort_kurzbz = (isset($_POST['standort_kurzbz'])?$_POST['standort_kurzbz']:'');
$anmerkung = (isset($_POST['anmerkung'])?$_POST['anmerkung']:'');
$bismelden = (isset($_POST['bismelden'])?$_POST['bismelden']:'');
$kurzbeschreibung = (isset($_POST['kurzbeschreibung'])?$_POST['kurzbeschreibung']:'');
if($uid!='')
{
$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid='".addslashes($uid)."'
@@ -140,6 +164,7 @@ if(isset($_POST['saveperson']))
$person->homepage = $homepage;
$person->updateamum = date('Y-m-d H:i:s');
$person->updatevon = $user;
$person->kurzbeschreibung = $kurzbeschreibung;
$person->new = false;
if($person->save())
@@ -264,6 +289,7 @@ if(!$error_person_save)
$anzahlderkinder = $person->anzahlkinder;
$anmerkungen = $person->anmerkungen;
$homepage = $person->homepage;
$kurzbeschreibung = $person->kurzbeschreibung;
}
// PERSON
@@ -357,6 +383,8 @@ if($result_sprache = pg_query($conn, $qry))
echo "
</SELECT>
</td>
<td valign='top'>Homepage</td>
<td valign='top'><input type='text' name='homepage' value='".htmlentities($homepage)."'/></td>
</tr>
<tr>
<td>Geschlecht</td>
@@ -380,9 +408,33 @@ echo "
</tr>
<tr>
<td valign='top'>Anmerkungen</td>
<td><textarea name='anmerkungen'>".htmlentities($anmerkungen)."</textarea></td>
<td valign='top'>Homepage</td>
<td valign='top'><input type='text' name='homepage' value='".htmlentities($homepage)."'/></td>
<td valign='top'><textarea name='anmerkungen'>".htmlentities($anmerkungen)."</textarea></td>
<td></td>
<td><img id='personimage' src='../../content/bild.php?src=person&person_id=$person_id' height='100'></td>
<td>
<a href='#foo' onclick='window.open(\"../../content/bildupload.php?person_id=$person_id\",\"BildUpload\", \"height=50,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes\"); return false;'>Bild hochladen</a>
<br><br>
<a href='#foo' onclick='RefreshImage(); return false;'>Bild aktualisieren</a>
</td>
</tr>
<tr>
<td colspan=6>
";
$oFCKeditor = new FCKeditor('kurzbeschreibung') ;
$sBasePath = '../../include/fckeditor/';
$oFCKeditor->BasePath = $sBasePath ;
$oFCKeditor->Value = $kurzbeschreibung;
$oFCKeditor->Create() ;
echo "
</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td valign='bottom' align='right'><input type='submit' name='saveperson' value='Speichern'></td>
</tr>