Changeset 464
- Timestamp:
- 09/22/08 17:44:03 (16 years ago)
- Location:
- trunk/calendar_new
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar_new/inc/class.bocalendar.inc.php
r457 r464 30 30 function requestDayCal ($dayTime) { 31 31 $query = ("SELECT * FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+86400).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+86400)."))"); 32 33 32 if (!$this->db->query($query)) 34 33 return false; … … 36 35 while($this->db->next_record()) 37 36 $result[] = $this->db->row(); 38 39 37 return $result; 40 38 } -
trunk/calendar_new/inc/class.uicalendar.inc.php
r457 r464 24 24 $end = isset ($_REQUEST["end"]) ? $_REQUEST["end"] : NULL; 25 25 $title = isset ($_REQUEST["title"]) ? $_REQUEST["title"] : NULL; 26 $description = isset ($_REQUEST["desc"]) ? $_REQUEST["desc"] : NULL; 27 26 28 if ($start == NULL || $end == NULL || $title == NULL) 27 29 return "false;Empty field"; … … 33 35 return "false;Wrong formed text"; 34 36 35 return $this->db_obj->insertEvent($start, $end, $title );37 return $this->db_obj->insertEvent($start, $end, $title, $description); 36 38 } 37 39 … … 83 85 $retorno .= "<calEvent>"; 84 86 $retorno .= "<id>".$line['cal_id']."</id>"; 85 $retorno .= "<title>".$line['description']."</title>"; 87 $retorno .= "<title>".$line['title']."</title>"; 88 $retorno .= "<description>".$line['description']."</description>"; 86 89 $retorno .= "<edatetime>".($line['edatetime']*1000)."</edatetime>"; 87 90 $retorno .= "<datetime>".($line['datetime']*1000)."</datetime>"; 88 91 $retorno .= "</calEvent>"; 89 92 } 90 93 91 94 return $retorno; … … 118 121 $retorno .= "<calEvent>"; 119 122 $retorno .= "<id>".$line['cal_id']."</id>"; 120 $retorno .= "<title>".$line['description']."</title>"; 123 $retorno .= "<title>".$line['title']."</title>"; 124 $retorno .= "<description>".$line['description']."</description>"; 121 125 $retorno .= "<edatetime>".($line['edatetime']*1000)."</edatetime>"; 122 126 $retorno .= "<datetime>".($line['datetime']*1000)."</datetime>"; … … 130 134 $eventId = isset ($_REQUEST["id"]) ? $_REQUEST["id"] : NULL; 131 135 $fromBo = $this->db_obj->requestDetailsEvent($eventId); 132 $_SESSION['debug'] = $fromBo;133 136 foreach ($fromBo[0] as $field => $line) { 134 137 $buff .= "<".$field.">".$line."</".$field.">"; … … 169 172 $retorno .= "<calEvent>"; 170 173 $retorno .= "<id>".$line['cal_id']."</id>"; 171 $retorno .= "<title>".$line[' description']."</title>";174 $retorno .= "<title>".$line['title']."</title>"; 172 175 $retorno .= "<edatetime>".($line['edatetime']*1000)."</edatetime>"; 173 176 $retorno .= "<datetime>".($line['datetime']*1000)."</datetime>"; -
trunk/calendar_new/js/calendar_functions.js
r437 r464 52 52 divAddDialog.style.left = "300px"; //cell.offsetLeft + document.body.scrollLeft; 53 53 divAddDialog.style.top = "200px"; //cell.offsetTop - 100 + document.getElementById('div_main').offsetTop; 54 var elData = XMLTools.ParseXmlXsl(data, xsl);55 54 divAddDialog.style.display = "block"; 56 divAddDialog.innerHTML = elData.innerHTML;55 divAddDialog.innerHTML = xtools.parse(data, xsl); 57 56 document.getElementById('dragEventSubject').focus(); 58 57 document.getElementById('addEventLink').innerHTML = get_lang("Add this event"); 58 document.getElementById('addDetailsLink').innerHTML = get_lang("Add with details"); 59 59 60 60 61 var closeButton = document.getElementById('closeDialog'); … … 139 140 var xsl = XMLTools.load('xsl/view'+type+'.xsl?'+ Date.parse(new Date)); 140 141 var div = document.getElementById(this.idEl); 141 div.innerHTML = XMLTools.transform(data, xsl);142 div.innerHTML = xtools.parse(data, xsl); 142 143 } 143 144 catch(e){ -
trunk/calendar_new/js/common_functions.js
r457 r464 18 18 function createEventDiv(eventDiv){ 19 19 eventDiv.className = "event_div"; 20 eventDiv.style.height = parseInt(eventDiv.childNodes[2].id-eventDiv.childNodes[1].id)/120000+"px"; 21 var end_ = timeStamp2id(eventDiv.childNodes[2].id).substr(8); 22 var start_ = parseInt(timeStamp2id(eventDiv.childNodes[1].id).substr(8),10); 23 20 eventDiv.style.height = parseInt(eventDiv.childNodes[1].id-eventDiv.childNodes[0].id)/120000+"px"; 21 var end_ = timeStamp2id(eventDiv.childNodes[1].id).substr(8); 22 var start_ = parseInt(timeStamp2id(eventDiv.childNodes[0].id).substr(8),10); 24 23 if (viewType == "Day"){ 25 24 if (!screenTable[weekDay]) … … 43 42 resizeDiv.id = "resize_" + eventDiv.id; 44 43 resizeDiv.className = 'resize_div'; 45 resizeDiv.style.right = ((parseInt(eventDiv.style.width)-10)*-1)+"px";46 resizeDiv.style.bottom = ((parseInt(eventDiv.style.height)-24)*-1)+"px";47 44 resizeDiv.onmousedown = function() { resizeEvent(eventDiv); }; 48 45 eventDiv.appendChild(resizeDiv); … … 50 47 if (viewType == "Week"){ 51 48 var tempDate = new Date; 52 tempDate.setTime(eventDiv.childNodes[ 2].id);49 tempDate.setTime(eventDiv.childNodes[1].id); 53 50 if (!screenTable[tempDate.getDay()]) 54 51 screenTable[tempDate.getDay()] = new Array(); … … 64 61 eventDiv.style.width = widthValue+"px"; 65 62 66 var headerElement = document.getElementById('weekHeader_'+timeStamp2id(eventDiv.childNodes[ 2].id).substr(0,8));63 var headerElement = document.getElementById('weekHeader_'+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8)); 67 64 if (currentPos > 1) 68 65 eventDiv.style.left = (10+(tempDate.getDay()*122)+(widthValue*currentPos))+"px"; … … 70 67 eventDiv.style.height = "20px"; 71 68 eventDiv.style.cursor = "pointer"; 72 eventDiv.onmouseover = function () { this.style.height = (parseInt(this.style.height)+40)+"px"; this.style.zIndex = 2; };73 eventDiv.onmouseout = function () { this.style.height = (parseInt(this.style.height)-40)+"px"; this.style.zIndex = 1; };74 eventDiv.onclick = function () { calendar.getView('div_main','Day','&time='+timeStamp2id(eventDiv.childNodes[ 2].id).substr(0,8)); };75 } 76 77 var tdElement = document.getElementById(timeStamp2id(eventDiv.childNodes[ 1].id));69 eventDiv.onmouseover = function () { this.style.height = "auto"; this.style.zIndex = 2; }; 70 eventDiv.onmouseout = function () { this.style.height = "20px"; this.style.zIndex = 1; }; 71 eventDiv.onclick = function () { calendar.getView('div_main','Day','&time='+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8)); }; 72 } 73 74 var tdElement = document.getElementById(timeStamp2id(eventDiv.childNodes[0].id)); 78 75 79 76 if (viewType == "Month"){ 80 var tdElement = document.getElementById(timeStamp2id(eventDiv.childNodes[ 1].id).substr(0,8)+'0000');77 var tdElement = document.getElementById(timeStamp2id(eventDiv.childNodes[0].id).substr(0,8)+'0000'); 81 78 eventDiv.style.width = "60px"; 82 79 eventDiv.style.height = "15px"; 83 eventDiv.onclick = function () { calendar.getView('div_main','Day','&time='+timeStamp2id(eventDiv.childNodes[2].id).substr(0,8)); }; 80 eventDiv.onmouseover = function () { this.style.width = "auto"; this.style.zIndex = 2; }; 81 eventDiv.onmouseout = function () { this.style.width = "60px"; this.style.zIndex = 1; }; 82 eventDiv.onclick = function () { calendar.getView('div_main','Day','&time='+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8)); }; 84 83 eventDiv.style.cursor = "pointer"; 85 84 … … 87 86 88 87 if (tdElement.childNodes.length > 3) 89 eventDiv.style.margin = "20 0 0 "+(20+(tdElement.childNodes.length-4)*25); 88 eventDiv.style.margin = "20 0 0 "+(20+(tdElement.childNodes.length-4)*25); 90 89 else 91 90 eventDiv.style.margin = "0 0 0 "+(20+(tdElement.childNodes.length-1)*25); … … 129 128 } 130 129 } 130 131 function addDetails(title,description,datetime,edatetime){ 132 data="<retorno><title>"+title+"</title><description>"+ 133 description+"</description><datetime>"+datetime+ 134 "</datetime><edatetime>"+edatetime+"</edatetime></retorno>"; 135 136 var divAddDialog = document.getElementById("divAddDialog"); 137 var xsl = XMLTools.load('xsl/detailsDialog.xsl?'+ Date.parse(new Date)); 138 if(!divAddDialog) { 139 divAddDialog = document.createElement("DIV"); 140 divAddDialog.id = 'divAddDialog'; 141 divAddDialog.style.zIndex = "10"; 142 divAddDialog.style.position = "absolute"; 143 divAddDialog.style.display = "none"; 144 document.body.appendChild(divAddDialog); 145 } 146 divAddDialog.style.left = "300px"; 147 divAddDialog.style.top = "200px"; 148 divAddDialog.innerHTML = xtools.parse(data, xsl); 149 divAddDialog.style.display = "block"; 150 } 151 131 152 function showDetails(eventId){ 132 153 var handler_getDetails = function (data) 133 154 { 134 var xtools = new XTools;135 155 var divAddDialog = document.getElementById("divAddDialog"); 136 156 var xsl = XMLTools.load('xsl/detailsDialog.xsl?'+ Date.parse(new Date)); … … 163 183 var handler_removeEvent = function (data) { 164 184 var xsl = XMLTools.load('xsl/returnData.xsl?'+ Date.parse(new Date)); 165 var serverRet = XMLTools.transform(data, xsl);185 var serverRet = xtools.parse(data, xsl); 166 186 serverRet = serverRet.substr(serverRet.indexOf('>')+1); 167 187 var retStatus = serverRet.substr(0,5); … … 183 203 } 184 204 185 function quickAddEvent (title, startTime, endTime)205 function quickAddEvent (title, description, startTime, endTime) 186 206 { 187 207 var endDate = new Date(); … … 190 210 var handler_quickAdd = function (data) { 191 211 var xsl = XMLTools.load('xsl/returnData.xsl?'+ Date.parse(new Date)); 192 var serverRet = XMLTools.transform(data, xsl);212 var serverRet = xtools.parse(data, xsl); 193 213 serverRet = serverRet.substr(serverRet.indexOf('>')+1); 194 214 calendar.dialog('infowindow'); … … 213 233 214 234 } 215 XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'&title='+title , 'GET', handler_quickAdd);235 XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'&title='+title+'&desc='+description, 'GET', handler_quickAdd); 216 236 } 217 237 218 238 function changeEvent(objEvent,field,value){ 219 init_ = timeStamp2id(objEvent.childNodes[ 1].id).substr(8);220 end_ = timeStamp2id(objEvent.childNodes[ 2].id).substr(8);239 init_ = timeStamp2id(objEvent.childNodes[0].id).substr(8); 240 end_ = timeStamp2id(objEvent.childNodes[1].id).substr(8); 221 241 222 242 var handler_changeEvent = function (data){ 223 243 var xsl = XMLTools.load('xsl/returnData.xsl?'+ Date.parse(new Date)); 224 var serverRet = XMLTools.transform(data, xsl);244 var serverRet = xtools.parse(data, xsl); 225 245 serverRet = serverRet.substr(serverRet.indexOf('>')+1); 226 246 var retStatus = serverRet.substr(1,5); … … 233 253 screenTable[weekDay][hour]--; 234 254 235 objEvent.childNodes[ 2].id = value*1000;255 objEvent.childNodes[1].id = value*1000; 236 256 var resizeIcon = document.getElementById("resize_"+objEvent.id); 237 257 resizeIcon.parentNode.removeChild(resizeIcon); -
trunk/calendar_new/js/connector.js
r420 r464 283 283 284 284 var XMLTools = new XMLTools(); 285 var xtools = new XTools; -
trunk/calendar_new/js/drag_area.js
r437 r464 95 95 } 96 96 97 counter = 0; 98 DragArea.prototype.moveWindow = function(e) { 99 var _event = is_ie ? window.event : e; 100 var _button = is_ie ? _event.button : _event.which; 101 var id = "divAddDialog"; 102 if (this.pressed){ 103 document.getElementById(id).style.left = (_event.clientX - 70) + "px"; 104 document.getElementById(id).style.top = (_event.clientY - 70) + "px"; 105 } 106 } 97 107 var _dragArea = new DragArea(); -
trunk/calendar_new/setup/phpgw_pt-br.lang
r420 r464 9 9 Year View calendar pt-br Visão Anual 10 10 Add this event calendar pt-br Adicionar este evento 11 Add with details calendar pt-br Adicionar com mais detalhes 11 12 Sunday calendar pt-br Domingo 12 13 Monday calendar pt-br Segunda-feira -
trunk/calendar_new/templates/default/main.css
r437 r464 60 60 61 61 .resize_div { 62 position: relative;62 position: absolute; 63 63 background: url(./images/resize.png); 64 64 width: 11px; 65 65 height: 11px; 66 bottom: 0px; 67 right: 0px; 66 68 cursor: se-resize; 67 69 } … … 70 72 background-color: rgb(239, 239, 231); 71 73 -moz-border-radius: 5px 5px 5px 5px; 72 width: 130px;74 width: auto; 73 75 border: 2px #AAA solid; 74 76 color: #1111AA; -
trunk/calendar_new/xsl/addDialog.xsl
r437 r464 2 2 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 3 3 <xsl:template match="/text"> 4 <div style="position:absolute;left: 0px; top: 0px;"id="infowindow">5 <table style="position: absolute; width: 350px; height: 1 50px;" border="0" cellpadding="0" cellspacing="0">4 <div id="infowindow"> 5 <table style="position: absolute; width: 350px; height: 175px;" border="0" cellpadding="0" cellspacing="0" onmousedown="_dragArea.pressed = 1" onmouseup="_dragArea.pressed = 0" onmousemove="_dragArea.moveWindow(event)"> 6 6 <tbody> 7 7 <tr style="height: 24px;"> … … 17 17 </td> 18 18 <td> 19 <div style="overflow: hidden; height: 1 10; background-color: #ffffff; z-index: 183; cursor: default">19 <div style="overflow: hidden; height: 130; background-color: #ffffff; z-index: 183; cursor: default"> 20 20 <br/> 21 21 <font size="-1"><xsl:value-of select="date" /></font> … … 28 28 <td><font size="-1"><label forid="b_subject">Título:</label></font></td> 29 29 <td class="" id="bubble_input"> 30 <input style="height:18px" id="dragEventSubject" size="35" name="b_subject"/> 30 <input style="height:18px" id="dragEventSubject" size="35" name="b_subject"/> 31 </td> 32 </tr> 33 <tr> 34 <td><font size="-1"><label forid="b_bdescription">Descrição:</label></font></td> 35 <td class="" id="bubble_input"> 36 <input style="height:18px" id="dragEventDescription" size="35" name="b_description"/> 31 37 </td> 32 38 </tr> 33 39 </tbody></table> 34 <br/> 35 <div id="addEventLink" class="buttontype" onclick="quickAddEvent(document.getElementById('dragEventSubject').value,_dragArea.initEvent,_dragArea.endEvent);">Add event</div> 40 <table><tbody><tr> 41 <td> 42 <div id="addEventLink" class="buttontype" onclick="quickAddEvent(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);">Add event</div></td><td> 43 <div id="addDetailsLink" class="buttontype" onclick="addDetails(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);">Add with details</div></td> 44 </tr> 45 </tbody></table> 36 46 <img id="closeDialog" onclick="calendar.dialog()" src="templates/default/images/close.gif" style="position: absolute; z-index: 184; cursor: pointer;"/> 37 47 </div> -
trunk/calendar_new/xsl/viewDay.xsl
r429 r464 26 26 <xsl:if test="id > 0"> 27 27 <div id="event_{$event_id}"> 28 <xsl:value-of select='title' />29 28 <div id="{$datetime}"></div> 30 29 <div id="{$edatetime}"></div> 30 <xsl:value-of select='title' /> 31 <br/> 32 <xsl:value-of select='description' /> 31 33 </div> 32 34 </xsl:if> -
trunk/calendar_new/xsl/viewMonth.xsl
r437 r464 37 37 <xsl:if test="id > 0"> 38 38 <div id="event_{$event_id}"> 39 <xsl:value-of select='title' />40 39 <div id="{$datetime}"></div> 41 40 <div id="{$edatetime}"></div> 41 <xsl:value-of select='title' /> 42 42 </div> 43 43 </xsl:if> -
trunk/calendar_new/xsl/viewWeek.xsl
r420 r464 46 46 <xsl:if test="id > 0"> 47 47 <div id="event_{$event_id}"> 48 <xsl:value-of select='title' />49 48 <div id="{$datetime}"></div> 50 49 <div id="{$edatetime}"></div> 50 <xsl:value-of select='title' /> 51 <br/> 52 <xsl:value-of select='description' /> 51 53 </div> 52 54 </xsl:if>
Note: See TracChangeset
for help on using the changeset viewer.