bugfix (eventdetails on second day were the ones from the first day)

robertkowalski · Aug 5, 2011 · 443486f · 443486f
1 parent d015bb1
commit 443486f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/source/Main.js b/source/Main.js
@@ -95,6 +95,7 @@ enyo.kind({
         this.getNetworkStatus();
 
         this.dayData = [];
+        this.day = 0;
     },
     rendered: function() {
         this.inherited(arguments);
@@ -178,7 +179,7 @@ enyo.kind({
             this.$.rooms.createComponent({flex: 1, style:"width:320px; float:left;",
                 name: "dayList" + i, owner: this, kind: "VirtualRepeater", onSetupRow: "listSetupRow",
                 className: "list", components: [
-                    {owner:this, name: "EventItem" + i, kind: "EventItem",
+                    {owner: this, name: "EventItem" + i, kind: "EventItem",
                         className: "item", popup: "eventInfoPopup", day: 0, room: i,
                         onEntryClick: "showPopup", components: [
                     ]}
@@ -199,6 +200,7 @@ enyo.kind({
     },
     buttonItemClick: function(inSender) {
         this.humanDay = inSender.day + 1;
+        this.day = inSender.day;
 
         for (var i = 0; i < this.buttonNames.length; i++) {
             if (inSender.name != this.buttonNames[i]) {
@@ -215,7 +217,6 @@ enyo.kind({
 
             html += "<div style='width: 320px; text-align:center; float: left;'>" + this.data.schedule.day[inSender.day].room[i].name + "</div>";
 
-
             this.room = i;
             this.dayData = this.data.schedule.day[inSender.day].room[i].event;
             this.$["dayList" + i].render();
@@ -228,7 +229,7 @@ enyo.kind({
         this.$.slidingPane.back(e);
     },
     listSetupRow: function(inSender, inIndex) {
-        //console.log(inSender.name)
+
         try {
             var record = this.dayData[inIndex];
         } catch(e) {
@@ -237,6 +238,8 @@ enyo.kind({
 
         if (record) {
             this.$['EventItem' + this.room].setEntry(record);
+            this.$['EventItem' + this.room].day = this.day;
+
             return true;
         }
     },

diff --git a/source/ProcessFeed.js b/source/ProcessFeed.js
@@ -48,21 +48,18 @@ enyo.kind({
     calculateStartEnding: function (minutes) {
         var minutes = Number(minutes);
         if (minutes <= 240) {
+
             return minutes + 1440
         } else {
+
             return minutes
         }
     },
-    minutesToHours: function (minutes) {
-        var minutes = Number(minutes);
-        var hours = minutes / 60;
-        console.log(hours);
-    },
     calculateEndHuman: function (startTime, duration, date) {
         var startTime = startTime.split(':');
-        //2011-08-13
-        var dayDate = date.split('-');
-        //new Date(jahr, monat-1, tag, stunde, minute
+
+        var dayDate = date.split('-'); //2011-08-13
+
         var dateObj = new Date(Number(dayDate[0]), Number(dayDate[1]) - 1, Number(dayDate[2]), Number(startTime[0]), Number(startTime[1]));
         var timeStamp = Number(dateObj.getTime());
 
@@ -78,11 +75,10 @@ enyo.kind({
         } else {
             resultminutes = resultObj.getMinutes();
         }
+
         return resultObj.getHours() + ":" + resultminutes
     },
-
     dataChanged: function() {
-
         for (var day = 0; day < this.data.schedule.day.length; day++) {
             var date = this.data.schedule.day[day].date;
             for (var room = 0; room < this.data.schedule.day[day].room.length; room++) {
@@ -100,11 +96,9 @@ enyo.kind({
                             this.data.schedule.day[day].room[room][e][i].endMinutes = this.data.schedule.day[day].room[room].event[i].startMinutes + this.data.schedule.day[day].room[room].event[i].durationMinutes;
                             this.data.schedule.day[day].room[room][e][i].end = this.calculateEndHuman(this.data.schedule.day[day].room[room].event[i].start, this.data.schedule.day[day].room[room].event[i].durationMinutes, date);
                             this.data.schedule.day[day].room[room][e][i].empty = false;
-
                         }
                     }
                 }
-
                 if ("undefined" == typeof(this.data.schedule.day[day].room[room].event)) {
                     this.data.schedule.day[day].room[room].event = [];
                     this.data.schedule.day[day].room[room].event[0] = {};