From 42e7381e551433634ef7239b35bfdf50ee09a737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 28 May 2014 08:01:51 +0000
Subject: [PATCH] Ressourcenauslastung korrigiert

---
 content/projekt/ressourcenauslastung.php |  6 ++++--
 include/ressource.class.php              | 11 +++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/content/projekt/ressourcenauslastung.php b/content/projekt/ressourcenauslastung.php
index 9443e1112..40cfd28e0 100755
--- a/content/projekt/ressourcenauslastung.php
+++ b/content/projekt/ressourcenauslastung.php
@@ -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;
 }
diff --git a/include/ressource.class.php b/include/ressource.class.php
index f2397326a..3cddd67e9 100644
--- a/include/ressource.class.php
+++ b/include/ressource.class.php
@@ -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))