blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ressourcenauslastung korrigiert

Browse Source
This commit is contained in:
Andreas Österreicher
2014-05-28 08:01:51 +00:00
parent d9a55b4573
commit 42e7381e55
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/projekt/ressourcenauslastung.php
+4 -2
View File
@@ -30,16 +30,18 @@ $ressource_arr = array();
$datum_obj = new datum();
$datum = date('Y-m-d',$timestamp);
$endetimestamp = jump_week($timestamp,$showweeks);
$endedatum = date('Y-m-d',$endetimestamp);
if(isset($_GET['typ']) && $_GET['typ']=='projekt')
{
$ressource->getProjektRessourceDatum($datum);
$ressource->getProjektRessourceDatum($datum, $endedatum);
$typ = 'projekt';
$anzahl_warnung = 6;
}
else
{
$ressource->getProjektphaseRessourceDatum($datum);
$ressource->getProjektphaseRessourceDatum($datum, $endedatum);
$typ = 'phase';
$anzahl_warnung = 6;
}
include/ressource.class.php
+5 -6
View File
@@ -109,7 +109,7 @@ class ressource extends basis_db
*/
public function getAllRessourcen()
{
$qry = "SELECT * FROM fue.tbl_ressource order by ressource_id";
$qry = "SELECT * FROM fue.tbl_ressource order by bezeichnung";
$this->result=array();
@@ -425,7 +425,7 @@ class ressource extends basis_db
*
* @param $datum
*/
public function getProjektRessourceDatum($datum)
public function getProjektRessourceDatum($datum, $endedatum)
{
$qry = "
SELECT
@@ -438,7 +438,7 @@ class ressource extends basis_db
LEFT JOIN fue.tbl_projekt_ressource USING(ressource_id)
LEFT JOIN fue.tbl_projekt USING(projekt_kurzbz)
WHERE
(tbl_projekt.beginn<='".addslashes($datum)."' OR tbl_projekt.beginn is null) AND
(tbl_projekt.beginn<='".addslashes($endedatum)."' OR tbl_projekt.beginn is null) AND
(tbl_projekt.ende>='".addslashes($datum)."' OR tbl_projekt.ende is null) ";
if($result = $this->db_query($qry))
@@ -470,7 +470,7 @@ class ressource extends basis_db
*
* @param $datum
*/
public function getProjektphaseRessourceDatum($datum)
public function getProjektphaseRessourceDatum($datum, $endedatum)
{
$qry = "
SELECT
@@ -483,11 +483,10 @@ class ressource extends basis_db
LEFT JOIN fue.tbl_projekt_ressource USING(ressource_id)
LEFT JOIN fue.tbl_projektphase USING(projektphase_id)
WHERE
(tbl_projektphase.start<='".addslashes($datum)."' OR tbl_projektphase.start is null) AND
(tbl_projektphase.start<='".addslashes($endedatum)."' OR tbl_projektphase.start is null) AND
(tbl_projektphase.ende>='".addslashes($datum)."' OR tbl_projektphase.ende is null)
ORDER BY tbl_ressource.bezeichnung";
//echo $qry;
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))