(#96) Turn EventsForDay into DayOff when there are no events for day

Author: rexim

ts/Event.ts

@@ -26,14 +26,6 @@ export default class Event implements UiComponent {
         }
     }
 
-    isPast(): boolean {
-        if (this.isCancelled()) {
-            return moment().diff(this._event.datetime, 'seconds') > 0;
-        } else {
-            return moment().diff(this._event.datetime, 'seconds') >= 4 * 60 * 60;
-        }
-    }
-
     isCancelled(): boolean {
         return this._canceldEvents.findIndex((c) => c == this._event.datetime.unix()) >= 0;
     }

ts/EventsForCurrentPeriod.ts

@@ -3,9 +3,11 @@ import * as html from './html';
 import * as list from './list';
 import * as moment from 'moment';
 import ComponentsList from './ComponentsList';
+import ComponentsArray from './ComponentsArray';
 import Event from './Event';
 import EventsForDay from './EventsForDay'
 import UiComponent from './UiComponent';
+import DayOff from './DayOff';
 
 export default class EventsForCurrentPeriod implements UiComponent {
     constructor(private _state: dto.State) {
@@ -14,22 +16,15 @@ export default class EventsForCurrentPeriod implements UiComponent {
     appendTo(entry: HTMLElement | null): void {
         let day = moment().clone().utc().startOf('day').subtract(2, 'days')
 
-        let events = new list.ConcatLists(
-            new list.MappedList(
-                new list.ListOfNumbersRange(1, 16),
-                (_, i) => new EventsForDay(
-                    this._state,
-                    day.clone().add(i, 'days').format("YYYY-MM-DD"),
-                )
-            ).asArray()
-        );
-
         new html.Div(
             new ComponentsList(
-                new list.ConcatLists([
-                    new list.SlicedList(new list.FilteredList(events, (e) => e.isPast()), -2),
-                    new list.FilteredList(events, (e) => !e.isPast())
-                ])
+                new list.MappedList(
+                    new list.ListOfNumbersRange(1, 16),
+                    (_, i) => new EventsForDay(
+                        this._state,
+                        day.clone().add(i, 'days').format("YYYY-MM-DD"),
+                    )
+                )
             ),
             {"class": "events"}
         ).appendTo(entry)

ts/EventsForDay.ts

@@ -3,18 +3,26 @@ import * as list from './list';
 import * as moment from 'moment';
 import Event from './Event'
 import UiComponent from './UiComponent';
+import ComponentsArray from './ComponentsArray';
+import DayOff from './DayOff';
 
 // TODO(#69): EventsForDay can be a concatenation of RecurringEventsForDay and ScheduledEventsForDay objects
-export default class EventsForDay implements UiComponent, list.List<Event> {
+export default class EventsForDay implements UiComponent {
     constructor(private _state: dto.State,
                 private _date: string) {
     }
 
     appendTo(entry: HTMLElement | null): void {
-        this.asArray().forEach((e) => e.appendTo(entry))
+        const events = this._asArray();
+
+        if (events.length > 0) {
+            new ComponentsArray(events).appendTo(entry);
+        } else {
+            new DayOff(this._state, this._date).appendTo(entry);
+        }
     }
 
-    asArray(): Array<Event> {
+    _asArray(): Array<Event> {
         let weekday = moment.tz(this._date, this._state.timezone).isoWeekday();
         return this._state.projects
             .filter(