Changeset 696 for trunk/expressoCalendar/inc

Timestamp:

03/12/09 10:43:22 (15 years ago)

Author:

niltonneto

Message:

Implementação do desenvolvedor (amuller).

Location:

trunk/expressoCalendar/inc

Files:

• class.bocalendar.inc.php (modified) (5 diffs)
• class.uicalendar.inc.php (modified) (4 diffs)

trunk/expressoCalendar/inc/class.bocalendar.inc.php

@@ -18 +18 @@
                         $_SESSION['calendar']['server']['db_type']
                 );
-                $this -> user_id = $_SESSION['calendar']['user']['account_id']; 
+                $this -> user_id = $_SESSION['calendar']['user']['account_id'];
+                $this -> cat_id  = 0;   
         }
 
@@ -30 +31 @@
         function requestDayCal ($dayTime) {
                 $day = getdate($dayTime);
-                $query = ("SELECT * FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".(mktime(0,0,0,$day['mon'],($day['mday']+1),$day['year'])).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".(mktime(0,0,0,$day['mon'],$day['mday']+1,$day['year']))."))");
+                $query = ("SELECT * FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")."(owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".(mktime(0,0,0,$day['mon'],($day['mday']+1),$day['year'])).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".(mktime(0,0,0,$day['mon'],$day['mday']+1,$day['year']))."))");
                 if (!$this->db->query($query))
                         return false;
@@ -51 +52 @@
         function requestWeekCal ($dayTime) {
                 // Performing SQL query
-                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+604800).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+604800)."))";
+                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")." (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+604800).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+604800)."))";
                 if (!$this->db->query($query))
                         return false;
@@ -77 +78 @@
                 // Performing SQL query
                 $day = getdate($dayTime);
-                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".mktime(0,0,0,$day['mon']+1,$day['mday'],$day['year']).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".mktime(0,0,0,$day['month']+1,$day['day'],$day['year'])."))";
+                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")." (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".mktime(0,0,0,$day['mon']+1,$day['mday'],$day['year']).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".mktime(0,0,0,$day['month']+1,$day['day'],$day['year'])."))";
                 if (!$this->db->query($query))
                         return false;
@@ -90 +91 @@
         function requestYearCal ($dayTime) {
                 // Performing SQL query
-                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+31104000).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+2592000)."))";
+                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")." (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+31104000).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+2592000)."))";
                 if (!$this->db->query($query))
                         return false;

trunk/expressoCalendar/inc/class.uicalendar.inc.php

@@ -114 +114 @@
                 if (isset ($_REQUEST["uid"]))
                         $this->db_obj->user_id = $_REQUEST["uid"];
+                if (isset ($_REQUEST["cat"]))
+                        $this->db_obj->cat_id = $_REQUEST["cat"];
+
                 $fromBo = $this->db_obj->requestDayCal($dayTime);
 
@@ -155 +158 @@
                 if (isset($_REQUEST["uid"]))
                         $this->db_obj->user_id = $_REQUEST["uid"];
+                if (isset ($_REQUEST["cat"]))
+                        $this->db_obj->cat_id = $_REQUEST["cat"];
 
                 $dayViewTime -= (date('N', $dayViewTime)%7)*86400;
@@ -195 +200 @@
                 if (isset($_REQUEST["uid"]))
                         $this->db_obj->user_id = $_REQUEST["uid"];
+                if (isset ($_REQUEST["cat"]))
+                        $this->db_obj->cat_id = $_REQUEST["cat"];
 
                 $fromBo = $this->db_obj->requestMonthCal($todayTime);
@@ -234 +241 @@
                 $currentWeekDay = date('w', $monthViewTime);
 
-                for($i = $this->workweekstarts+$currentWeekDay; $i <= $this->workweekends+$currentWeekDay; $i++){
+                for($i = ($this->workweekstarts+$currentWeekDay)-1; $i <= $this->workweekends+$currentWeekDay; $i++){
                         // Dayid is year+month+dayofMonth (currentDay-(dayofWeek+$i))
                         $retorno.= "<dayofweek><dayname>".$this->daysofweek[$i%7]."</dayname></dayofweek>";