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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2017-06-23 15:40:53 +02:00
parent b901bc1b83 1a9d6de487
commit c0cf8a4fe9
14 changed files with 171 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/adresse.class.php
+53
View File
@@ -450,5 +450,58 @@ class adresse extends basis_db
}
return true;
}
/**
* Laedt die Rechnungsadresse zu der Person die uebergeben wird
* @param $pers_id ID der Person zu der die Adressen geladen werden sollen
* @return true wenn ok, false im Fehlerfall
*/
public function load_rechnungsadresse($pers_id)
{
//Pruefen ob pers_id eine gueltige Zahl ist
if(!is_numeric($pers_id) || $pers_id == '')
{
$this->errormsg = 'person_id muss eine gültige Zahl sein';
return false;
}
//Lesen der Daten aus der Datenbank
$qry = "SELECT * FROM public.tbl_adresse WHERE rechnungsadresse and person_id=".$this->db_add_param($pers_id, FHC_INTEGER, false);
$qry.=" limit 1";
if(!$this->db_query($qry))
{
$this->errormsg = 'Fehler bei einer Datenbankabfrage';
return false;
}
while($row = $this->db_fetch_object())
{
$adr_obj = new adresse();
$adr_obj->adresse_id = $row->adresse_id;
$adr_obj->heimatadresse = $this->db_parse_bool($row->heimatadresse);
$adr_obj->gemeinde = $row->gemeinde;
$adr_obj->name = $row->name;
$adr_obj->nation = $row->nation;
$adr_obj->ort = $row->ort;
$adr_obj->person_id = $row->person_id;
$adr_obj->plz = $row->plz;
$adr_obj->strasse = $row->strasse;
$adr_obj->typ = $row->typ;
$adr_obj->firma_id = $row->firma_id;
$adr_obj->updateamum = $row->updateamum;
$adr_obj->updatevon = $row->updatevon;
$adr_obj->insertamum = $row->insertamum;
$adr_obj->insertvon = $row->insertvon;
$adr_obj->zustelladresse = $this->db_parse_bool($row->zustelladresse);
$adr_obj->rechnungsadresse = $this->db_parse_bool($row->rechnungsadresse);
$adr_obj->anmerkung = $row->anmerkung;
$this->result[] = $adr_obj;
}
return true;
}
}
?>
include/studienplan.class.php
+3 -4
View File
@@ -1162,7 +1162,7 @@ class studienplan extends basis_db
{
$qry= "
SELECT DISTINCT
studienplan_id, tbl_studienplan.bezeichnung, tbl_studiensemester.start
studienplan_id, tbl_studienplan.bezeichnung, tbl_studiensemester.start, tbl_studienordnung.status_kurzbz
FROM
lehre.tbl_studienplan
JOIN
@@ -1174,9 +1174,7 @@ class studienplan extends basis_db
JOIN
public.tbl_studiensemester ON (tbl_studienordnung.gueltigvon = tbl_studiensemester.studiensemester_kurzbz)
WHERE
tbl_studienplan.aktiv=true
AND
tbl_studienordnung.status_kurzbz IN ('approved')";
tbl_studienplan.aktiv=true";
foreach($searchItems as $value)
$qry.=" AND
@@ -1201,6 +1199,7 @@ class studienplan extends basis_db
$obj->studienplan_id = $row->studienplan_id;
$obj->bezeichnung = $row->bezeichnung;
$obj->status_kurzbz = $row->status_kurzbz;
$obj->new=false;
$this->result[] = $obj;