- Fixed issue with the serialization of the date token.

JackDaniel007 · Jan 11, 2017 · 34eb9e6 · 34eb9e6
1 parent bcd2aa3
commit 34eb9e6
Show file tree

Hide file tree

Showing 8 changed files with 4,846 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -181,11 +181,11 @@ var self = module.exports = {
         if (self.calendars) {
             self.calendars.forEach(function(calendar) {
                 var nextEvent = self.getNextEvent(calendar.events);
-
+                self.log("Next event found for calendar " + calendar.name + ": " + nextEvent);
                 if (nextEvent) {
                     var tokens = {
                         calendar: calendar.name,
-                        date: nextEvent.start.format("YYYY-MM-DD"),
+                        date: JSON.stringify(nextEvent.start.format("YYYY-MM-DD")),
                         time: nextEvent.start.format("HH:mm"),
                         summary: nextEvent.summary,
                         location: nextEvent.location
@@ -194,8 +194,15 @@ var self = module.exports = {
                     var state = nextEvent.departure || nextEvent.start;
 
                     //console.log("Next appointment's tokens: " + JSON.stringify(tokens));
-
-                    Homey.manager("flow").trigger("next_appointment_in", tokens, state);
+                    //console.log("Next appointment's state: " + JSON.stringify(state));
+
+                    Homey.manager("flow")
+                        .trigger("next_appointment_in",
+                            tokens,
+                            state,
+                            function(err, result) {
+                                if (err) return Homey.error(err);
+                            });
                 }
             });
         }
@@ -464,7 +471,8 @@ var self = module.exports = {
 
                             if (occurrences) {
                                 for (var i = 0; i < occurrences.length; i++) {
-                                    (function(e, start) {
+                                    (function (e, start) {
+                                        //self.log(JSON.stringify(start) + " isSameOrAfter " + JSON.stringify(today));
                                         if (start.isSameOrAfter(today)) {
                                             var eventDurationInMilliseconds = moment.utc(e.end).diff(moment.utc(e.start));
                                             var eventDuration = moment.duration(eventDurationInMilliseconds);
@@ -498,7 +506,7 @@ var self = module.exports = {
                     }
                 }
 
-                //self.log(events.length + " events retrieved from ical: " + calendar.url);
+                //self.log(calendar.events.length + " events retrieved from ical: " + calendar.url);
                 callback(null, calendar.events);
             }
         });

diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
   "id": "nl.netactive.homey.ical2voice",
-  "version": "0.1.4",
+  "version": "0.9.0",
   "compatibility": "0.x || 1.x",
   "name": {
     "en": "iCalendar to Voice",

diff --git a/nl.netactive.homey.ical2voice.njsproj b/nl.netactive.homey.ical2voice.njsproj
@@ -557,6 +557,15 @@
     <Folder Include="node_modules\tunnel-agent\" />
     <Folder Include="node_modules\underscore\" />
     <Folder Include="settings\" />
+    <Folder Include="typings\" />
+    <Folder Include="typings\globals\" />
+    <Folder Include="typings\globals\moment\" />
+    <Folder Include="typings\globals\node\" />
+  </ItemGroup>
+  <ItemGroup>
+    <TypeScriptCompile Include="typings\globals\moment\index.d.ts" />
+    <TypeScriptCompile Include="typings\globals\node\index.d.ts" />
+    <TypeScriptCompile Include="typings\index.d.ts" />
   </ItemGroup>
   <!-- Do not delete the following Import Project.  While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them. -->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />