Changeset 457

Timestamp:

09/22/08 16:44:30 (16 years ago)

Author:

niltonneto

Message:

Alterações feitas por Alexandre Muller.
Melhorias e correção na versão AJAX da Agenda.
Email: amuller@…

Location:

trunk/calendar_new

Files:

• inc/class.bocalendar.inc.php (modified) (1 diff)
• inc/class.uicalendar.inc.php (modified) (4 diffs)
• index.php (modified) (1 diff)
• js/common_functions.js (modified) (5 diffs)
• js/xtools.js (added)
• xsl/detailsDialog.xsl (added)

trunk/calendar_new/inc/class.bocalendar.inc.php

@@ -53 +53 @@
                 // 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)."))";
+                if (!$this->db->query($query))
+                        return false;
+
+                while($this->db->next_record())
+                        $result[] = $this->db->row();
+
+                return $result;
+        }
+
+        function requestDetailsEvent($id) {
+                // Performing SQL query
+                $query = "SELECT title, description, datetime, edatetime, groups, location FROM phpgw_cal where (owner = '".$this->user_id."') and (cal_id = ".$id.")";
                 if (!$this->db->query($query))
                         return false;

trunk/calendar_new/inc/class.uicalendar.inc.php

@@ -23 +23 @@
                 $start = isset ($_REQUEST["start"]) ? $_REQUEST["start"] : NULL;
                 $end = isset ($_REQUEST["end"]) ? $_REQUEST["end"] : NULL;
-                $description = isset ($_REQUEST["desc"]) ? $_REQUEST["desc"] : NULL;
-                if ($start == NULL || $end == NULL || $description == NULL)
+                $title = isset ($_REQUEST["title"]) ? $_REQUEST["title"] : NULL;
+                if ($start == NULL || $end == NULL || $title == NULL)
                         return "false;Empty field";
-                if (!eregi("^[a-zA-Z_.0-9-]*",$description))
+                if (!eregi("^[a-zA-Z_.0-9-]*",$title))
                         return "false;Invalid char in description";
                 if (!eregi("^[0-9]*",$start))
@@ -33 +33 @@
                         return "false;Wrong formed text";
 
-                return $this->db_obj->insertEvent($start, $end, $description, $description);
+                return $this->db_obj->insertEvent($start, $end, $title);
         }
 
@@ -66 +66 @@
 
                 $retorno = "<today>".date('Ydm',$dayViewTime)."</today>";
-                include_once("class.bocalendar.inc.php");
-                $obj = new bocalendar();
 
-                $fromBo = $obj->requestDayCal($dayViewTime);
+                $fromBo = $this->db_obj->requestDayCal($dayViewTime);
 
 
@@ -128 +126 @@
                 return $retorno;
         }
+
+        function getDetails (){
+                $eventId = isset ($_REQUEST["id"]) ? $_REQUEST["id"] : NULL;
+                $fromBo = $this->db_obj->requestDetailsEvent($eventId);
+                $_SESSION['debug'] = $fromBo;
+                foreach ($fromBo[0] as $field => $line) {
+                        $buff .= "<".$field.">".$line."</".$field.">";
+                }
+                return $buff;
+        }
+
         function getViewMonth () {
                 $monthViewTime = isset ($_REQUEST["time"]) ?  strtotime(substr($_REQUEST["time"],0,4)."-".substr($_REQUEST["time"],6,2)."-".substr($_REQUEST["time"],4,2)) : strtotime(date('Y-m-d', time()));

trunk/calendar_new/index.php

@@ -46 +46 @@
 echo "<link rel='stylesheet' href='templates/default/main.css' />"
 ."<script language='JavaScript' type='text/javascript' src='js/globals.js'></script>"
+."<script language='JavaScript' type='text/javascript' src='js/xtools.js'></script>"
 ."<script src='inc/load_lang.php?".$GLOBALS['phpgw_info']['flags']['update_version']."' type='text/javascript'></script>"
 ."<script language='JavaScript' type='text/javascript' src='js/connector.js'></script>"

trunk/calendar_new/js/common_functions.js

@@ -112 +112 @@
                 var showDetailLink = document.createElement('a');
                 showDetailLink.id = "details_" + eventDiv.id;
-                showDetailLink.href = "javascript:alert('show details');";
+                showDetailLink.href = "javascript:showDetails("+eventDiv.id+");";
                 showDetailLink.innerHTML = '<img onmouseover="this.setAttribute(\'width\', \'15\');"'+
                         'onmouseout="this.setAttribute(\'width\', \'10\');"'+
@@ -128 +128 @@
                 lnk2.style.visibility="visible";
         }
+}
+function showDetails(eventId){
+        var handler_getDetails = function (data) 
+        {
+                var xtools = new XTools;
+                var divAddDialog = document.getElementById("divAddDialog");
+                var xsl = XMLTools.load('xsl/detailsDialog.xsl?'+ Date.parse(new Date));
+                if(!divAddDialog) {
+                        divAddDialog = document.createElement("DIV");
+                        divAddDialog.id = 'divAddDialog';
+                        divAddDialog.style.zIndex = "10";
+                        divAddDialog.style.position = "absolute";
+                        divAddDialog.style.display = "none";
+                        document.body.appendChild(divAddDialog);
+                }
+                divAddDialog.style.left = "300px";
+                divAddDialog.style.top  = "200px";
+                divAddDialog.innerHTML = xtools.parse(data, xsl);
+                divAddDialog.style.display = "block";
+        }
+        XMLTools.__RETURN_MODE__ = 'XML';
+        XMLTools.request('$this.uicalendar.getDetails&id='+eventId.id.substr(6), 'GET', handler_getDetails);
 }
 function removeButtons(eventDiv){
@@ -161 +183 @@
 }
 
-function quickAddEvent (description, startTime, endTime)
+function quickAddEvent (title, startTime, endTime)
 {
         var endDate = new Date();
@@ -178 +200 @@
                         var eventDiv = document.createElement('DIV');
                         eventDiv.id = "event_" + serverRet.substr(6,serverRet.length);
-                        eventDiv.innerHTML = description;
+                        eventDiv.innerHTML = title;
                         var endDateDiv = document.createElement('DIV');
                         var startDateDiv = document.createElement('DIV');
@@ -191 +213 @@
 
         }
-        XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'&desc='+description, 'GET', handler_quickAdd);
+        XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'&title='+title, 'GET', handler_quickAdd);
 }