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

- Prestudent-Filter korrigiert

Browse Source 
- Organisationseinheiten Übersicht zeigt nur noch aktive OEs an
This commit is contained in:
Andreas Österreicher
2009-10-06 09:15:00 +00:00
parent c6dd543443
commit 12b5b26f98
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/prestudent.class.php
+5 -1
View File
@@ -468,13 +468,17 @@ class prestudent extends person
*/
public function loadIntessentenUndBewerber($studiensemester_kurzbz, $studiengang_kz, $semester=nulll, $typ=null, $orgform=null)
{
$stsemqry='';
if(!is_null($studiensemester_kurzbz) && $studiensemester_kurzbz!='')
$stsemqry=" AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
$qry = "SELECT
*, a.anmerkung, tbl_person.anmerkung as anmerkungen
FROM
(
SELECT
*, (SELECT status_kurzbz FROM tbl_prestudentstatus
WHERE prestudent_id=prestudent.prestudent_id
WHERE prestudent_id=prestudent.prestudent_id $stsemqry
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) AS rolle
FROM tbl_prestudent prestudent ORDER BY prestudent_id
) a, tbl_prestudentstatus, tbl_person
vilesci/stammdaten/organisationseinheiten.php
+17 -13
View File
@@ -111,24 +111,28 @@ function displayh($arr)
$style = 'style="border: 1px solid gray; font-weight:bold; padding-right: 10px;padding-left: 10px; margin:0;"';
else
$style = 'style="padding-left: 10px;padding-right: 10px;"';
echo '<tr><td valign="center" '.$style.'>';
$obj = new organisationseinheit();
$obj->load($key);
if($obj->organisationseinheittyp_kurzbz=='Institut')
echo $obj->oe_kurzbz;
else
echo $obj->bezeichnung;
echo '</td>';
$style = 'style="border: 1px solid gray; font-weight:bold; padding: 0px; margin:0;"';
echo '<td valign="center" '.$style.'>';
if($obj->aktiv)
{
echo '<tr><td valign="center" '.$style.'>';
if(is_array($val) && count($val)>0)
displayh($val);
echo $obj->organisationseinheittyp_kurzbz.' - ';
if($obj->organisationseinheittyp_kurzbz=='Institut')
echo $obj->oe_kurzbz;
else
echo $obj->bezeichnung;
echo '</td>';
$style = 'style="border: 1px solid gray; font-weight:bold; padding: 0px; margin:0;"';
echo '<td valign="center" '.$style.'>';
echo '</td></tr>';
if(is_array($val) && count($val)>0)
displayh($val);
echo '</td></tr>';
}
}
echo '</table>';
}