This commit is contained in:
Andreas Österreicher
2008-04-08 09:26:52 +00:00
parent 0e080b46c8
commit 88374df482
12 changed files with 23 additions and 18 deletions
+4 -3
View File
@@ -347,6 +347,7 @@ class konto
$this->errormsg = 'Person_id muss eine gueltige Zahl sein';
return false;
}
if($studiengang_kz!='')
$stgwhere = " AND tbl_konto.studiengang_kz='$studiengang_kz' ";
else
@@ -357,7 +358,7 @@ class konto
//Alle Buchungen und 'darunterliegende' holen die noch offen sind
$qry = "SELECT tbl_konto.*, anrede, titelpost, titelpre, nachname, vorname, vornamen
FROM public.tbl_konto JOIN public.tbl_person USING (person_id)
WHERE buchungsnr in (SELECT buchungsnr FROM public.tbl_konto as konto_a WHERE
WHERE (buchungsnr in (SELECT buchungsnr FROM public.tbl_konto as konto_a WHERE
(betrag + (SELECT CASE WHEN sum(betrag) is null THEN 0
ELSE sum(betrag) END
FROM public.tbl_konto WHERE buchungsnr_verweis=konto_a.buchungsnr))<>0
@@ -366,13 +367,13 @@ class konto
(betrag + (SELECT CASE WHEN sum(betrag) is null THEN 0
ELSE sum(betrag) END
FROM public.tbl_konto WHERE buchungsnr_verweis=konto_a.buchungsnr))<>0
AND person_id='$person_id') $stgwhere ORDER BY buchungsdatum";
AND person_id='$person_id')) $stgwhere ORDER BY buchungsdatum";
}
else
$qry = "SELECT tbl_konto.*, anrede, titelpost, titelpre, nachname, vorname, vornamen
FROM public.tbl_konto JOIN public.tbl_person USING (person_id)
WHERE person_id='".$person_id."' $stgwhere ORDER BY buchungsdatum";
//echo $qry;
if($result = pg_query($this->conn, $qry))
{
while($row = pg_fetch_object($result))
+1
View File
@@ -99,6 +99,7 @@ if(isset($_SERVER['REMOTE_USER']))
if($kontofilterstg=='false')
$studiengang_kz='';
}
if($person_id!='')
{
$konto->getBuchungen($person_id, $filter, $studiengang_kz);
+4 -1
View File
@@ -52,7 +52,7 @@ function convdate($date)
function checkfilter($row, $filter2)
{
global $conn, $studiensemester_kurzbz;
global $conn, $studiensemester_kurzbz, $kontofilterstg;
if($filter2=='dokumente')
{
@@ -70,6 +70,9 @@ function checkfilter($row, $filter2)
{
// Alle Personen die offene Buchungen haben
$qry = "SELECT sum(betrag) as summe FROM tbl_konto WHERE person_id='$row->person_id'";
if($kontofilterstg=='true')
$qry.=" AND studiengang_kz='$row->studiengang_kz'";
//echo $qry;
if($result_filter = pg_query($conn, $qry))
if($row_filter = pg_fetch_object($result_filter))
if($row_filter->summe=='0.00' || $row_filter->summe=='' || $row_filter->summe=='0')
+1 -1
View File
@@ -59,7 +59,7 @@
if($firma->save())
{
$reloadstr .= "<script type='text/javascript'>\n";
$reloadstr .= " parent.uebersicht.location.href='firma_uebersicht.php';";
$reloadstr .= " parent.uebersicht_firma.location.href='firma_uebersicht.php';";
$reloadstr .= " window.top.opener.StudentProjektarbeitFirmaRefresh();";
$reloadstr .= "</script>\n";
}
+2 -2
View File
@@ -8,8 +8,8 @@
</head>
<frameset rows="70%,*">
<frame src="firma_uebersicht.php" id="uebersicht" name="uebersicht" frameborder="0" />
<frame src="firma_details.php" id="detail" name="detail" frameborder="0" />
<frame src="firma_uebersicht.php" name="uebersicht_firma" frameborder="0" />
<frame src="firma_details.php" name="detail_firma" frameborder="0" />
<noframes>
<body bgcolor="#FFFFFF">
This application works only with a frames-enabled browser.<br />
+3 -3
View File
@@ -26,8 +26,8 @@
{
//$htmlstr .= " <tr class='liste". ($i%2) ."'>\n";
$htmlstr .= " <tr>\n";
$htmlstr .= " <td><a href='firma_details.php?firma_id=".$row->firma_id."' target='detail'>".$row->firma_id."</a></td>\n";
$htmlstr .= " <td><a href='firma_details.php?firma_id=".$row->firma_id."' target='detail'>".$row->name."</a></td>\n";
$htmlstr .= " <td><a href='firma_details.php?firma_id=".$row->firma_id."' target='detail_firma'>".$row->firma_id."</a></td>\n";
$htmlstr .= " <td><a href='firma_details.php?firma_id=".$row->firma_id."' target='detail_firma'>".$row->name."</a></td>\n";
$htmlstr .= " <td>$row->adresse</td>\n";
$htmlstr .= " <td>$row->email</td>\n";
$htmlstr .= " <td>$row->telefon</td>\n";
@@ -62,7 +62,7 @@
echo '<table width="100%"><tr><td>';
echo '<h3>Übersicht</h3>';
echo '</td><td align="right">';
echo "<input type='button' onclick='parent.detail.location=\"firma_details.php?neu=true\"' value='Neue Firma anlegen'/>";
echo "<input type='button' onclick='parent.detail_firma.location=\"firma_details.php?neu=true\"' value='Neue Firma anlegen'/>";
echo '</td></tr></table><br />';
echo $htmlstr;
+1 -1
View File
@@ -92,7 +92,7 @@
$errorstr .= $sg_update->errormsg;
}
$reloadstr .= "<script type='text/javascript'>\n";
$reloadstr .= " parent.uebersicht.location.href='raum_uebersicht.php';";
$reloadstr .= " parent.uebersicht_raum.location.href='raum_uebersicht.php';";
$reloadstr .= "</script>\n";
}
+2 -2
View File
@@ -8,8 +8,8 @@
</head>
<frameset rows="65%,*">
<frame src="raum_uebersicht.php" id="uebersicht" name="uebersicht" frameborder="0" />
<frame src="raum_details.php" id="detail" name="detail" frameborder="0" />
<frame src="raum_uebersicht.php" name="uebersicht_raum" frameborder="0" />
<frame src="raum_details.php" name="detail_raum" frameborder="0" />
<noframes>
<body bgcolor="#FFFFFF">
This application works only with a frames-enabled browser.<br />
+1 -1
View File
@@ -63,7 +63,7 @@ foreach ($sg->result as $twraum)
{
//$htmlstr .= " <tr class='liste". ($i%2) ."'>\n";
$htmlstr .= " <tr>\n";
$htmlstr .= " <td><a href='raum_details.php?ort_kurzbz=".$twraum->ort_kurzbz."' target='detail'>".$twraum->ort_kurzbz."</a></td>\n";
$htmlstr .= " <td><a href='raum_details.php?ort_kurzbz=".$twraum->ort_kurzbz."' target='detail_raum'>".$twraum->ort_kurzbz."</a></td>\n";
$htmlstr .= " <td>".$twraum->bezeichnung."</td>\n";
$htmlstr .= " <td>".$twraum->planbezeichnung."</td>\n";
$htmlstr .= " <td>".$twraum->max_person."</td>\n";
+1 -1
View File
@@ -104,7 +104,7 @@
$errorstr .= $sg_update->errormsg;
}
$reloadstr .= "<script type='text/javascript'>\n";
$reloadstr .= " parent.uebersicht.location.href='studiengang_uebersicht.php';";
$reloadstr .= " parent.uebersicht_studiengang.location.href='studiengang_uebersicht.php';";
$reloadstr .= "</script>\n";
}
+2 -2
View File
@@ -8,8 +8,8 @@
</head>
<frameset rows="65%,*">
<frame src="studiengang_uebersicht.php" id="uebersicht" name="uebersicht" frameborder="0" />
<frame src="studiengang_details.php" id="detail" name="detail" frameborder="0" />
<frame src="studiengang_uebersicht.php" name="uebersicht_studiengang" frameborder="0" />
<frame src="studiengang_details.php" name="detail_studiengang" frameborder="0" />
<noframes>
<body bgcolor="#FFFFFF">
This application works only with a frames-enabled browser.<br />
@@ -32,7 +32,7 @@
$htmlstr .= " <td>".$stg->kurzbz."</td>\n";
$htmlstr .= " <td>".$stg->kurzbzlang."</td>\n";
$htmlstr .= " <td>".$stg->typ."</td>\n";
$htmlstr .= " <td><a href='studiengang_details.php?studiengang_kz=".$stg->studiengang_kz."' target='detail'>".$stg->bezeichnung."</a></td>\n";
$htmlstr .= " <td><a href='studiengang_details.php?studiengang_kz=".$stg->studiengang_kz."' target='detail_studiengang'>".$stg->bezeichnung."</a></td>\n";
if($stg->aktiv=='t')
$aktivbild = "true.gif";