Updates: Checklist items, comments & task changes.

database/migrations/2020_10_27_102330_create_tasks_table.php

@@ -16,9 +16,11 @@ public function up()
 
             $table->tinyInteger('flag')->nullable()->index();
 
-            $table->boolean('completed')->index();
-
             $table->dateTime('reminder')->nullable();
+            $table->tinyInteger('status');
+            $table->dateTime('from')->nullable();
+            $table->dateTime('to')->nullable();
+            $table->boolean('muted')->default(0);
 
             $table->unsignedInteger('allocated_to')->nullable()->index();
             $table->foreign('allocated_to')->references('id')->on('users');

database/migrations/2020_10_27_102337_create_structure_for_tasks.php

@@ -16,6 +16,8 @@
         ['name' => 'tasks.exportExcel', 'description' => 'Export excel for tasks', 'is_default' => false],
         ['name' => 'tasks.count', 'description' => 'Get number of pending tasks', 'is_default' => false],
         ['name' => 'tasks.users', 'description' => 'Get user options for task allocation', 'is_default' => false],
+        ['name' => 'tasks.show', 'description' => 'Display task information', 'is_default' => true],
+        ['name' => 'tasks.options', 'description' => 'Get tasks options for select', 'is_default' => false],
     ];
 
     protected array $menu = [

database/migrations/2022_06_29_133122_create_task_checklist_items_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::create('task_checklist_items', function (Blueprint $table) {
+            $table->id();
+
+            $table->unsignedBigInteger('task_id');
+            $table->foreign('task_id')->references('id')->on('tasks');
+
+            $table->string('name');
+            $table->unsignedInteger('order_index')->nullable();
+            $table->boolean('is_completed');
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('task_checklist_items');
+    }
+};

database/migrations/2022_06_29_133125_create_structure_for_checklist_items.php

@@ -0,0 +1,20 @@
+<?php
+
+use LaravelEnso\Migrator\Database\Migration;
+
+class CreateStructureForChecklistItems extends Migration
+{
+    protected array $permissions = [
+        ['name' => 'tasks.checklistItems.index', 'description' => 'Show index for task checklist items', 'is_default' => false],
+
+        ['name' => 'tasks.checklistItems.store', 'description' => 'Store a new task checklist item', 'is_default' => false],
+        ['name' => 'tasks.checklistItems.update', 'description' => 'Update task checklist item', 'is_default' => false],
+        ['name' => 'tasks.checklistItems.destroy', 'description' => 'Delete task checklist item', 'is_default' => false],
+
+        ['name' => 'tasks.checklistItems.options', 'description' => 'Get task checklist item options for select', 'is_default' => false],
+    ];
+
+    protected array $menu = [];
+
+    protected ?string $parentMenu = null;
+}

database/migrations/2022_07_19_134101_create_task_comments_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::create('task_comments', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('task_id');
+            $table->foreign('task_id')->references('id')->on('tasks');
+            $table->text('body');
+
+            $table->unsignedInteger('created_by')->nullable()->index();
+            $table->foreign('created_by')->references('id')->on('users');
+
+            $table->unsignedInteger('updated_by')->nullable()->index();
+            $table->foreign('updated_by')->references('id')->on('users');
+
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('task_comments');
+    }
+};

database/migrations/2022_07_19_141237_create_structure_for_task_comments.php

@@ -0,0 +1,13 @@
+<?php
+
+use LaravelEnso\Migrator\Database\Migration;
+
+return new class extends Migration
+{
+    protected array $permissions = [
+        ['name' => 'tasks.comments.index', 'description' => 'List task comments for commentable', 'is_default' => true],
+        ['name' => 'tasks.comments.store', 'description' => 'Create task comment', 'is_default' => true],
+        ['name' => 'tasks.comments.update', 'description' => 'Update task edited comment', 'is_default' => true],
+        ['name' => 'tasks.comments.destroy', 'description' => 'Delete task comment', 'is_default' => true],
+    ];
+};

