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

- Personensuche zeigt nur noch aktive Personen an

Browse Source
This commit is contained in:
Andreas Österreicher
2010-06-21 15:02:03 +00:00
parent 01af5a0d0f
commit 1f65f3f897
2 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/psearch.php
+9 -8
View File
@@ -56,7 +56,7 @@ if(isset($do_search) || $do_excel)
if($txtSearchQuery == "" || $txtSearchQuery == "*" || $txtSearchQuery == "*.*")
{
if($cmbChoice == "all")
$sql_query.= "SELECT person_id, uid, titelpre, titelpost, nachname, vorname, vornamen, standort_id, telefonklappe as teltw,(uid || '@".DOMAIN."') AS emailtw, foto,-1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias, CASE WHEN (fixangestellt) THEN 'Fix' ELSE 'Extern' END as personenart FROM campus.vw_mitarbeiter WHERE 1=1 ";
$sql_query.= "SELECT person_id, uid, titelpre, titelpost, nachname, vorname, vornamen, standort_id, telefonklappe as teltw,(uid || '@".DOMAIN."') AS emailtw, foto,-1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias, CASE WHEN (fixangestellt) THEN 'Fix' ELSE 'Extern' END as personenart FROM campus.vw_mitarbeiter WHERE 1=1 AND aktiv ";
else
$sql_query.= "SELECT DISTINCT person_id, uid, titelpre, titelpost, nachname, vorname, vornamen, standort_id, telefonklappe AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, -1 AS studiengang_kz, -1 AS semester, ort_kurzbz as ort, alias, CASE WHEN (fixangestellt) THEN 'Fix' ELSE 'Extern' END as personenart FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion using(uid) WHERE funktion_kurzbz='$cmbChoice' AND aktiv ".$sql_extend_query;
}
@@ -83,7 +83,7 @@ if(isset($do_search) || $do_excel)
if($txtSearchQuery == "" || $txtSearchQuery == "*" || $txtSearchQuery == "*.*")
{
if($cmbChoice == "all")
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre, titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, vw_student.semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart FROM campus.vw_student WHERE vw_student.semester<10 ";
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre, titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, vw_student.semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart FROM campus.vw_student WHERE vw_student.semester<10 AND aktiv";
else
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre,titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, vw_student.semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart FROM campus.vw_student JOIN public.tbl_benutzerfunktion using(uid) WHERE vw_student.semester<10 AND funktion_kurzbz='$cmbChoice' AND aktiv ".$sql_extend_query;
}
@@ -91,7 +91,7 @@ if(isset($do_search) || $do_excel)
{
$txtSearchQuery = addslashes($txtSearchQuery);
if($cmbChoice == "all")
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre, titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart 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%')) ";
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre, titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, studiengang_kz, semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart FROM campus.vw_student WHERE semester<10 AND aktiv 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%')) ";
else
$sql_query.= " SELECT DISTINCT person_id,uid, titelpre, titelpost, nachname, vorname, vornamen,null::integer AS standort_id, (''::varchar) AS teltw, (uid || '@".DOMAIN."') AS emailtw, foto, vw_student.studiengang_kz, vw_student.semester, ''::varchar as ort, alias,CASE WHEN (TRUE) THEN 'StudentIn' ELSE 'StudentIn' END as personenart 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 ".$sql_extend_query;
}
@@ -822,15 +822,15 @@ if(isset($do_search) || $do_excel)
<table class="tabcontent" id="inhalt">
<tr>
<td class="tdwidth10">&nbsp;</td>
<td><table class="tabcontent">
<td>
<form target="_self" method="post" action="<?php echo $_SERVER["PHP_SELF"]; ?>" name="SearchFormular" id="SearchFormular" >
<table class="tabcontent">
<tr>
<td class="ContentHeader"><font class="ContentHeader">&nbsp;Personensuche <?php echo CAMPUS_NAME;?></font></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<form target="_self" method="post" action="<?php echo $_SERVER["PHP_SELF"]; ?>" name="SearchFormular" id="SearchFormular" >
<tr>
<td nowrap>
Suche nach:
@@ -885,7 +885,7 @@ if(isset($do_search) || $do_excel)
</table>
</td>
</tr>
</form>
<tr>
<td nowrap>
@@ -1072,7 +1072,8 @@ if(isset($do_search) || $do_excel)
?>
</td>
</tr>
</table></td>
</table>
</form></td>
<td class="tdwidth30">&nbsp;</td>
</tr>
</table>
cis/public/ansprechpartner.php
+25 -45
View File
@@ -1,12 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
<title>Ansprechpartner Infrastruktur</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
</head>
<body>
<table id="inhalt" class="tabcontent">
<tr>
<td class="tdwidth10">&nbsp;</td>
@@ -32,21 +31,13 @@
<td class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
</tr>
<!--
<tr>
<td width="260" class='tdwrap'>Mag. Nestlang Dietmar</td>
<td width="50" class='tdwrap'>215</td>
<td class='tdwrap'></td>
<td class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung </td>
</tr>
-->
<td width="260" class='tdwrap'>Ing. Dipl. Ing. (FH) Paminger Christian (Interremistisch)</td>
<td width="260" class='tdwrap'>Ing. Dipl. Ing. (FH) Paminger Christian</td>
<td width="50" class='tdwrap'>245</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td colspan="2" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
@@ -86,7 +77,7 @@
<td class='tdwrap'>&nbsp;</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Vogt Eva (karenziert)</td>
<td width="260" class='tdwrap'>Vogt Eva</td>
<td width="50" class='tdwrap'>249</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
@@ -152,26 +143,7 @@
<td class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
</tr>
<tr>
<td width="260" class='tdwrap'><strong>Softgrid-Virtualisierung</strong></td>
<td width="50" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Ing. Esberger Franz</td>
<td width="50" class='tdwrap'>243</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td colspan="2" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>
</tr>
<tr>
<td width="280" colspan="2" nowrap class="ContentHeader2">&nbsp;Haustechnik</td>
<td class="ContentHeader2" nowrap></td>
@@ -191,13 +163,6 @@
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Nagl Richard</td>
<td width="50" class='tdwrap'>252</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Weigl Harald</td>
<td width="50" class='tdwrap'>253</td>
@@ -207,7 +172,7 @@
</tr>
<tr>
<td width="260" class='tdwrap'>Jozsa Franz</td>
<td width="50" class='tdwrap'>&nbsp;</td>
<td width="50" class='tdwrap'>255</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
@@ -279,7 +244,7 @@
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Simane-Sequens Gerald</td>
<td width="260" class='tdwrap'>Markus Pospischil</td>
<td width="50" class='tdwrap'>258</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
@@ -360,6 +325,20 @@
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Ing. Esberger Franz</td>
<td width="50" class='tdwrap'>243</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Nagl Richard</td>
<td width="50" class='tdwrap'>252</td>
<td class='tdwrap'></td>
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td width="260" class='tdwrap'>Dipl. Ing. Nimmervoll Alexander</td>
<td width="50" class='tdwrap'>242</td>
@@ -367,7 +346,8 @@
<td width="56" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>Termin nach Vereinbarung</td>
</tr>
<tr>
<td colspan="2" class='tdwrap'>&nbsp;</td>
<td class='tdwrap'>&nbsp;</td>