                     length = weeks.length
                     $.each weeks, (key, value) ->
                         that = $ value
-                        weekLength = that.find("td:not(.#{self.classes.muted})").length
-                        if key is 0
-                            if dayShift <= day then eventDate.push that.find("td.drm-date[data-day=#{day}]").data('date')
-                        else if key is (length - 1)
-                            if day < weekLength then eventDate.push that.find("td.drm-date[data-day=#{day}]").data('date')
+                        days = if self.view is 'month' then that.find "td.drm-date" else that.find "td.drm-date[data-hour='All Day Event']"
+                        weekLength = days.length
+                        if key is 0 and length isnt 1
+                            if dayShift <= day then eventDates.push that.find("td.drm-date[data-day=#{day}]").data('date')
+                        else if key is (length - 1) and length isnt 1
+                            if day < weekLength then eventDates.push that.find("td.drm-date[data-day=#{day}]").data('date')
                         else
-                            eventDate.push that.find("td.drm-date[data-day=#{day}]").data('date')
-
-            $.each eventDate, (key, value) ->
-                eventDays.push calendarInner.find "td.drm-date[data-date=#{value}]"
-
-        addDailyEvents: (events, eventDays) =>
+                            eventDates.push that.find("td.drm-date[data-day=#{day}]").data('date')
+
+            eventDates
+
+        addDailyEvents: (events, eventDates) =>
             self = @
             calendarInner = self.calendar.find "div.#{@calendarInnerClass}"
-            days = calendarInner.find('tbody').find "td.drm-date"
+            days = if self.view is 'month' then calendarInner.find "tbody td.drm-date" else calendarInner.find "td.drm-date[data-hour='All Day Event']"
             days.each ->
-                eventDays.push $(@)
-
-        addOneTimeEvents: (events, eventDays) =>
-            self = @
-            calendarInner = self.calendar.find "div.#{@calendarInnerClass}"     
-            eventDate = parseInt(events.eventDate, 10)
-            eventDays.push calendarInner.find "td.drm-date[data-date=#{eventDate}]"
+                eventDates.push $(@).data 'date'
+
+        addOneTimeEvents: (events, eventDates) =>
+            self = @
+            calendarInner = self.calendar.find "div.#{@calendarInnerClass}"
+            eventDates.push parseInt(events.eventDate, 10)
+            eventDates
 
         addEventsToCalendar: (events) =>
             self = @

            @events.push obj
            @addEventsToCalendar @events[obj.id]

        addNewCalendarEvent: (events, calendarItem) =>
            eventList = calendarItem.find "ul.#{@eventClass}"
            length = eventList.length


                weekdays += "<th>#{value}<br>#{self.months[dates.month]} #{dates.date}</th>"
            weekdays += '</tr></thead>'

            week = "<tbody class='drm-week #{weekClass}' data-week='#{weekNumber}'>"

            $.each self.hours, (key, value) ->
                hour = value.name
                week += '<tr>'
                week += "<td><span class='hour'>#{hour}</span></td>"
                $.each self.days, (key, value) ->
                    dates = getDates datesInWeek, key
                    week += "<td class='drm-date' data-month='#{dates.month}' data-date='#{dates.date}' data-year='#{currentYear}' data-day='#{key}' data-hour='#{hour}'></td>"
                week += '</tr>'
            week += '</tbody></table>'

