summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authormichael pereira2011-03-29 11:01:35 +0200
committermichael pereira2011-03-29 11:01:35 +0200
commitecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb (patch)
tree4b40a4178c2dc3bd3fe21730a29dd07bb8742790 /library
parentPreboot User Controller fertig, ACL fehlt noch (diff)
parentselectmembership von auth zu person verschoben fbgui module (diff)
downloadpbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.tar.gz
pbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.tar.xz
pbs2-ecb5c8d8c31ad70bb24e0ea1cfb6110bcd0a96bb.zip
zfconf
Diffstat (limited to 'library')
-rw-r--r--library/Pbs/Filter.php10
-rw-r--r--library/Pbs/Graph.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 753bdf7..81ec205 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -248,10 +248,10 @@ class Pbs_Filter{
// Time
$filtertypID = 7;
if(!$testFilter){
- $nowShort = date("h:i");
+ $nowShort = date("H:i");
}
else{
- $nowShort = date("h:i",$time);
+ $nowShort = date("H:i",$time);
}
$nowShort = str_replace(":","",$nowShort);
@@ -262,7 +262,7 @@ class Pbs_Filter{
REPLACE(fe.filtervalue,":","") <= '.$nowShort.' AND
REPLACE(fe.filtervalue2,":","") >= '.$nowShort." AND
fe.filterID = f.filterID AND
- f.groupID = '".$groupID."'");
+ f.groupID = '".$groupID."'");
$result = $stmt->fetchAll();
foreach($result as $r){
$set[$filtertypID][] = $r['filterID'];
@@ -323,7 +323,7 @@ class Pbs_Filter{
if($debuglevel >= 3)
print_a('weekday',$result,$set[$filtertypID]);
#########################################################
- // weekday
+ // date
$filtertypID = 11;
if(!$testFilter){
$date = date('d.m.Y');
@@ -344,7 +344,7 @@ class Pbs_Filter{
catch(Exception $e){}
if($debuglevel >= 3)
- print_a('weekday',$result,$set[$filtertypID]);
+ print_a('date',$result,$set[$filtertypID]);
########################################
// ErgebnisSet auswerten
if($debuglevel >= 2)
diff --git a/library/Pbs/Graph.php b/library/Pbs/Graph.php
index fc21336..df36ac4 100644
--- a/library/Pbs/Graph.php
+++ b/library/Pbs/Graph.php
@@ -17,7 +17,7 @@ class Pbs_Graph{
size="5,5";
graph[ bgcolor=transparent ];
node [ style=filled fillcolor="#ffffffff" ];
- "'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#003592FF"];
+ "'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];
';
$this->getParentGroups($groupID);
$this->getChildGroups($groupID);