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

Browse Source
This commit is contained in:
Andreas Österreicher
2008-03-07 13:43:28 +00:00
parent 8b84af19d8
commit b4f02fe06c
6 changed files with 158 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/psearch.php
+1 -1
View File
@@ -119,7 +119,7 @@
else
{
//$sql_query = "SELECT DISTINCT tbl_person.uid, titel, nachname, vornamen, telefonklappe AS teltw, (tbl_person.uid || '@technikum-wien.at') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort FROM public.tbl_person, public.tbl_mitarbeiter WHERE tbl_mitarbeiter.uid=tbl_person.uid AND public.tbl_funktion.funktion_kurzbz='$cmbChoice' AND public.tbl_personfunktion.funktion_kurzbz=public.tbl_funktion.funktion_kurzbz AND tbl_person.uid=public.tbl_personfunktion.uid AND aktiv=TRUE UNION SELECT DISTINCT tbl_person.uid, (''::varchar) AS titel, nachname, vornamen, (''::varchar) AS teltw, (tbl_person.uid || '@technikum-wien.at') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort FROM public.tbl_person, public.tbl_student WHERE semester<10 AND tbl_person.uid=tbl_student.uid AND public.tbl_funktion.funktion_kurzbz='$cmbChoice' AND public.tbl_personfunktion.funktion_kurzbz=public.tbl_funktion.funktion_kurzbz AND tbl_person.uid=public.tbl_personfunktion.uid AND aktiv=TRUE ORDER BY nachname, vornamen";
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@technikum-wien.at') 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' UNION SELECT DISTINCT uid, titelpre,titelpost, nachname, vorname, vornamen,(''::varchar) AS standort_kurzbz, (''::varchar) AS teltw, (uid || '@technikum-wien.at') 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' ORDER BY nachname, vorname";
$sql_query = "SELECT DISTINCT uid, titelpre, titelpost, nachname, vorname, vornamen, standort_kurzbz, telefonklappe AS teltw, (uid || '@technikum-wien.at') 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 || '@technikum-wien.at') 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";
}
}
else
content/bildupload.php
+28 -7
View File
@@ -45,6 +45,7 @@ function resize($filename, $width, $height)
// Hoehe und Breite neu berechnen
list($width_orig, $height_orig) = getimagesize($filename);
if ($width && ($width_orig < $height_orig))
{
$width = ($height / $height_orig) * $width_orig;
@@ -55,11 +56,15 @@ function resize($filename, $width, $height)
}
$image_p = imagecreatetruecolor($width, $height);
//Bilder vergroessern/verkleinern und wieder zurueckschreiben
$image = imagecreatefromjpeg($filename);
imagecopyresampled($image_p, $image, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
//Bild nur verkleinern aber nicht vergroessern
if($width_orig>$width || $height_orig>$height)
imagecopyresampled($image_p, $image, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
else
$image_p = $image;
imagejpeg($image_p, $filename, 80);
imagedestroy($image_p);
@@ -89,7 +94,7 @@ if(isset($_POST['submitbild']))
$width=101;
$height=130;
//--check that it's a jpeg or gif or png
//--check that it's a jpeg
if ($ext=='jpg' || $ext=='jpeg')
{
$filename = $_FILES['bild']['tmp_name'];
@@ -103,6 +108,22 @@ if(isset($_POST['submitbild']))
fclose($fp);
$akte = new akte($conn);
if($akte->getAkten($_GET['person_id'], 'Lichtbil'))
{
if(count($akte->result)>0)
{
$akte = $akte->result[0];
$akte->new = false;
}
else
$akte->new = true;
}
else
{
$akte->new = true;
}
$akte->dokument_kurzbz = 'Lichtbil';
$akte->person_id = $_GET['person_id'];
$akte->inhalt = strhex($content);
@@ -117,7 +138,7 @@ if(isset($_POST['submitbild']))
$akte->insertvon = $user;
$akte->uid = '';
if(!$akte->save(true))
if(!$akte->save())
{
echo "<b>Fehler: $akte->errormsg</b>";
}
@@ -149,7 +170,7 @@ if(isset($_POST['submitbild']))
echo '<b>'.$person->errormsg.'</b><br />';
}
else
echo "<b>File ist kein gueltiges Bild</b><br />";
echo "<b>Derzeit koennen nur Bilder im JPG Format hochgeladen werden</b><br />";
}
}
content/fasDBDML.php
+43
View File
@@ -490,6 +490,49 @@ if(!$error)
$errormsg = 'Falsche Paramenteruebergabe';
}
}
elseif(isset($_POST['type']) && $_POST['type']=='imagedelete')
{
if(isset($_POST['person_id']) && is_numeric($_POST['person_id']))
{
if(($_POST['studiengang_kz']!='' && !$rechte->isBerechtigt('admin', $_POST['studiengang_kz'],'suid') &&
!$rechte->isBerechtigt('assistenz', $_POST['studiengang_kz'], 'suid')) ||
($_POST['studiengang_kz']=='' && !$rechte->isBerechtigt('admin', null, 'suid') &&
!$rechte->isBerechtigt('mitarbeiter', null, 'suid')))
{
$return = false;
$errormsg = 'Keine Berechtigung';
$data = '';
$error = true;
}
else
{
$qry = "UPDATE public.tbl_person SET foto=null WHERE person_id='".$_POST['person_id']."'";
if(pg_query($conn, $qry))
{
$qry = "DELETE FROM public.tbl_akte WHERE person_id='".$_POST['person_id']."' AND dokument_kurzbz='Lichtbil'";
if(pg_query($conn, $qry))
{
$return = true;
}
else
{
$return = false;
$errormsg = 'Fehler beim Loeschen des grossen Bildes';
}
}
else
{
$return = false;
$errormsg = 'Fehler beim Loeschen des Bildes';
}
}
}
else
{
$return = false;
$errormsg = 'Falsche Parameteruebergabe'.$_POST['person_id'].'x';
}
}
elseif(isset($_POST['type']) && $_POST['type']=='getvariable')
{
$variable = new variable($conn, null, null, true);
content/statistik/bewerberstatistik.php
+42 -1
View File
@@ -45,7 +45,7 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www
<script src="../../include/js/tablesort/table.js" type="text/javascript"></script>
</head>
<body>
<h2>Bewerberstatistik '.$stsem.'</h2><br>
<h2>Bewerberstatistik '.$stsem.'<span style="position:absolute; right:15px;">'.date('d.m.Y').'</span></h2><br>
';
if($stsem=='')
@@ -143,6 +143,47 @@ else
}
echo '</tbody></table>';
}
//Verteilung
echo '<br><h2>Verteilung</h2><br>';
$qry = "SELECT
count(anzahl) AS anzahlpers,anzahl AS anzahlstg
FROM
(
SELECT
count(*) AS anzahl
FROM
public.tbl_person JOIN public.tbl_prestudent USING (person_id)
JOIN public.tbl_prestudentrolle USING (prestudent_id)
WHERE
true $stgwhere
GROUP BY
person_id,rolle_kurzbz,studiensemester_kurzbz
HAVING
rolle_kurzbz='Interessent' AND studiensemester_kurzbz='$stsem'
) AS prestd
GROUP BY anzahl; ";
echo "<table class='liste table-stripeclass:alternate table-autostripe' style='width:auto'>
<thead>
<tr>
<th>Personen</th>
<th>Stg</th>
</tr>
</thead>
<tbody>";
if($result = pg_query($conn, $qry))
{
$summestudenten=0;
while($row = pg_fetch_object($result))
{
$summestudenten += $row->anzahlpers;
echo "<tr><td>$row->anzahlpers</td><td>$row->anzahlstg</td></tr>";
}
echo "<tr><td style='border-top: 1px solid black;'><b>$summestudenten</b></td><td></td></tr>";
}
echo '</tbody></table>';
}
?>
</body>
content/student/studentdetailoverlay.xul.php
+1
View File
@@ -156,6 +156,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<label value="Foto" />
<hbox>
<button id="student-detail-button-image-upload" label="Upload" oncommand="StudentImageUpload();" disabled="true"/>
<button id="student-detail-button-image-delete" label="Delete" oncommand="StudentImageDelete();" disabled="true"/>
<spacer flex="1" />
</hbox>
</vbox>
content/student/studentoverlay.js.php
+43
View File
@@ -525,6 +525,7 @@ function StudentDetailDisableFields(val)
document.getElementById('student-detail-menulist-sprache').disabled=val;
//document.getElementById('student-detail-textbox-matrikelnummer').disabled=val;
document.getElementById('student-detail-button-image-upload').disabled=val;
document.getElementById('student-detail-button-image-delete').disabled=val;
//document.getElementById('student-detail-menulist-studiengang_kz').disabled=val;
document.getElementById('student-detail-textbox-semester').disabled=val;
document.getElementById('student-detail-textbox-verband').disabled=val;
@@ -646,6 +647,9 @@ function StudentDetailSave()
}
}
// ****
// * Ladt ein Script zum Upload des Bildes
// ****
function StudentImageUpload()
{
person_id = document.getElementById('student-detail-textbox-person_id').value;
@@ -657,6 +661,45 @@ function StudentImageUpload()
alert('Es wurde keine Person ausgewaehlt');
}
// ****
// * Loescht das Bild aus der DB
// ****
function StudentImageDelete()
{
person_id = document.getElementById('student-detail-textbox-person_id').value;
if(person_id!='')
{
var url = '<?php echo APP_ROOT ?>content/fasDBDML.php';
var req = new phpRequest(url,'','');
var studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
req.add('type', 'imagedelete');
req.add('person_id', person_id);
req.add('studiengang_kz', studiengang_kz);
var response = req.executePOST();
var val = new ParseReturnValue(response)
if (!val.dbdml_return)
{
if(val.dbdml_errormsg=='')
alert(response)
else
alert(val.dbdml_errormsg)
}
else
{
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
StudentSelectID=document.getElementById('student-prestudent-textbox-prestudent_id').value;
StudentTreeDatasource.Refresh(false); //non blocking
SetStatusBarText('Bild wurde geloescht');
}
}
else
alert('Es wurde keine Person ausgewaehlt');
}
// ****
// * Auswahl eines Studenten
// * bei Auswahl eines Studenten wird dieser geladen