routes/api.php

@@ -1,36 +1,12 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Count;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Create;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Destroy;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Edit;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\ExportExcel;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Index;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\InitTable;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Store;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\TableData;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Update;
-use LaravelEnso\Tasks\Http\Controllers\Tasks\Users;
 
 Route::middleware(['api', 'auth', 'core'])
     ->prefix('api/tasks')
     ->as('tasks.')
     ->group(function () {
-        Route::get('create', Create::class)->name('create');
-        Route::post('', Store::class)->name('store');
-        Route::get('{task}/edit', Edit::class)->name('edit');
-
-        Route::patch('{task}', Update::class)->name('update');
-
-        Route::delete('{task}', Destroy::class)->name('destroy');
-
-        Route::get('initTable', InitTable::class)->name('initTable');
-        Route::get('tableData', TableData::class)->name('tableData');
-        Route::get('exportExcel', ExportExcel::class)->name('exportExcel');
-
-        Route::get('count', Count::class)->name('count');
-        Route::get('', Index::class)->name('index');
-
-        Route::get('users', Users::class)->name('users');
+        require __DIR__.'/app/comments.php';
+        require __DIR__.'/app/tasks.php';
+        require __DIR__.'/app/checklistItems.php';
     });

routes/app/checklistItems.php

@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Create;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Destroy;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Edit;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Options;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Store;
+use LaravelEnso\Tasks\Http\Controllers\ChecklistItems\Update;
+
+Route::prefix('checklistItems')
+    ->as('checklistItems.')
+    ->group(function () {
+        Route::get('create', Create::class)->name('create');
+        Route::post('', Store::class)->name('store');
+        Route::get('{checklistItem}/edit', Edit::class)->name('edit');
+        Route::patch('{checklistItem}', Update::class)->name('update');
+        Route::delete('{checklistItem}', Destroy::class)->name('destroy');
+        Route::get('options', Options::class)->name('options');
+    });

routes/app/comments.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use LaravelEnso\Tasks\Http\Controllers\Comments\Destroy;
+use LaravelEnso\Tasks\Http\Controllers\Comments\Index;
+use LaravelEnso\Tasks\Http\Controllers\Comments\Store;
+use LaravelEnso\Tasks\Http\Controllers\Comments\Update;
+
+Route::prefix('comments')
+    ->as('comments.')
+    ->group(function () {
+        Route::get('', Index::class)->name('index');
+        Route::post('', Store::class)->name('store');
+        Route::patch('{comment}', Update::class)->name('update');
+        Route::delete('{comment}', Destroy::class)->name('destroy');
+    });

routes/app/tasks.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Count;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Create;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Destroy;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Edit;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\ExportExcel;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Index;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\InitTable;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Options;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Show;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Store;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\TableData;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Update;
+use LaravelEnso\Tasks\Http\Controllers\Tasks\Users;
+
+Route::get('create', Create::class)->name('create');
+Route::post('', Store::class)->name('store');
+Route::get('{task}/edit', Edit::class)->name('edit');
+
+Route::patch('{task}', Update::class)->name('update');
+
+Route::delete('{task}', Destroy::class)->name('destroy');
+
+Route::get('initTable', InitTable::class)->name('initTable');
+Route::get('tableData', TableData::class)->name('tableData');
+Route::get('exportExcel', ExportExcel::class)->name('exportExcel');
+
+Route::get('count', Count::class)->name('count');
+Route::get('', Index::class)->name('index');
+
+Route::get('users', Users::class)->name('users');
+
+Route::get('options', Options::class)->name('options');
+Route::get('{task}', Show::class)->name('show');

src/AppServiceProvider.php

@@ -7,7 +7,9 @@
 use LaravelEnso\DynamicMethods\Services\Methods;
 use LaravelEnso\Tasks\Commands\SendTaskReminders;
 use LaravelEnso\Tasks\DynamicRelations\Tasks;
