Changeset 748

Timestamp:

04/17/09 15:39:30 (14 years ago)

Author:

niltonneto

Message:

Implementações para nova agenda. Desenvolvedor: Alexandre Muller.

Location:

trunk/expressoCalendar

Files:

• js/calendar_functions.js (modified) (3 diffs)
• js/common_functions.js (modified) (1 diff)
• templates/celepar/images/navbar.png (modified) (previous)
• xsl/viewMonth.xsl (modified) (1 diff)
• xsl/viewWeek.xsl (modified) (1 diff)

trunk/expressoCalendar/js/calendar_functions.js

@@ -157 +157 @@
 {
         var _this = this;
+        var div = document.getElementById(this.idEl);
         try {
-            var xsl = XMLTools.load('xsl/view'+type+'.xsl?'+ Date.parse(new Date));
-            var div = document.getElementById(this.idEl);
-            div.innerHTML = xtools.parse(data, xsl);
-            document.getElementById('divAppbox').style.height = "100%";
+                var xsl = XMLTools.load('xsl/view'+type+'.xsl?'+ Date.parse(new Date));
+                div.innerHTML = xtools.parse(data, xsl);
         }
         catch(e){
                 alert(e);
         }
+        document.getElementById('divAppbox').style.height = "100%";
 
         if (type == 'Week' || type == 'Month')
@@ -171 +171 @@
                 var trWeek = document.getElementById('tr_week');
                 for (var i=0; i < trWeek.childNodes.length; i++)
-                        trWeek.childNodes[i].innerHTML = get_lang(trWeek.childNodes[i].innerHTML);
+                        trWeek.childNodes[i].innerHTML = get_lang(trWeek.childNodes[i].innerHTML)+(type=='Week'?" "+id2String((trWeek.childNodes[i].id).substr(8)):"");
         }
 };
@@ -318 +318 @@
                 eventDiv.style.width = widthValue+"px";
 
-                var headerElement = document.getElementById('weekHeader_'+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8));
+                var headerElement = document.getElementById('weekday_'+timeStamp2id(eventDiv.childNodes[1].id).substr(0,8));
                 if (currentPos > 1)
                         eventDiv.style.left = (10+(tempDate.getDay()*122)+(widthValue*currentPos))+"px";

trunk/expressoCalendar/js/common_functions.js

@@ -310 +310 @@
 }
 
+function id2String(id){
+        if (id < 1)
+                return "";
+        objDate = new Date();
+        objDate.setHours(id.substr(8,2));
+        objDate.setMinutes(id.substr(10,2));
+        objDate.setYear(id.substr(0,4));
+        objDate.setDate(id.substr(4,2));
+        objDate.setMonth(id.substr(6,2)-1);
+        return objDate.getDate()+"/"+(objDate.getMonth()+1);
+}
+
 function get_lang(_key)
 {

trunk/expressoCalendar/xsl/viewMonth.xsl

@@ -12 +12 @@
                                 <xsl:for-each select="dayofweek">
                                         <xsl:variable name="dayName" select="dayname" />
-                                        <td id="weekHeader_{$dayName}" class="td_header" height="1%">
+                                        <td id="weekday_{$dayName}" class="td_header" height="1%">
                                                 <xsl:value-of select='$dayName' />
                                         </td>

trunk/expressoCalendar/xsl/viewWeek.xsl

@@ -15 +15 @@
                                         <td class="td_header" width="10%"></td>
                                         <xsl:for-each select="workweek">
-                                                <xsl:variable name="dayIndex" select="dayid" />
-                                                <td id="weekHeader_{$dayIndex}" class="td_header" height="1%">
+                                                <xsl:variable name="dayid" select="dayid" />
+                                                <td id="weekday_{$dayid}" class="td_header" height="1%">
                                                         <xsl:value-of select='dayofweek' />
                                                 </td>