wip : show upcoming schedule for each scheduled task in cli

Author: roshangautam

resources/views/tasks/form.blade.php

@@ -34,7 +34,22 @@
                 <p class="tcdanger ft14">{{$errors->first('command')}}</p>
             @endif
         </div>
+    </div>
+    <div class="frame mb2">
+        <p class="blk2 ft15 lh2 basic-text tar">
+            <label for="command">Timezone</label>
+        </p>
+        <div class="blk6">
+            <select id="timezone" name="timezone" class="form-control" placeholder="Click here to select one of the available commands">
+                @foreach ($timezones as $key => $timezone)
+                    <option value="{{$timezone}}" {{old('timezone', $task->timezone) == $timezone ? 'selected' : ''}}>{{$timezone}}</option>
+                @endforeach
+            </select>
 
+            @if($errors->has('command'))
+                <p class="tcdanger ft14">{{$errors->first('command')}}</p>
+            @endif
+        </div>
     </div>
     <div class="frame mb2">
         <p class="blk2 ft15 lh2 basic-text tar"></p>

resources/views/tasks/view.blade.php

@@ -18,6 +18,7 @@
                 Description<br>
                 Command<br>
                 Cron Expression<br>
+                Timezone<br>
                 Created @<br>
                 Updated @<br>
                 Notify @<br>
@@ -27,6 +28,7 @@
                 {{$task->description}}<br>
                 {{$task->command}}<br>
                 {{$task->cron ? $task->cron : 'Frequency'}}<br>
+                {{$task->timezone}}<br>
                 {{$task->created_at->toDateTimeString()}}<br>
                 {{$task->updated_at->toDateTimeString()}}<br>
                 {{$task->notification_email_address}}<br>

src/Console/Commands/ListSchedule.php

@@ -2,6 +2,8 @@
 
 namespace Studio\Totem\Console\Commands;
 
+use Carbon\Carbon;
+use Cron\CronExpression;
 use Illuminate\Console\Command;
 use Illuminate\Console\Scheduling\Schedule;
 
@@ -49,17 +51,36 @@ public function handle()
         if (count($this->schedule->events()) > 0) {
             $events = collect($this->schedule->events())->map(function ($event) {
                 return [
-                    'command'   => ltrim(str_after($event->command, "'artisan'")),
-                    'schedule'  => $event->expression,
+                    'command'   =>  ltrim(str_after($event->command, "'artisan'")),
+                    'schedule'  =>  $event->expression,
+                    'upcoming'  =>  $this->upcoming($event),
+                    'description'   => $event->description,
+                    'timezone'  => $event->timezone
                 ];
             });
 
             $this->table(
-                ['Command', 'Schedule'],
+                ['Command', 'Schedule', 'Upcoming', 'Description', 'Timezone'],
                 $events
             );
         } else {
             $this->info('No Scheduled Commands Found');
         }
     }
+
+    /**
+     * Get Upcoming schedule.
+     *
+     * @return bool
+     */
+    protected function upcoming($event)
+    {
+        $date = Carbon::now();
+
+        if ($event->timezone) {
+            $date->setTimezone($event->timezone);
+        }
+
+        return (CronExpression::factory($event->expression)->getNextRunDate($date->toDateTimeString()))->format('Y-m-d H:i:s');
+    }
 }

src/Console/Kernel.php

@@ -39,6 +39,9 @@ public function __construct(Application $app, Dispatcher $events, TaskInterface
     protected function schedule(Schedule $schedule)
     {
         $this->prepareSchedule($schedule);
+        //        $schedule->command('inspire')
+        //            ->hourly()
+        //            ->timezone('America/Chicago');
 
         parent::schedule($schedule);
     }
@@ -63,6 +66,8 @@ public function prepareSchedule($schedule)
             if ($command) {
                 $event = $schedule->command($command->getName());
                 $event->cron($task->cron)
+                    ->name($command->getDescription())
+                    ->timezone($task->timezone)
                     ->before(function () use ($task, $event) {
                         $event->start = microtime(true);
                         Executing::dispatch($task);
@@ -71,6 +76,7 @@ public function prepareSchedule($schedule)
                         Executed::dispatch($task, $event);
                     })
                     ->sendOutputTo(storage_path('logs/schedule-'.sha1($event->mutexName()).'.log'));
+
                 if ($task->notification_email_address) {
                     $event->emailOutputTo($task->notification_email_address);
                 }

src/Http/Controllers/TasksController.php

@@ -51,6 +51,7 @@ public function create()
         return view('totem::tasks.form', [
             'task'     => new Task,
             'commands' => $this->kernel->getCommands(),
+            'timezones' => timezone_identifiers_list(),
         ]);
     }
 
@@ -85,8 +86,9 @@ public function show($task)
     public function edit($task)
     {
         return view('totem::tasks.form', [
-            'task'     => $task,
-            'commands' => $this->kernel->getCommands(),
+            'task'      => $task,
+            'commands'  => $this->kernel->getCommands(),
+            'timezones' => timezone_identifiers_list(),
         ]);
     }