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

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

Browse Source 
# Conflicts:
#	locale/de-AT/incoming.php
#	locale/en-US/incoming.php
This commit is contained in:
kindlm
2016-03-15 20:46:14 +01:00
parent 2464db338b 8f038d53f5
commit 5917419cb7
30 changed files with 2758 additions and 1997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ressource.class.php
Regular → Executable
+46 -7
View File
@@ -86,7 +86,8 @@ class ressource extends basis_db
$this->insertamum = $row->insertamum;
$this->insertvon = $row->insertvon;
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
$this->updatevon = $row->updatevon;
$this->funktion_kurzbz = $row->funktion_kurzbz;
return true;
}
else
@@ -129,7 +130,8 @@ class ressource extends basis_db
$obj->insertamum = $row->insertamum;
$obj->insertvon = $row->insertvon;
$obj->updateamum = $row->updateamum;
$obj->updatevon = $row->updatevon;
$obj->updatevon = $row->updatevon;
$obj->funktion_kurzbz = $row->funktion_kurzbz;
$this->result[] = $obj;
}
//var_dump($this->result);
@@ -150,7 +152,7 @@ class ressource extends basis_db
*/
public function getProjectRessourcen($project_kurzbz)
{
$qry = "SELECT ressource.*, project.projekt_ressource_id, project.aufwand FROM fue.tbl_ressource as ressource
$qry = "SELECT ressource.*, project.projekt_ressource_id, project.aufwand, project.funktion_kurzbz FROM fue.tbl_ressource as ressource
JOIN fue.tbl_projekt_ressource project ON(project.ressource_id = ressource.ressource_id)
WHERE project.projekt_kurzbz =".$this->db_add_param($project_kurzbz).";";
@@ -173,7 +175,8 @@ class ressource extends basis_db
$obj->insertvon = $row->insertvon;
$obj->updateamum = $row->updateamum;
$obj->updatevon = $row->updatevon;
$obj->aufwand = $row->aufwand;
$obj->aufwand = $row->aufwand;
$obj->funktion_kurzbz = $row->funktion_kurzbz;
$obj->projekt_ressource_id= $row->projekt_ressource_id;
$this->result[] = $obj;
@@ -187,7 +190,42 @@ class ressource extends basis_db
return false;
}
}
/**
*
* Lädt die Projektressource
* @param $project_ressource_id
* @return true wenn ok, false im Fehlerfall
*/
public function getSingleProjektRessource($projekt_ressource_id)
{
$qry = "select * from fue.tbl_projekt_ressource where projekt_ressource_id = ".$this->db_add_param($projekt_ressource_id);
$this->result=array();
if($this->db_query($qry))
{
if($row = $this->db_fetch_object())
{
$this->ressource_id = $row->ressource_id;
$this->beschreibung = $row->beschreibung;
$this->aufwand = $row->aufwand;
$this->funktion_kurzbz = $row->funktion_kurzbz;
$this->projekt_ressource_id= $row->projekt_ressource_id;
$this->projekt_kurzbz = $row->projekt_kurzbz;
$this->projektphase_id = $row->projektphase_id;
return true;
}
//var_dump($this->result);
return true;
}
else
{
$this->errormsg = 'Fehler beim Laden der Daten';
return false;
}
}
/**
*
* Lädt alle Ressourcen zu einer Phase
@@ -196,7 +234,7 @@ class ressource extends basis_db
*/
public function getPhaseRessourcen($projektphase_id)
{
$qry = "SELECT ressource.*, project.aufwand, project.projekt_ressource_id FROM fue.tbl_ressource as ressource
$qry = "SELECT ressource.*, project.aufwand, project.funktion_kurzbz, project.projekt_ressource_id FROM fue.tbl_ressource as ressource
JOIN fue.tbl_projekt_ressource project ON(project.ressource_id = ressource.ressource_id)
WHERE project.projektphase_id =".$this->db_add_param($projektphase_id, FHC_INTEGER).";";
@@ -219,7 +257,8 @@ class ressource extends basis_db
$obj->insertvon = $row->insertvon;
$obj->updateamum = $row->updateamum;
$obj->updatevon = $row->updatevon;
$obj->aufwand = $row->aufwand;
$obj->aufwand = $row->aufwand;
$obj->funktion_kurzbz = $row->funktion_kurzbz;
$obj->projekt_ressource_id = $row->projekt_ressource_id;
$this->result[] = $obj;
}
include/studienplan.class.php
+17 -9
View File
@@ -690,37 +690,46 @@ class studienplan extends basis_db
}
/**
* Holt den aktiven Studienplan eines Studiensemester / Ausbildungssemesters
* Holt die aktiven Studienplaene eines Studiensemester / Ausbildungssemesters
* @param studiensemester_kurzbz
* @param $ausbuldungssemester
* @param $orgform_kurzbz
*/
function getStudienplan($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz)
function getStudienplaeneFromSem($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz = "")
{
$qry = "SELECT
tbl_studienplan.studienplan_id
*
FROM
lehre.tbl_studienplan
JOIN lehre.tbl_studienordnung USING(studienordnung_id)
JOIN lehre.tbl_studienordnung_semester USING(studienordnung_id)
JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
WHERE
tbl_studienplan.aktiv
AND tbl_studienordnung.studiengang_kz=".$this->db_add_param($studiengang_kz, FHC_INTEGER)."
AND tbl_studienordnung_semester.studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
AND tbl_studienordnung_semester.semester=".$this->db_add_param($ausbildungssemester);
AND tbl_studienplan_semester.studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
AND tbl_studienplan_semester.semester=".$this->db_add_param($ausbildungssemester);
if($orgform_kurzbz!='')
{
$qry.=" AND orgform_kurzbz=".$this->db_add_param($orgform_kurzbz);
}
$res = array();
if($result = $this->db_query($qry))
{
if($row = $this->db_fetch_object($result))
while($row = $this->db_fetch_object($result))
{
return $row->studienplan_id;
$res[] = $row;
}
$this->result = $res;
return true;
}
$this->errormsg = 'Fehler bei einer Datenbankabfrage';
return false;
}
/**
@@ -925,7 +934,6 @@ class studienplan extends basis_db
$data = array();
while ($row = $this->db_fetch_object())
{
$obj = new stdClass();
$data[] = $row->studiensemester_kurzbz;
}
return $data;