Merge pull request #1393 from gdg-x/date

abraham · web-flow · commit f624278f0c76 · 2020-10-05T21:48:04.000-05:00
Update schedule types
diff --git a/docs/default-firebase-data.json b/docs/default-firebase-data.json
@@ -150,13 +150,14 @@
   ],
   "schedule": {
     "2016-09-09": {
+      "date": "2016-09-09",
       "dateReadable": "September 9",
       "timeslots": [
         {
           "endTime": "10:00",
           "sessions": [
             {
-              "items": [132]
+              "items": ["132"]
             }
           ],
           "startTime": "09:00"
@@ -165,7 +166,7 @@
           "endTime": "10:15",
           "sessions": [
             {
-              "items": [136]
+              "items": ["136"]
             }
           ],
           "startTime": "10:00"
@@ -174,7 +175,7 @@
           "endTime": "11:00",
           "sessions": [
             {
-              "items": [139]
+              "items": ["139"]
             }
           ],
           "startTime": "10:15"
@@ -183,14 +184,14 @@
           "endTime": "11:40",
           "sessions": [
             {
-              "items": [103, 112]
+              "items": ["103", "112"]
             },
             {
-              "items": [120]
+              "items": ["120"]
             },
             {
               "extend": 3,
-              "items": [109]
+              "items": ["109"]
             }
           ],
           "startTime": "11:00"
@@ -199,10 +200,10 @@
           "endTime": "12:30",
           "sessions": [
             {
-              "items": [129]
+              "items": ["129"]
             },
             {
-              "items": [116]
+              "items": ["116"]
             }
           ],
           "startTime": "11:50"
@@ -211,7 +212,7 @@
           "endTime": "14:00",
           "sessions": [
             {
-              "items": [133]
+              "items": ["133"]
             }
           ],
           "startTime": "12:30"
@@ -220,14 +221,14 @@
           "endTime": "14:40",
           "sessions": [
             {
-              "items": [101]
+              "items": ["101"]
             },
             {
-              "items": [118]
+              "items": ["118"]
             },
             {
               "extend": 2,
-              "items": [107]
+              "items": ["107"]
             }
           ],
           "startTime": "14:00"
@@ -236,10 +237,10 @@
           "endTime": "15:30",
           "sessions": [
             {
-              "items": [140]
+              "items": ["140"]
             },
             {
-              "items": [126]
+              "items": ["126"]
             }
           ],
           "startTime": "14:50"
@@ -248,7 +249,7 @@
           "endTime": "16:00",
           "sessions": [
             {
-              "items": [134]
+              "items": ["134"]
             }
           ],
           "startTime": "15:30"
@@ -257,14 +258,14 @@
           "endTime": "16:40",
           "sessions": [
             {
-              "items": [105]
+              "items": ["105"]
             },
             {
-              "items": [127]
+              "items": ["127"]
             },
             {
               "extend": 3,
-              "items": [119]
+              "items": ["119"]
             }
           ],
           "startTime": "16:00"
@@ -273,10 +274,10 @@
           "endTime": "17:30",
           "sessions": [
             {
-              "items": [112]
+              "items": ["112"]
             },
             {
-              "items": [111]
+              "items": ["111"]
             }
           ],
           "startTime": "16:50"
@@ -285,10 +286,10 @@
           "endTime": "18:20",
           "sessions": [
             {
-              "items": [106]
+              "items": ["106"]
             },
             {
-              "items": [125]
+              "items": ["125"]
             }
           ],
           "startTime": "17:40"
@@ -297,7 +298,7 @@
           "endTime": "22:30",
           "sessions": [
             {
-              "items": [137]
+              "items": ["137"]
             }
           ],
           "startTime": "18:30"
@@ -316,13 +317,14 @@
       ]
     },
     "2016-09-10": {
+      "date": "2016-09-10",
       "dateReadable": "September 10",
       "timeslots": [
         {
           "endTime": "10:10",
           "sessions": [
             {
-              "items": [135]
+              "items": ["135"]
             }
           ],
           "startTime": "09:30"
@@ -331,13 +333,13 @@
           "endTime": "10:50",
           "sessions": [
             {
-              "items": [114]
+              "items": ["114"]
             },
             {
-              "items": [117]
+              "items": ["117"]
             },
             {
-              "items": [121]
+              "items": ["121"]
             }
           ],
           "startTime": "10:10"
@@ -346,14 +348,14 @@
           "endTime": "11:40",
           "sessions": [
             {
-              "items": [122]
+              "items": ["122"]
             },
             {
-              "items": [113]
+              "items": ["113"]
             },
             {
               "extend": 2,
-              "items": [121]
+              "items": ["121"]
             }
           ],
           "startTime": "11:00"
@@ -362,10 +364,10 @@
           "endTime": "12:30",
           "sessions": [
             {
-              "items": [104]
+              "items": ["104"]
             },
             {
-              "items": [124]
+              "items": ["124"]
             }
           ],
           "startTime": "11:50"
@@ -374,7 +376,7 @@
           "endTime": "14:00",
           "sessions": [
             {
-              "items": [133]
+              "items": ["133"]
             }
           ],
           "startTime": "12:30"
@@ -383,14 +385,14 @@
           "endTime": "14:40",
           "sessions": [
             {
-              "items": [108]
+              "items": ["108"]
             },
             {
-              "items": [128]
+              "items": ["128"]
             },
             {
               "extend": 2,
-              "items": [102]
+              "items": ["102"]
             }
           ],
           "startTime": "14:00"
@@ -399,10 +401,10 @@
           "endTime": "15:30",
           "sessions": [
             {
-              "items": [110]
+              "items": ["110"]
             },
             {
-              "items": [123]
+              "items": ["123"]
             }
           ],
           "startTime": "14:50"
@@ -411,7 +413,7 @@
           "endTime": "16:00",
           "sessions": [
             {
-              "items": [134]
+              "items": ["134"]
             }
           ],
           "startTime": "15:30"
@@ -420,14 +422,14 @@
           "endTime": "16:40",
           "sessions": [
             {
-              "items": [131]
+              "items": ["131"]
             },
             {
-              "items": [140]
+              "items": ["140"]
             },
             {
               "extend": 2,
-              "items": [130]
+              "items": ["130"]
             }
           ],
           "startTime": "16:00"
@@ -436,10 +438,10 @@
           "endTime": "17:30",
           "sessions": [
             {
-              "items": [115]
+              "items": ["115"]
             },
             {
-              "items": [140]
+              "items": ["140"]
             }
           ],
           "startTime": "16:50"
diff --git a/src/models/day.test.ts b/src/models/day.test.ts
@@ -5,7 +5,7 @@ import { allKeys } from './utils';
 describe('day', () => {
   it('matches the shape of the default data', () => {
     const days: Day[] = Object.values(data['schedule']);
-    const keys: Array<keyof Day> = ['dateReadable', 'timeslots', 'tracks'];
+    const keys: Array<keyof Day> = ['date', 'dateReadable', 'timeslots', 'tracks'];
     expect(days).toHaveLength(2);
     expect(allKeys(days)).toStrictEqual(keys);
   });
diff --git a/src/models/day.ts b/src/models/day.ts
@@ -2,6 +2,7 @@ import { Timeslot } from './timeslot';
 import { Track } from './track';
 
 export interface Day {
+  date: string;
   dateReadable: string;
   timeslots: Timeslot[];
   tracks: Track[];
diff --git a/src/models/time.ts b/src/models/time.ts
@@ -1,4 +1,4 @@
 export interface Time {
   extend?: number;
-  items: number[];
+  items: string[];
 }

Original file line number	Diff line number	Diff line change
`@@ -150,13 +150,14 @@`
`150`	`150`	`],`
`151`	`151`	`"schedule": {`
`152`	`152`	`"2016-09-09": {`
	`153`	`+ "date": "2016-09-09",`
`153`	`154`	`"dateReadable": "September 9",`
`154`	`155`	`"timeslots": [`
`155`	`156`	`{`
`156`	`157`	`"endTime": "10:00",`
`157`	`158`	`"sessions": [`
`158`	`159`	`{`
`159`		`- "items": [132]`
	`160`	`+ "items": ["132"]`
`160`	`161`	`}`
`161`	`162`	`],`
`162`	`163`	`"startTime": "09:00"`
`@@ -165,7 +166,7 @@`
`165`	`166`	`"endTime": "10:15",`
`166`	`167`	`"sessions": [`
`167`	`168`	`{`
`168`		`- "items": [136]`
	`169`	`+ "items": ["136"]`
`169`	`170`	`}`
`170`	`171`	`],`
`171`	`172`	`"startTime": "10:00"`
`@@ -174,7 +175,7 @@`
`174`	`175`	`"endTime": "11:00",`
`175`	`176`	`"sessions": [`
`176`	`177`	`{`
`177`		`- "items": [139]`
	`178`	`+ "items": ["139"]`
`178`	`179`	`}`
`179`	`180`	`],`
`180`	`181`	`"startTime": "10:15"`
`@@ -183,14 +184,14 @@`
`183`	`184`	`"endTime": "11:40",`
`184`	`185`	`"sessions": [`
`185`	`186`	`{`
`186`		`- "items": [103, 112]`
	`187`	`+ "items": ["103", "112"]`
`187`	`188`	`},`
`188`	`189`	`{`
`189`		`- "items": [120]`
	`190`	`+ "items": ["120"]`
`190`	`191`	`},`
`191`	`192`	`{`
`192`	`193`	`"extend": 3,`
`193`		`- "items": [109]`
	`194`	`+ "items": ["109"]`
`194`	`195`	`}`
`195`	`196`	`],`
`196`	`197`	`"startTime": "11:00"`
`@@ -199,10 +200,10 @@`
`199`	`200`	`"endTime": "12:30",`
`200`	`201`	`"sessions": [`
`201`	`202`	`{`
`202`		`- "items": [129]`
	`203`	`+ "items": ["129"]`
`203`	`204`	`},`
`204`	`205`	`{`
`205`		`- "items": [116]`
	`206`	`+ "items": ["116"]`
`206`	`207`	`}`
`207`	`208`	`],`
`208`	`209`	`"startTime": "11:50"`
`@@ -211,7 +212,7 @@`
`211`	`212`	`"endTime": "14:00",`
`212`	`213`	`"sessions": [`
`213`	`214`	`{`
`214`		`- "items": [133]`
	`215`	`+ "items": ["133"]`
`215`	`216`	`}`
`216`	`217`	`],`
`217`	`218`	`"startTime": "12:30"`
`@@ -220,14 +221,14 @@`
`220`	`221`	`"endTime": "14:40",`
`221`	`222`	`"sessions": [`
`222`	`223`	`{`
`223`		`- "items": [101]`
	`224`	`+ "items": ["101"]`
`224`	`225`	`},`
`225`	`226`	`{`
`226`		`- "items": [118]`
	`227`	`+ "items": ["118"]`
`227`	`228`	`},`
`228`	`229`	`{`
`229`	`230`	`"extend": 2,`
`230`		`- "items": [107]`
	`231`	`+ "items": ["107"]`
`231`	`232`	`}`
`232`	`233`	`],`
`233`	`234`	`"startTime": "14:00"`
`@@ -236,10 +237,10 @@`
`236`	`237`	`"endTime": "15:30",`
`237`	`238`	`"sessions": [`
`238`	`239`	`{`
`239`		`- "items": [140]`
	`240`	`+ "items": ["140"]`
`240`	`241`	`},`
`241`	`242`	`{`
`242`		`- "items": [126]`
	`243`	`+ "items": ["126"]`
`243`	`244`	`}`
`244`	`245`	`],`
`245`	`246`	`"startTime": "14:50"`
`@@ -248,7 +249,7 @@`
`248`	`249`	`"endTime": "16:00",`
`249`	`250`	`"sessions": [`
`250`	`251`	`{`
`251`		`- "items": [134]`
	`252`	`+ "items": ["134"]`
`252`	`253`	`}`
`253`	`254`	`],`
`254`	`255`	`"startTime": "15:30"`
`@@ -257,14 +258,14 @@`
`257`	`258`	`"endTime": "16:40",`
`258`	`259`	`"sessions": [`
`259`	`260`	`{`
`260`		`- "items": [105]`
	`261`	`+ "items": ["105"]`
`261`	`262`	`},`
`262`	`263`	`{`
`263`		`- "items": [127]`
	`264`	`+ "items": ["127"]`
`264`	`265`	`},`
`265`	`266`	`{`
`266`	`267`	`"extend": 3,`
`267`		`- "items": [119]`
	`268`	`+ "items": ["119"]`
`268`	`269`	`}`
`269`	`270`	`],`
`270`	`271`	`"startTime": "16:00"`
`@@ -273,10 +274,10 @@`
`273`	`274`	`"endTime": "17:30",`
`274`	`275`	`"sessions": [`
`275`	`276`	`{`
`276`		`- "items": [112]`
	`277`	`+ "items": ["112"]`
`277`	`278`	`},`
`278`	`279`	`{`
`279`		`- "items": [111]`
	`280`	`+ "items": ["111"]`
`280`	`281`	`}`
`281`	`282`	`],`
`282`	`283`	`"startTime": "16:50"`
`@@ -285,10 +286,10 @@`
`285`	`286`	`"endTime": "18:20",`
`286`	`287`	`"sessions": [`
`287`	`288`	`{`
`288`		`- "items": [106]`
	`289`	`+ "items": ["106"]`
`289`	`290`	`},`
`290`	`291`	`{`
`291`		`- "items": [125]`
	`292`	`+ "items": ["125"]`
`292`	`293`	`}`
`293`	`294`	`],`
`294`	`295`	`"startTime": "17:40"`
`@@ -297,7 +298,7 @@`
`297`	`298`	`"endTime": "22:30",`
`298`	`299`	`"sessions": [`
`299`	`300`	`{`
`300`		`- "items": [137]`
	`301`	`+ "items": ["137"]`
`301`	`302`	`}`
`302`	`303`	`],`
`303`	`304`	`"startTime": "18:30"`
`@@ -316,13 +317,14 @@`
`316`	`317`	`]`
`317`	`318`	`},`
`318`	`319`	`"2016-09-10": {`
	`320`	`+ "date": "2016-09-10",`
`319`	`321`	`"dateReadable": "September 10",`
`320`	`322`	`"timeslots": [`
`321`	`323`	`{`
`322`	`324`	`"endTime": "10:10",`
`323`	`325`	`"sessions": [`
`324`	`326`	`{`
`325`		`- "items": [135]`
	`327`	`+ "items": ["135"]`
`326`	`328`	`}`
`327`	`329`	`],`
`328`	`330`	`"startTime": "09:30"`
`@@ -331,13 +333,13 @@`
`331`	`333`	`"endTime": "10:50",`
`332`	`334`	`"sessions": [`
`333`	`335`	`{`
`334`		`- "items": [114]`
	`336`	`+ "items": ["114"]`
`335`	`337`	`},`
`336`	`338`	`{`
`337`		`- "items": [117]`
	`339`	`+ "items": ["117"]`
`338`	`340`	`},`
`339`	`341`	`{`
`340`		`- "items": [121]`
	`342`	`+ "items": ["121"]`
`341`	`343`	`}`
`342`	`344`	`],`
`343`	`345`	`"startTime": "10:10"`
`@@ -346,14 +348,14 @@`
`346`	`348`	`"endTime": "11:40",`
`347`	`349`	`"sessions": [`
`348`	`350`	`{`
`349`		`- "items": [122]`
	`351`	`+ "items": ["122"]`
`350`	`352`	`},`
`351`	`353`	`{`
`352`		`- "items": [113]`
	`354`	`+ "items": ["113"]`
`353`	`355`	`},`
`354`	`356`	`{`
`355`	`357`	`"extend": 2,`
`356`		`- "items": [121]`
	`358`	`+ "items": ["121"]`
`357`	`359`	`}`
`358`	`360`	`],`
`359`	`361`	`"startTime": "11:00"`
`@@ -362,10 +364,10 @@`
`362`	`364`	`"endTime": "12:30",`
`363`	`365`	`"sessions": [`
`364`	`366`	`{`
`365`		`- "items": [104]`
	`367`	`+ "items": ["104"]`
`366`	`368`	`},`
`367`	`369`	`{`
`368`		`- "items": [124]`
	`370`	`+ "items": ["124"]`
`369`	`371`	`}`
`370`	`372`	`],`
`371`	`373`	`"startTime": "11:50"`
`@@ -374,7 +376,7 @@`
`374`	`376`	`"endTime": "14:00",`
`375`	`377`	`"sessions": [`
`376`	`378`	`{`
`377`		`- "items": [133]`
	`379`	`+ "items": ["133"]`
`378`	`380`	`}`
`379`	`381`	`],`
`380`	`382`	`"startTime": "12:30"`
`@@ -383,14 +385,14 @@`
`383`	`385`	`"endTime": "14:40",`
`384`	`386`	`"sessions": [`
`385`	`387`	`{`
`386`		`- "items": [108]`
	`388`	`+ "items": ["108"]`
`387`	`389`	`},`
`388`	`390`	`{`
`389`		`- "items": [128]`
	`391`	`+ "items": ["128"]`
`390`	`392`	`},`
`391`	`393`	`{`
`392`	`394`	`"extend": 2,`
`393`		`- "items": [102]`
	`395`	`+ "items": ["102"]`
`394`	`396`	`}`
`395`	`397`	`],`
`396`	`398`	`"startTime": "14:00"`
`@@ -399,10 +401,10 @@`
`399`	`401`	`"endTime": "15:30",`
`400`	`402`	`"sessions": [`
`401`	`403`	`{`
`402`		`- "items": [110]`
	`404`	`+ "items": ["110"]`
`403`	`405`	`},`
`404`	`406`	`{`
`405`		`- "items": [123]`
	`407`	`+ "items": ["123"]`
`406`	`408`	`}`
`407`	`409`	`],`
`408`	`410`	`"startTime": "14:50"`
`@@ -411,7 +413,7 @@`
`411`	`413`	`"endTime": "16:00",`
`412`	`414`	`"sessions": [`
`413`	`415`	`{`
`414`		`- "items": [134]`
	`416`	`+ "items": ["134"]`
`415`	`417`	`}`
`416`	`418`	`],`
`417`	`419`	`"startTime": "15:30"`
`@@ -420,14 +422,14 @@`
`420`	`422`	`"endTime": "16:40",`
`421`	`423`	`"sessions": [`
`422`	`424`	`{`
`423`		`- "items": [131]`
	`425`	`+ "items": ["131"]`
`424`	`426`	`},`
`425`	`427`	`{`
`426`		`- "items": [140]`
	`428`	`+ "items": ["140"]`
`427`	`429`	`},`
`428`	`430`	`{`
`429`	`431`	`"extend": 2,`
`430`		`- "items": [130]`
	`432`	`+ "items": ["130"]`
`431`	`433`	`}`
`432`	`434`	`],`
`433`	`435`	`"startTime": "16:00"`
`@@ -436,10 +438,10 @@`
`436`	`438`	`"endTime": "17:30",`
`437`	`439`	`"sessions": [`
`438`	`440`	`{`
`439`		`- "items": [115]`
	`441`	`+ "items": ["115"]`
`440`	`442`	`},`
`441`	`443`	`{`
`442`		`- "items": [140]`
	`444`	`+ "items": ["140"]`
`443`	`445`	`}`
`444`	`446`	`],`
`445`	`447`	`"startTime": "16:50"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`export interface Time {`
`2`	`2`	`extend?: number;`
`3`		`- items: number[];`
	`3`	`+ items: string[];`
`4`	`4`	`}`