Merge?

Author: nickysemenza

app/Http/Controllers/API/ExecController.php

@@ -438,15 +438,17 @@ public function deleteEvent(Request $request, Event $event)
 
     public function generateCalendar(Request $request)
     {
+        date_default_timezone_set('America/New_York');
         $vCalendar = new Calendar('www.boilermake.org');
-        $events = Event::all();
+        $events = Event::where('hidden', 0)->get();
         // Iterate through all events
         foreach ($events as $event) {
             $vEvent = new \Eluceo\iCal\Component\Event();
+            $vEvent->setUseTimezone(true);
             $vEvent
                 ->setDtStart(new \DateTime($event->begin))
                 ->setDtEnd(new \DateTime($event->end))
-                ->setNoTime(true)
+                ->setNoTime(false)
                 ->setSummary($event->title);
             $vCalendar->addComponent($vEvent);
         }

app/Http/Controllers/API/GeneralController.php

@@ -92,7 +92,7 @@ public static function resumeUrl($id, $method)
 
     public function getEvents()
     {
-        return Event::orderBy('begin')->get(['id', 'title', 'description', 'begin', 'end']);
+        return Event::where('hidden', 0)->orderBy('begin')->get(['id', 'title', 'description', 'begin', 'end']);
     }
 
     public function getAnnouncements()

database/migrations/2017_01_20_151445_add_hidden_event_field.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddHiddenEventField extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->boolean('hidden')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->dropColumn('hidden');
+        });
+    }
+}