Skip to content

Commit

Permalink
Merge branch 'master' of github.com:laravel-enso/tasks into fixes/fix…
Browse files Browse the repository at this point in the history
…esTimePsql
  • Loading branch information
raftx24 committed Nov 24, 2020
2 parents 6646254 + af5ed11 commit 0d38501
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 3 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"LaravelEnso\\Tasks\\AppServiceProvider",
"LaravelEnso\\Tasks\\AuthServiceProvider",
"LaravelEnso\\Tasks\\BroadcastServiceProvider",
"LaravelEnso\\Tasks\\WebsocketServiceProvider",
"LaravelEnso\\Tasks\\EnumServiceProvider"
]
}
Expand Down
9 changes: 8 additions & 1 deletion src/Calendars/TaskEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
use Carbon\Carbon;
use LaravelEnso\Calendar\Contracts\Calendar;
use LaravelEnso\Calendar\Contracts\ProvidesEvent;
use LaravelEnso\Calendar\Contracts\Routable;
use LaravelEnso\Calendar\DTOs\Route;
use LaravelEnso\Calendar\Enums\Frequencies;
use LaravelEnso\Tasks\Models\Task;

class TaskEvent implements ProvidesEvent
class TaskEvent implements ProvidesEvent, Routable
{
private Task $task;

Expand Down Expand Up @@ -71,4 +73,9 @@ public function readonly(): bool
{
return true;
}

public function route(): Route
{
return new Route('tasks.edit', ['task' => $this->task->id]);
}
}
5 changes: 3 additions & 2 deletions src/Forms/Builders/TaskForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ class TaskForm
public function __construct()
{
$this->form = (new Form(static::TemplatePath))
->value('allocated_to', Auth::id())
->when($this->cantAllocate(), fn ($form) => $form
->readonly('allocated_to'));
}

public function create()
{
return $this->form->hide('completed')->create();
return $this->form->hide('completed')
->value('allocated_to', Auth::id())
->create();
}

public function edit(Task $task)
Expand Down
1 change: 1 addition & 0 deletions src/Forms/Templates/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"name": "allocated_to",
"value": [],
"meta": {
"custom": true,
"type": "select",
"source": "administration.users.options",
"label": "person.name"
Expand Down
17 changes: 17 additions & 0 deletions src/WebsocketServiceProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace LaravelEnso\Tasks;

use LaravelEnso\Core\Facades\Websockets;
use LaravelEnso\Core\Models\User;
use LaravelEnso\Core\WebsocketServiceProvider as CoreServiceProvider;

class WebsocketServiceProvider extends CoreServiceProvider
{
public function boot()
{
Websockets::register([
'task' => fn (User $user) => 'tasks.'.$user->id
]);
}
}

0 comments on commit 0d38501

Please sign in to comment.