mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
First draft for aliquote reduction
This commit is contained in:
+19
-15
@@ -21,7 +21,7 @@
|
||||
require_once(dirname(__FILE__)."/jquery.php");
|
||||
echo '
|
||||
<script>
|
||||
var TARGET = "";
|
||||
var SERVICE_TARGET = "";
|
||||
function _GET()
|
||||
{
|
||||
var url = window.location.href;
|
||||
@@ -37,16 +37,16 @@ echo '
|
||||
return vars;
|
||||
}
|
||||
|
||||
function AJAXCall(info, successfunction)
|
||||
function AJAXCall(action, successfunction)
|
||||
{
|
||||
if(TARGET == "")
|
||||
if(SERVICE_TARGET == "")
|
||||
die("Es wurde kein AJAX-Target angegeben");
|
||||
$.ajax(
|
||||
{
|
||||
url: TARGET,
|
||||
url: SERVICE_TARGET,
|
||||
type: "POST",
|
||||
dataType: "html",
|
||||
data: info,
|
||||
data: action,
|
||||
timeout: 5000
|
||||
|
||||
}).done(function(result)
|
||||
@@ -60,17 +60,20 @@ echo '
|
||||
die(result);
|
||||
return false;
|
||||
}
|
||||
if(res.erfolg)
|
||||
if(res.return)
|
||||
{
|
||||
try
|
||||
if(res.action != "")
|
||||
{
|
||||
var ret = JSON.parse(res.info);
|
||||
successfunction(ret);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
die(res.info);
|
||||
try
|
||||
{
|
||||
var ret = JSON.parse(res.action);
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
die(action.action + "<br><br>" + res.action);
|
||||
}
|
||||
}
|
||||
successfunction(ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -79,13 +82,14 @@ echo '
|
||||
|
||||
}).fail(function(jqXHR, status)
|
||||
{
|
||||
die(status);
|
||||
die("AJAX failed: " + status);
|
||||
});
|
||||
}
|
||||
|
||||
function die(msg)
|
||||
{
|
||||
document.body.innerHTML = msg;
|
||||
var full = "<h1 style=\'color:#900;\'>Fehler:</h1><div>"+msg+"</div>";
|
||||
document.body.innerHTML = full;
|
||||
throw new Error(msg);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,12 +31,12 @@ function returnAJAX($success, $obj)
|
||||
//if there is an error
|
||||
if(error_get_last())
|
||||
$ret = array(
|
||||
"erfolg" => false,
|
||||
"return" => false,
|
||||
);
|
||||
else if(!$success)
|
||||
{
|
||||
$ret = array(
|
||||
"erfolg" => false,
|
||||
"return" => false,
|
||||
"message" => $obj,
|
||||
);
|
||||
}
|
||||
@@ -44,20 +44,19 @@ function returnAJAX($success, $obj)
|
||||
else if (!$getuid = get_uid())
|
||||
{
|
||||
$ret = array(
|
||||
"erfolg" => false,
|
||||
"return" => false,
|
||||
);
|
||||
}
|
||||
//if everything worked fine
|
||||
else
|
||||
{
|
||||
$ret = array(
|
||||
"erfolg" => true,
|
||||
"user" => $getuid,
|
||||
"info" => $obj,
|
||||
"return" => true,
|
||||
"action" => $obj,
|
||||
);
|
||||
}
|
||||
echo json_encode($ret);
|
||||
if($ret["erfolg"] === false)
|
||||
if($ret["return"] === false)
|
||||
die("");
|
||||
}
|
||||
?>
|
||||
|
||||
+128
-60
@@ -46,17 +46,17 @@ class prestudent extends person
|
||||
public $punkte; //rt_gesamtpunkte
|
||||
public $rt_punkte1;
|
||||
public $rt_punkte2;
|
||||
public $rt_punkte3 = 0;
|
||||
public $bismelden = true;
|
||||
public $rt_punkte3 = 0;
|
||||
public $bismelden = true;
|
||||
public $anmerkung;
|
||||
public $anmerkung_status;
|
||||
public $mentor;
|
||||
public $ext_id_prestudent;
|
||||
public $dual = false;
|
||||
public $zgvdoktor_code;
|
||||
public $zgvdoktorort;
|
||||
public $zgvdoktordatum;
|
||||
public $zgvdoktornation;
|
||||
public $dual = false;
|
||||
public $zgvdoktor_code;
|
||||
public $zgvdoktorort;
|
||||
public $zgvdoktordatum;
|
||||
public $zgvdoktornation;
|
||||
|
||||
public $status_kurzbz;
|
||||
public $studiensemester_kurzbz;
|
||||
@@ -565,8 +565,8 @@ class prestudent extends person
|
||||
(
|
||||
SELECT
|
||||
*, (SELECT status_kurzbz FROM tbl_prestudentstatus
|
||||
WHERE prestudent_id=prestudent.prestudent_id $stsemqry
|
||||
ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) AS rolle
|
||||
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
|
||||
WHERE a.rolle=tbl_prestudentstatus.status_kurzbz AND
|
||||
@@ -1118,9 +1118,9 @@ class prestudent extends person
|
||||
$obj->ext_id_prestudent = $row->ext_id;
|
||||
$obj->dual = $this->db_parse_bool($row->dual);
|
||||
$obj->ausstellungsstaat = $row->ausstellungsstaat;
|
||||
$obj->zgvdoktor_code = $row->zgvdoktor_code;
|
||||
$obj->zgvdoktorort = $row->zgvdoktorort;
|
||||
$obj->zgvdoktordatum = $row->zgvdoktordatum;
|
||||
$obj->zgvdoktor_code = $row->zgvdoktor_code;
|
||||
$obj->zgvdoktorort = $row->zgvdoktorort;
|
||||
$obj->zgvdoktordatum = $row->zgvdoktordatum;
|
||||
|
||||
$this->result[] = $obj;
|
||||
}
|
||||
@@ -1133,56 +1133,60 @@ class prestudent extends person
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gibt die eingetragenen ZGV zurück
|
||||
* @return array
|
||||
*/
|
||||
public function getZgv() {
|
||||
/**
|
||||
* Gibt die eingetragenen ZGV zurück
|
||||
* @return array
|
||||
*/
|
||||
public function getZgv()
|
||||
{
|
||||
|
||||
$zgv = array(
|
||||
'bachelor' => array(),
|
||||
'master' => array(),
|
||||
// 'doktor' => array(),
|
||||
);
|
||||
$attribute = array(
|
||||
'art',
|
||||
'ort',
|
||||
'datum',
|
||||
'nation',
|
||||
);
|
||||
$db_attribute = array(
|
||||
'zgv_code',
|
||||
'zgvort',
|
||||
'zgvdatum',
|
||||
'zgvnation',
|
||||
'zgvmas_code',
|
||||
'zgvmaort',
|
||||
'zgvmadatum',
|
||||
'zgvmanation',
|
||||
'zgvdoktor_code',
|
||||
'zgvdoktorort',
|
||||
'zgvdoktordatum',
|
||||
'zgvdoktornation',
|
||||
);
|
||||
$zgv = array
|
||||
(
|
||||
'bachelor' => array(),
|
||||
'master' => array(),
|
||||
//'doktor' => array(),
|
||||
);
|
||||
$attribute = array
|
||||
(
|
||||
'art',
|
||||
'ort',
|
||||
'datum',
|
||||
'nation',
|
||||
);
|
||||
$db_attribute = array
|
||||
(
|
||||
'zgv_code',
|
||||
'zgvort',
|
||||
'zgvdatum',
|
||||
'zgvnation',
|
||||
'zgvmas_code',
|
||||
'zgvmaort',
|
||||
'zgvmadatum',
|
||||
'zgvmanation',
|
||||
'zgvdoktor_code',
|
||||
'zgvdoktorort',
|
||||
'zgvdoktordatum',
|
||||
'zgvdoktornation',
|
||||
);
|
||||
|
||||
foreach($this->result as $prestudent) {
|
||||
|
||||
foreach($zgv as &$value) {
|
||||
|
||||
foreach($attribute as $attribut) {
|
||||
$db_attribute_name = current($db_attribute);
|
||||
|
||||
if($prestudent->$db_attribute_name) {
|
||||
$value[$attribut] = $prestudent->$db_attribute_name;
|
||||
}
|
||||
next($db_attribute);
|
||||
}
|
||||
}
|
||||
reset($db_attribute);
|
||||
}
|
||||
|
||||
return $zgv;
|
||||
}
|
||||
foreach($this->result as $prestudent)
|
||||
{
|
||||
foreach($zgv as &$value)
|
||||
{
|
||||
foreach($attribute as $attribut)
|
||||
{
|
||||
$db_attribute_name = current($db_attribute);
|
||||
if($prestudent->$db_attribute_name)
|
||||
{
|
||||
$value[$attribut] = $prestudent->$db_attribute_name;
|
||||
}
|
||||
next($db_attribute);
|
||||
}
|
||||
}
|
||||
reset($db_attribute);
|
||||
}
|
||||
return $zgv;
|
||||
}
|
||||
|
||||
/**
|
||||
* Liefert die Anzahl der Bewerber im ausgewaehlten Bereich
|
||||
@@ -1711,4 +1715,68 @@ class prestudent extends person
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Laedt alle Studenten eines Studienplans und eines Studiensemesters
|
||||
* @param $studienplan_id
|
||||
* @param $studiensemester_kurzbz
|
||||
* @param $studiengang_kz
|
||||
* @return array mit allen Prestudenten, welche sich für den angegebenen Studienplan im angegebenen Semester beworben haben
|
||||
*/
|
||||
public function getAllBewerberFromStudienplanStudsem($studienplan_id, $studiensemester_kurzbz, $studiengang_kz)
|
||||
{
|
||||
if(!is_numeric($studienplan_id))
|
||||
{
|
||||
$this->errormsg = 'studienplan_id ist ungueltig';
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!$studiensemester_kurzbz || $studiensemester_kurzbz == "")
|
||||
{
|
||||
$this->errormsg = 'studiensemester_kurzbz ist ungueltig';
|
||||
return false;
|
||||
}
|
||||
|
||||
$qry = "SELECT DISTINCT prestudent_id, vorname, nachname, gebdatum, rt_gesamtpunkte, tbl_prestudent.studiengang_kz, bis.tbl_zgvgruppe.bezeichnung, get_rolle_prestudent(prestudent_id, null) as laststatus
|
||||
FROM
|
||||
public.tbl_prestudent
|
||||
JOIN public.tbl_person USING(person_id)
|
||||
LEFT JOIN bis.tbl_zgvgruppe_zuordnung USING(zgv_code)
|
||||
LEFT JOIN bis.tbl_zgvgruppe USING(gruppe_kurzbz)
|
||||
WHERE
|
||||
tbl_prestudent.studiengang_kz=". $this->db_add_param($studiengang_kz)."
|
||||
AND (get_rolle_prestudent(prestudent_id, null)='Bewerber' OR get_rolle_prestudent(prestudent_id, null)='Wartender')
|
||||
AND EXISTS(
|
||||
SELECT
|
||||
1
|
||||
FROM
|
||||
public.tbl_prestudentstatus
|
||||
WHERE
|
||||
tbl_prestudent.prestudent_id=tbl_prestudentstatus.prestudent_id
|
||||
AND studiensemester_kurzbz=". $this->db_add_param($studiensemester_kurzbz)."
|
||||
AND status_kurzbz='Bewerber'
|
||||
AND (
|
||||
studienplan_id=". $this->db_add_param($studienplan_id)."
|
||||
OR
|
||||
(anmerkung like '%' || (SELECT orgform_kurzbz || '_' || sprache FROM lehre.tbl_studienplan WHERE studienplan_id=". $this->db_add_param($studienplan_id).") || '%')
|
||||
)
|
||||
);";
|
||||
|
||||
|
||||
if($result = $this->db_query($qry))
|
||||
{
|
||||
$ret = array();
|
||||
|
||||
while($row = $this->db_fetch_object($result))
|
||||
$ret[] = $row;
|
||||
|
||||
return $ret;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->errormsg = 'Fehler beim Laden der Daten';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+191
-93
@@ -1,24 +1,24 @@
|
||||
<?php
|
||||
/*
|
||||
* studienplatz.class.php
|
||||
*
|
||||
*
|
||||
* Copyright 2013 Technikum-Wien
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty oferr
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*
|
||||
*
|
||||
*
|
||||
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>
|
||||
* Werner Masik <werner@gefi.at>
|
||||
@@ -29,35 +29,39 @@ require_once(__DIR__ .'/functions.inc.php');
|
||||
class studienplatz extends basis_db
|
||||
{
|
||||
/** @var $new boolean */
|
||||
private $new = true;
|
||||
private $new = true;
|
||||
/** @var DB-Result */
|
||||
private $result;
|
||||
/** @var object */
|
||||
public $studienplatz = array();
|
||||
public $studienplatz = array();
|
||||
|
||||
//Tabellenspalten
|
||||
/** @var integer */
|
||||
private $studienplatz_id;
|
||||
private $studienplatz_id;
|
||||
/** @var integer */
|
||||
private $studiengang_kz;
|
||||
private $studiengang_kz;
|
||||
/** @var string */
|
||||
private $orgform_kurzbz;
|
||||
private $orgform_kurzbz;
|
||||
/** @var string */
|
||||
private $studiensemester_kurzbz;
|
||||
/** @var integer */
|
||||
private $ausbildungssemester;
|
||||
private $ausbildungssemester;
|
||||
/** @var integer */
|
||||
private $gpz;
|
||||
private $gpz;
|
||||
/** @var integer */
|
||||
private $npz;
|
||||
private $npz;
|
||||
/** @var timestamp */
|
||||
private $updateamum;
|
||||
private $updateamum;
|
||||
/** @var string */
|
||||
private $updatevon;
|
||||
private $updatevon;
|
||||
/** @var timestamp */
|
||||
private $insertamum;
|
||||
private $insertamum;
|
||||
/** @var string */
|
||||
private $insertvon;
|
||||
private $insertvon;
|
||||
/** @var integer */
|
||||
private $apz;
|
||||
/** @var integer */
|
||||
private $studienplan_id;
|
||||
|
||||
/**
|
||||
* Konstruktor
|
||||
@@ -66,7 +70,7 @@ class studienplatz extends basis_db
|
||||
public function __construct($studienplatz_id=null)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
|
||||
if(!is_null($studienplatz_id))
|
||||
$this->load($studienplatz_id);
|
||||
}
|
||||
@@ -76,9 +80,10 @@ class studienplatz extends basis_db
|
||||
switch ($name)
|
||||
{
|
||||
case 'gpz':
|
||||
case 'npz':
|
||||
case 'ausbildungssemester':
|
||||
case 'npz':
|
||||
case 'ausbildungssemester':
|
||||
case 'studienplatz_id':
|
||||
case 'studienplan_id':
|
||||
if ($value != null && !is_numeric($value))
|
||||
throw new Exception("Attribute $name must be numeric! ($value)");
|
||||
$this->$name=$value;
|
||||
@@ -92,8 +97,8 @@ class studienplatz extends basis_db
|
||||
{
|
||||
return $this->$name;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Laedt einzelnen Studienplatz der ID $studienplatz_id
|
||||
* @param integer $studienplatz_id ID des zu ladenden Studienplatzes
|
||||
@@ -126,7 +131,6 @@ class studienplatz extends basis_db
|
||||
$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -135,31 +139,33 @@ class studienplatz extends basis_db
|
||||
* @param type $target
|
||||
* @param type $row
|
||||
*/
|
||||
private function mapRow($target,$row) {
|
||||
$target->studienplatz_id = $row->studienplatz_id;
|
||||
$target->studiengang_kz = $row->studiengang_kz;
|
||||
$target->orgform_kurzbz = $row->orgform_kurzbz;
|
||||
$target->studiensemester_kurzbz = $row->studiensemester_kurzbz;
|
||||
$target->ausbildungssemester = $row->ausbildungssemester;
|
||||
$target->gpz = $row->gpz;
|
||||
$target->npz = $row->npz;
|
||||
$target->updateamum = $row->updateamum;
|
||||
$target->updatevon = $row->updatevon;
|
||||
$target->insertamum = $row->insertamum;
|
||||
$target->insertvon = $row->insertvon;
|
||||
$target->new = false;
|
||||
private function mapRow($target,$row) {
|
||||
$target->studienplatz_id = $row->studienplatz_id;
|
||||
$target->studiengang_kz = $row->studiengang_kz;
|
||||
$target->orgform_kurzbz = $row->orgform_kurzbz;
|
||||
$target->studiensemester_kurzbz = $row->studiensemester_kurzbz;
|
||||
$target->ausbildungssemester = $row->ausbildungssemester;
|
||||
$target->gpz = $row->gpz;
|
||||
$target->npz = $row->npz;
|
||||
$target->updateamum = $row->updateamum;
|
||||
$target->updatevon = $row->updatevon;
|
||||
$target->insertamum = $row->insertamum;
|
||||
$target->insertvon = $row->insertvon;
|
||||
$target->apz = $row->apz;
|
||||
$target->studienplan_id = $row->studienplan_id;
|
||||
$target->new = false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Laedt alle Studienplaetze zu einem Studiengang und Semester. Ergebnis
|
||||
* steht in result, wobei es nur einen Datensatz geben kann, wenn
|
||||
* keinAusbildungssemester = true ist.
|
||||
* @param integer $studiengang_kz
|
||||
* @param integer $studiengang_kz
|
||||
* @param string studiensemester_kurzbz
|
||||
* @param string orgform_kurzbz
|
||||
* @param boolean Ausbildungssemester ist optional. Wenn true werden
|
||||
* nur Datensätze geladen wo das Ausbildungssemester null ist. Wenn
|
||||
* false werden alle geladen wo ein Ausbildungssemester eingetragen
|
||||
* nur Datensätze geladen wo das Ausbildungssemester null ist. Wenn
|
||||
* false werden alle geladen wo ein Ausbildungssemester eingetragen
|
||||
* ist.
|
||||
* @return true wenn ok, false im Fehlerfall
|
||||
*/
|
||||
@@ -179,22 +185,63 @@ class studienplatz extends basis_db
|
||||
//" AND art=".$this->db_add_param($art, FHC_STRING, false).
|
||||
" AND orgform_kurzbz=".$this->db_add_param($orgform, FHC_STRING, false).
|
||||
" AND ausbildungssemester ".($keinAusbildungssemester ? 'is null':'is not null');
|
||||
$this->result = array();
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
$this->result = array();
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
while($row = $this->db_fetch_object())
|
||||
{
|
||||
$rec = new studienplatz();
|
||||
$this->mapRow($rec, $row);
|
||||
$this->result[] = $rec;
|
||||
}
|
||||
$rec = new studienplatz();
|
||||
$this->mapRow($rec, $row);
|
||||
$this->result[] = $rec;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Laedt alle Studienplaetze zu einem Studiengang und Semester. Ergebnis
|
||||
* steht in result, wobei es nur einen Datensatz geben kann, wenn
|
||||
* keinAusbildungssemester = true ist.
|
||||
* @param integer $studiengang_kz
|
||||
* @param string studiensemester_kurzbz
|
||||
* @param boolean Ausbildungssemester ist optional. Wenn true werden
|
||||
* nur Datensätze geladen wo das Ausbildungssemester null ist. Wenn
|
||||
* false werden alle geladen wo ein Ausbildungssemester eingetragen
|
||||
* ist.
|
||||
* @return true wenn ok, false im Fehlerfall
|
||||
*/
|
||||
public function load_studiengang_studiensemester($studiengang_kz, $studiensemester_kurzbz, $keinAusbildungssemester = true)
|
||||
{
|
||||
//Pruefen ob $studiengang_kz eine gueltige Zahl ist
|
||||
if(!is_numeric($studiengang_kz) || $studiengang_kz == '')
|
||||
{
|
||||
$this->errormsg = 'studiengang_kz muss eine gültige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
|
||||
//Lesen der Daten aus der Datenbank
|
||||
$qry = "SELECT * FROM lehre.tbl_studienplatz RIGHT JOIN lehre.tbl_studienplan using(studienplan_id) WHERE studiengang_kz=".
|
||||
$this->db_add_param($studiengang_kz, FHC_INTEGER, false).
|
||||
" AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz, FHC_STRING, false).
|
||||
" AND ausbildungssemester ".($keinAusbildungssemester ? 'is null':'is not null').
|
||||
" AND studienplan_id IS NOT NULL;";
|
||||
|
||||
$this->result = array();
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
while($row = $this->db_fetch_object())
|
||||
{
|
||||
$this->result[] = $row;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Liefert Array mit GPZ und NPZ für die FÖBis relevanten Orgformen (BB, VZ, VBB).
|
||||
* Dient als Ersatz für load_studiengang_studiensemester_orgform weil hiermit
|
||||
@@ -207,10 +254,10 @@ class studienplatz extends basis_db
|
||||
{
|
||||
|
||||
// Semesterliste für where klausel erzeugen:
|
||||
$startSemester= 'WS'.substr($studienjahr,0,4);
|
||||
$startSemester= 'WS'.substr($studienjahr,0,4);
|
||||
$semesterList = generateSemesterList($startSemester,($zeitraum*2)-1);
|
||||
$semesterList_comma_separated = "'".join("','",$semesterList)."'";
|
||||
|
||||
|
||||
//Lesen der Daten aus der Datenbank
|
||||
$qry = "SELECT studiensemester_kurzbz,studiengang_kz,
|
||||
sum(case when orgform_kurzbz='VZ' then npz else 0 end) as npz_vz,
|
||||
@@ -220,30 +267,69 @@ class studienplatz extends basis_db
|
||||
sum(case when orgform_kurzbz='VZ' then gpz else 0 end) as gpz_vz,
|
||||
sum(case when orgform_kurzbz='BB' then gpz else 0 end) as gpz_bb,
|
||||
sum(case when orgform_kurzbz='VBB' then gpz else 0 end) as gpz_vbb,
|
||||
sum(gpz) as gpz_gesamt
|
||||
FROM lehre.tbl_studienplatz
|
||||
WHERE ausbildungssemester is null and studiensemester_kurzbz IN ($semesterList_comma_separated)
|
||||
group by studiensemester_kurzbz,studiengang_kz";
|
||||
$this->result = array();
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
sum(gpz) as gpz_gesamt
|
||||
FROM lehre.tbl_studienplatz
|
||||
WHERE ausbildungssemester is null and studiensemester_kurzbz IN ($semesterList_comma_separated)
|
||||
group by studiensemester_kurzbz,studiengang_kz";
|
||||
$this->result = array();
|
||||
if(!$this->db_query($qry))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
$result = array();
|
||||
while($row = $this->db_fetch_object())
|
||||
{
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['BB']['NPZ'] = $row->npz_bb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VZ']['NPZ'] = $row->npz_vz;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VBB']['NPZ'] = $row->npz_vbb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['gesamt']['NPZ'] = $row->npz_gesamt;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['BB']['GPZ'] = $row->gpz_bb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VZ']['GPZ'] = $row->gpz_vz;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VBB']['GPZ'] = $row->gpz_vbb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['gesamt']['GPZ'] = $row->gpz_gesamt;
|
||||
}
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['BB']['NPZ'] = $row->npz_bb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VZ']['NPZ'] = $row->npz_vz;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VBB']['NPZ'] = $row->npz_vbb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['gesamt']['NPZ'] = $row->npz_gesamt;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['BB']['GPZ'] = $row->gpz_bb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VZ']['GPZ'] = $row->gpz_vz;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['VBB']['GPZ'] = $row->gpz_vbb;
|
||||
$result[$row->studiensemester_kurzbz][$row->studiengang_kz]['gesamt']['GPZ'] = $row->gpz_gesamt;
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Liefert alle Studienplätze eines Studiengangs und Semesters
|
||||
* @param string $stg_kz z.B: -16
|
||||
* @param string $studiensemester_kurzbz z.B: WS2015
|
||||
* @return boolean|array false bei Fehler
|
||||
*/
|
||||
public function getFromStgKzAndStudsem($stg_kz, $studiensemester_kurzbz)
|
||||
{
|
||||
|
||||
if(!is_numeric($stg_kz))
|
||||
{
|
||||
$this->errormsg='stg_kz muss eine gueltige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
|
||||
if($studiensemester_kurzbz == "")
|
||||
{
|
||||
$this->errormsg='Es wurde kein gueltiges studiensemester_kurzbz uerbergeben';
|
||||
return false;
|
||||
}
|
||||
|
||||
//Lesen der Daten aus der Datenbank
|
||||
$qry = "SELECT * FROM lehre.tbl_studienplatz
|
||||
JOIN public.tbl_studiengang using(studiengang_kz)
|
||||
WHERE studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
|
||||
AND studiengang_kz=".$this->db_add_param($stg_kz, FHC_INTEGER);
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
$result = array();
|
||||
while($row = $this->db_fetch_object())
|
||||
{
|
||||
$result[] = $row;
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prueft die Variablen auf Gueltigkeit
|
||||
@@ -260,7 +346,7 @@ class studienplatz extends basis_db
|
||||
{
|
||||
$this->errormsg='studiengang_kz enthaelt ungueltige Zeichen';
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(mb_strlen($this->orgform_kurzbz)>3)
|
||||
{
|
||||
$this->errormsg = 'orgform_kurzbz darf nicht länger als 3 Zeichen sein';
|
||||
@@ -284,11 +370,19 @@ class studienplatz extends basis_db
|
||||
{
|
||||
$this->errormsg='npz enthaelt ungueltige Zeichen';
|
||||
return false;
|
||||
}if(!is_numeric($this->apz) && $this->apz!='')
|
||||
{
|
||||
$this->errormsg='apz enthaelt ungueltige Zeichen';
|
||||
return false;
|
||||
}if(!is_numeric($this->studienplan_id) && $this->studienplan_id!='')
|
||||
{
|
||||
$this->errormsg='studienplan_id enthaelt ungueltige Zeichen';
|
||||
return false;
|
||||
}
|
||||
$this->errormsg = '';
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Speichert den aktuellen Datensatz in die Datenbank
|
||||
* Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
|
||||
@@ -305,20 +399,22 @@ class studienplatz extends basis_db
|
||||
{
|
||||
//Neuen Datensatz einfuegen
|
||||
$qry='BEGIN;INSERT INTO lehre.tbl_studienplatz ('.
|
||||
'studiengang_kz, orgform_kurzbz, studiensemester_kurzbz, '.
|
||||
'ausbildungssemester, gpz, npz, insertamum, insertvon, '.
|
||||
'updateamum, updatevon) VALUES('.
|
||||
$this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->orgform_kurzbz).', '.
|
||||
$this->db_add_param($this->studiensemester_kurzbz).', '.
|
||||
$this->db_add_param($this->ausbildungssemester, FHC_INTEGER).', '.
|
||||
//$this->db_add_param($this->art).', '.
|
||||
$this->db_add_param($this->gpz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->npz, FHC_INTEGER).', '.
|
||||
'now(), '.
|
||||
$this->db_add_param($this->insertvon).', '.
|
||||
'now(), '.
|
||||
$this->db_add_param($this->updatevon).');';
|
||||
'studiengang_kz, orgform_kurzbz, studiensemester_kurzbz, '.
|
||||
'ausbildungssemester, gpz, npz, apz, studienplan_id insertamum, insertvon, '.
|
||||
'updateamum, updatevon) VALUES('.
|
||||
$this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->orgform_kurzbz).', '.
|
||||
$this->db_add_param($this->studiensemester_kurzbz).', '.
|
||||
$this->db_add_param($this->ausbildungssemester, FHC_INTEGER).', '.
|
||||
//$this->db_add_param($this->art).', '.
|
||||
$this->db_add_param($this->gpz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->npz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->apz, FHC_INTEGER).', '.
|
||||
$this->db_add_param($this->studienplan_id, FHC_INTEGER).', '.
|
||||
'now(), '.
|
||||
$this->db_add_param($this->insertvon).', '.
|
||||
'now(), '.
|
||||
$this->db_add_param($this->updatevon).');';
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -328,19 +424,21 @@ class studienplatz extends basis_db
|
||||
$this->errormsg = 'studienplatz_id muss eine gueltige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
$qry='UPDATE lehre.tbl_studienplatz SET'.
|
||||
$qry='UPDATE lehre.tbl_studienplatz SET'.
|
||||
' studiengang_kz='.$this->db_add_param($this->studiengang_kz).', '.
|
||||
' orgform_kurzbz='.$this->db_add_param($this->orgform_kurzbz).', '.
|
||||
' studiensemester_kurzbz='.$this->db_add_param($this->studiensemester_kurzbz).', '.
|
||||
' ausbildungssemester='.$this->db_add_param($this->ausbildungssemester).', '.
|
||||
' ausbildungssemester='.$this->db_add_param($this->ausbildungssemester).', '.
|
||||
//' art='.$this->db_add_param($this->art).', '.
|
||||
' gpz='.$this->db_add_param($this->gpz).', '.
|
||||
' npz='.$this->db_add_param($this->npz).', '.
|
||||
' updateamum= now(), '.
|
||||
' updatevon='.$this->db_add_param($this->updatevon).
|
||||
' WHERE studienplatz_id='.$this->db_add_param($this->studienplatz_id, FHC_INTEGER, false).';';
|
||||
' gpz='.$this->db_add_param($this->gpz).', '.
|
||||
' npz='.$this->db_add_param($this->npz).', '.
|
||||
' apz='.$this->db_add_param($this->apz, FHC_INTEGER).', '.
|
||||
' studienplan_id='.$this->db_add_param($this->studienplan_id, FHC_INTEGER).', '.
|
||||
' updateamum= now(), '.
|
||||
' updatevon='.$this->db_add_param($this->updatevon).
|
||||
' WHERE studienplatz_id='.$this->db_add_param($this->studienplatz_id, FHC_INTEGER, false).';';
|
||||
}
|
||||
|
||||
|
||||
if($this->db_query($qry))
|
||||
{
|
||||
if($this->new)
|
||||
@@ -371,7 +469,7 @@ class studienplatz extends basis_db
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return $this->studienplatz_id;
|
||||
@@ -399,7 +497,7 @@ class studienplatz extends basis_db
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,3 +42,9 @@ TD,TH
|
||||
{
|
||||
font-size: 9pt;
|
||||
}
|
||||
table.tablesorter tbody td
|
||||
{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user