+use LaravelEnso\Tasks\Models\ChecklistItem;
 use LaravelEnso\Tasks\Models\Task as Model;
+use LaravelEnso\Tasks\Observers\ChecklistItem as ChecklistItemObserver;
 use LaravelEnso\Tasks\Observers\Task as Observer;
 use LaravelEnso\Users\Models\User;
 
@@ -20,6 +22,7 @@ public function boot()
             ->command()
             ->relations()
             ->observers();
+        ChecklistItem::observe(ChecklistItemObserver::class);
     }
 
     private function load(): self

src/AuthServiceProvider.php

@@ -3,13 +3,16 @@
 namespace LaravelEnso\Tasks;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use LaravelEnso\Tasks\Models\Comment;
 use LaravelEnso\Tasks\Models\Task;
+use LaravelEnso\Tasks\Policies\Comment as CommentPolicy;
 use LaravelEnso\Tasks\Policies\Task as Policy;
 
 class AuthServiceProvider extends ServiceProvider
 {
     protected $policies = [
-        Task::class => Policy::class,
+        Task::class    => Policy::class,
+        Comment::class => CommentPolicy::class,
     ];
 
     public function boot()

src/EnumServiceProvider.php

@@ -4,10 +4,12 @@
 
 use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;
 use LaravelEnso\Tasks\Enums\Flags;
+use LaravelEnso\Tasks\Enums\Statuses;
 
 class EnumServiceProvider extends ServiceProvider
 {
     public $register = [
-        'flags' => Flags::class,
+        'flags'    => Flags::class,
+        'statuses' => Statuses::class,
     ];
 }

src/Enums/Statuses.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace LaravelEnso\Tasks\Enums;
+
+use LaravelEnso\Enums\Services\Enum;
+
+class Statuses extends Enum
+{
+    public const New = 1;
+    public const InProgress = 2;
+    public const Finished = 3;
+
+    public static function data(): array
+    {
+        return [
+            self::New        => 'New',
+            self::InProgress => 'In Progress',
+            self::Finished   => 'Finished',
+        ];
+    }
+}

src/Forms/Builders/Task.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Forms\Services\Form;
+use LaravelEnso\Tasks\Enums\Statuses;
 use LaravelEnso\Tasks\Models\Task as Model;
 
 class Task
@@ -21,8 +22,9 @@ public function __construct()
 
     public function create()
     {
-        return $this->form->hide('completed')
+        return $this->form->hide('status')
             ->value('allocated_to', Auth::id())
+            ->value('status', Statuses::New)
             ->create();
     }
 

src/Forms/Templates/task.json

@@ -26,7 +26,7 @@
             ]
         },
         {
-            "columns": 3,
+            "columns": 2,
             "fields": [
                 {
                     "label": "Allocated To",
@@ -50,12 +50,39 @@
                     }
                 },
                 {
-                    "label": "Completed",
-                    "name": "completed",
-                    "value": false,
+                    "label": "Status",
+                    "name": "status",
+                    "value": null,
                     "meta": {
-                        "type": "input",
-                        "content": "checkbox"
+                        "type": "select",
+                        "options": "LaravelEnso\\Tasks\\Enums\\Statuses"
+                    }
+                }
+            ]
+        },
+        {
+            "columns": 2,
+            "fields": [
+                {
+                    "label": "From",
+                    "name": "from",
+                    "value": "",
+                    "meta": {
+                        "type": "datepicker",
+                        "altFormat": "m-d-Y H:i",
+                        "format": "Y-m-d H:i:s",
+                        "time": true
+                    }
+                },
+                {
+                    "label": "To",
+                    "name": "to",
+                    "value": "",
+                    "meta": {
+                        "type": "datepicker",
+                        "altFormat": "m-d-Y H:i",
+                        "format": "Y-m-d H:i:s",
+                        "time": true
                     }
                 }
             ]
@@ -74,4 +101,4 @@
             ]
         }
     ]
-}
+}