JonatanRek
/
LAR_Maintenance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

This commit is contained in:
Jonatan Rek 2024-08-06 08:31:51 +02:00
parent 2dfb12f23d
commit d0fbb5d5c1
20 changed files with 296 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/TaskController.php Normal file
View File

@ -0,0 +1,13 @@
<?php
namespace App\Http\Controllers;
use App\Models\MaintenanceHistory;
class TaskController extends BaseController
{
public function index()
{
return view('task.index');
}
}

1
app/Http/Middleware/GenerateMenus.php
View File

@ -46,6 +46,7 @@ class GenerateMenus
$systemRoutes = [
'Host' => [' fas fa-server', 'host'],
'Maintenance' => [' fas fa-calendar', 'maintenance'],
'Tasks' => [' fas fa-calendar', 'tasks'],
];
foreach ($systemRoutes as $title => $route_data) {

21
app/Jobs/ScheduleNextMaintenance.php
View File

@ -37,15 +37,22 @@ class ScheduleNextMaintenance implements ShouldQueue
}
$cron = new CronExpression($maintenance->schedule);
if (!$cron->isDue('now')) {
dd($cron->getNextRunDate());
return;
}
$maintenance->history()->create([
$maintenancePlanned = $maintenance->history()->create([
'start_at' => $cron->getNextRunDate(null, 2)
]);
die();
$maintenancePlanned->refresh();
$tasks = $maintenancePlanned->tasks;
if(!empty($tasks)){
dd($tasks);
foreach ($tasks as $key => $task) {
$maintenancePlanned->tasks()->create([
'host_id' => $task->host_id,
]);
}
}
}
die();
}
}

20
app/Livewire/Maintenance/Form.php
View File

@ -5,6 +5,8 @@ namespace App\Livewire\Maintenance;
use App\Models\Host;
use Livewire\Component;
use App\Models\Maintenance;
use App\Models\MaintenanceTask;
use Illuminate\Console\View\Components\Task;
class Form extends Component
{
@ -18,6 +20,8 @@ class Form extends Component
public $hosts = [];
public $hosts_available = [];
public $hosts_tasks = [];
public $hosts_tasks_available = [];
protected function rules()
{
@ -31,6 +35,8 @@ class Form extends Component
public function mount($model = null)
{
$this->hosts_available = Host::all()->pluck('hostname', 'id')->toArray();
$this->hosts_tasks_available = MaintenanceTask::all()->pluck('name', 'id')->toArray();
if (!empty($model)) {
$maintenance = Maintenance::find($model);
@ -39,7 +45,11 @@ class Form extends Component
$this->name = $maintenance->name;
$this->description = $maintenance->description;
$this->schedule = $maintenance->schedule;
$this->hosts = $maintenance->hosts()->pluck('hosts.id')->toArray();
foreach ($maintenance->tasks as $task) {
$this->hosts_tasks_available[$task->host_id][] = $task->id;
}
$this->action = 'update';
}
@ -61,13 +71,21 @@ class Form extends Component
$validatedData = $this->validate();
$maintenance = Maintenance::find($this->model);
$maintenance->hosts()->whereNotIn('host_id', $this->hosts)->delete();
if (!empty($maintenance)) {
$maintenance->update($validatedData);
$hosts = Host::whereIn('id', $this->hosts)->whereNotIn('id', $maintenance->hosts()->pluck('hosts.id')->toArray())->get();
foreach ($hosts as $key => $host) {
$maintenance->hosts()->attach($host);
}
$maintenance->refresh();
foreach ($maintenance->hosts as $host) {
foreach ($this->hosts_tasks[$host->id] as $task_id => $host_task_name) {
$host->tasks()->create([
'task_id' => $task_id
]);
}
}
}
$this->dispatch('closeModal');

54
app/Livewire/MaintenanceTask/DataTable.php Normal file
View File

@ -0,0 +1,54 @@
<?php
namespace App\Livewire\MaintenanceTask;
use App\Models\MaintenanceTask;
use SteelAnts\DataTable\Livewire\DataTableComponent;
use Illuminate\Database\Eloquent\Builder;
class DataTable extends DataTableComponent
{
public $listeners = [
'maintenancetaskAdded' => '$refresh',
'closeModal' => '$refresh',
];
public function query(): Builder
{
return MaintenanceTask::query();
}
public function headers(): array
{
return [
'name' => 'name',
'description' => 'description',
];
}
public function remove($maintenancetask_id){
MaintenanceTask::find($maintenancetask_id)->delete();
}
public function actions($item)
{
return [
[
'type' => "livewire",
'action' => "edit",
'text' => "edit",
'parameters' => $item['id']
],
[
'type' => "livewire",
'action' => "remove",
'text' => "remove",
'parameters' => $item['id']
]
];
}
public function edit($maintenancetask_id)
{
$this->dispatch('openModal', 'maintenance-task.form', __('boilerplate::maintenance-task.edit'), ['model' => $maintenancetask_id]);
}
}

60
app/Livewire/MaintenanceTask/Form.php Normal file
View File

@ -0,0 +1,60 @@
<?php
namespace App\Livewire\MaintenanceTask;
use Livewire\Component;
use App\Models\MaintenanceTask;
class Form extends Component
{
public $model;
public string $maintenance_id;
public string $name;
public string $description = "";
public $action = 'store';
protected function rules()
{
return [
'maintenance_id' => 'required',
'name' => 'required',
'description' => 'required',
];
}
public function mount ($model = null){
if (!empty($model)) {
$maintenanceTask = MaintenanceTask::find($model);
$this->model = $model;
$this->maintenance_id = $maintenanceTask->maintenance_id;
$this->name = $maintenanceTask->name;
$this->description = $maintenanceTask->description;
$this->action = 'update';
}
}
public function store()
{
$validatedData = $this->validate();
MaintenanceTask::create($validatedData);
$this->dispatch('closeModal');
}
public function update()
{
$validatedData = $this->validate();
$maintenanceTask = MaintenanceTask::find($this->model);
if (!empty($maintenanceTask)) {
$maintenanceTask->update($validatedData);
}
$this->dispatch('closeModal');
}
public function render()
{
return view('livewire.maintenance-task.form');
}
}

5
app/Models/Host.php
View File

@ -12,4 +12,9 @@ class Host extends Model
protected $fillable = [
'hostname',
];
public function tasks()
{
return $this->hasMany(MaintenanceTask::class,);
}
}

5
app/Models/Maintenance.php
View File

@ -24,4 +24,9 @@ class Maintenance extends Model
{
return $this->belongsToMany(Host::class, "maintenance_host", "maintenance_id", "host_id" );
}
public function tasks()
{
return $this->hasMany(MaintenanceTask::class,);
}
}

10
app/Models/MaintenanceHostHistory.php
View File

@ -8,4 +8,14 @@ use Illuminate\Database\Eloquent\Model;
class MaintenanceHostHistory extends Model
{
use HasFactory;
public function hosts()
{
return $this->belongsToMany(MaintenanceHostHistory::class);
}
public function tasks()
{
return $this->hasMany(MaintenanceTaskHistory::class);
}
}

7
app/Models/MaintenanceTask.php
View File

@ -8,4 +8,11 @@ use Illuminate\Database\Eloquent\Model;
class MaintenanceTask extends Model
{
use HasFactory;
protected $fillable = [
'maintenance_id',
'host_id',
'name',
'description',
];
}

5
app/Models/MaintenanceTaskHistory.php
View File

@ -8,4 +8,9 @@ use Illuminate\Database\Eloquent\Model;
class MaintenanceTaskHistory extends Model
{
use HasFactory;
public function task()
{
return $this->BelongsTo(MaintenanceTask::class);
}
}

11
app/Models/Task.php Normal file
View File

@ -0,0 +1,11 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Task extends Model
{
use HasFactory;
}

58
composer.lock generated
View File

@ -3250,16 +3250,16 @@
},
{
"name": "steelants/datatable",
"version": "2.2.5",
"version": "2.2.6",
"source": {
"type": "git",
"url": "https://github.com/steelants/Livewire-DataTable.git",
"reference": "398cef188e063ef17e11905b010210db2d71d58f"
"reference": "69f5a3e2abbfa861fe5a3bfb7b4e16603a2582f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/steelants/Livewire-DataTable/zipball/398cef188e063ef17e11905b010210db2d71d58f",
"reference": "398cef188e063ef17e11905b010210db2d71d58f",
"url": "https://api.github.com/repos/steelants/Livewire-DataTable/zipball/69f5a3e2abbfa861fe5a3bfb7b4e16603a2582f3",
"reference": "69f5a3e2abbfa861fe5a3bfb7b4e16603a2582f3",
"shasum": ""
},
"require": {
@ -3291,9 +3291,9 @@
"description": "Simple Datatable class based on Laravel and livewire",
"support": {
"issues": "https://github.com/steelants/Livewire-DataTable/issues",
"source": "https://github.com/steelants/Livewire-DataTable/tree/2.2.5"
"source": "https://github.com/steelants/Livewire-DataTable/tree/2.2.6"
},
"time": "2024-07-23T15:07:07+00:00"
"time": "2024-07-31T15:08:12+00:00"
},
{
"name": "steelants/form",
@ -6338,16 +6338,16 @@
},
{
"name": "laravel/pint",
"version": "v1.17.0",
"version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
"reference": "4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5"
"reference": "b5b6f716db298671c1dfea5b1082ec2c0ae7064f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/pint/zipball/4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5",
"reference": "4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5",
"url": "https://api.github.com/repos/laravel/pint/zipball/b5b6f716db298671c1dfea5b1082ec2c0ae7064f",
"reference": "b5b6f716db298671c1dfea5b1082ec2c0ae7064f",
"shasum": ""
},
"require": {
@ -6400,7 +6400,7 @@
"issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint"
},
"time": "2024-07-23T16:40:20+00:00"
"time": "2024-08-01T09:06:33+00:00"
},
{
"name": "laravel/sail",
@ -6678,23 +6678,23 @@
},
{
"name": "nunomaduro/collision",
"version": "v8.3.0",
"version": "v8.4.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "b49f5b2891ce52726adfd162841c69d4e4c84229"
"reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/b49f5b2891ce52726adfd162841c69d4e4c84229",
"reference": "b49f5b2891ce52726adfd162841c69d4e4c84229",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a",
"reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a",
"shasum": ""
},
"require": {
"filp/whoops": "^2.15.4",
"nunomaduro/termwind": "^2.0.1",
"php": "^8.2.0",
"symfony/console": "^7.1.2"
"symfony/console": "^7.1.3"
},
"conflict": {
"laravel/framework": "<11.0.0 || >=12.0.0",
@ -6702,13 +6702,13 @@
},
"require-dev": {
"larastan/larastan": "^2.9.8",
"laravel/framework": "^11.16.0",
"laravel/pint": "^1.16.2",
"laravel/sail": "^1.30.2",
"laravel/framework": "^11.19.0",
"laravel/pint": "^1.17.1",
"laravel/sail": "^1.31.0",
"laravel/sanctum": "^4.0.2",
"laravel/tinker": "^2.9.0",
"orchestra/testbench-core": "^9.2.1",
"pestphp/pest": "^2.34.9 || ^3.0.0",
"orchestra/testbench-core": "^9.2.3",
"pestphp/pest": "^2.35.0 || ^3.0.0",
"sebastian/environment": "^6.1.0 || ^7.0.0"
},
"type": "library",
@ -6771,7 +6771,7 @@
"type": "patreon"
}
],
"time": "2024-07-16T22:41:01+00:00"
"time": "2024-08-03T15:32:23+00:00"
},
{
"name": "phar-io/manifest",
@ -7216,16 +7216,16 @@
},
{
"name": "phpunit/phpunit",
"version": "11.2.9",
"version": "11.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c197bbaaca360efda351369bf1fd9cc1ca6bcbf7"
"reference": "a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c197bbaaca360efda351369bf1fd9cc1ca6bcbf7",
"reference": "c197bbaaca360efda351369bf1fd9cc1ca6bcbf7",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3",
"reference": "a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3",
"shasum": ""
},
"require": {
@ -7264,7 +7264,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "11.2-dev"
"dev-main": "11.3-dev"
}
},
"autoload": {
@ -7296,7 +7296,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.2.9"
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.3.0"
},
"funding": [
{
@ -7312,7 +7312,7 @@
"type": "tidelift"
}
],
"time": "2024-07-30T11:09:23+00:00"
"time": "2024-08-02T03:56:43+00:00"
},
{
"name": "sebastian/cli-parser",

29
database/migrations/2024_07_30_083513_create_tasks_table.php Normal file
View File

@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('tasks', function (Blueprint $table) {
$table->id();
$table->string('name');
$table->text('description');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('tasks');
}
};

5
database/migrations/2024_07_30_083526_create_maintenance_tasks_table.php
View File

@ -1,6 +1,8 @@
<?php
use App\Models\Host;
use App\Models\Maintenance;
use App\Models\Task;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
@ -15,8 +17,7 @@ return new class extends Migration
Schema::create('maintenance_tasks', function (Blueprint $table) {
$table->id();
$table->foreignIdFor(Maintenance::class);
$table->string('name');
$table->text('description');
$table->foreignIdFor(Task::class);
$table->timestamps();
});
}

4
database/migrations/2024_07_30_083546_create_maintenance_task_histories_table.php
View File

@ -19,8 +19,8 @@ return new class extends Migration
$table->foreignIdFor(MaintenanceTask::class);
$table->foreignIdFor(MaintenanceHistory::class);
$table->foreignIdFor(Host::class);
$table->string('status');
$table->datetime('finished_at');
$table->string('status')->default(1);
$table->datetime('finished_at')->nullable();
$table->timestamps();
});
}

8
resources/views/livewire/maintenance-task/form.blade.php Normal file
View File

@ -0,0 +1,8 @@
<div>
<x-form::form wire:submit.prevent="{{$action}}">
<x-form::input group-class="mb-3" type="text" wire:model="maintenance_id" id="maintenance_id" label="maintenance_id"/>
<x-form::input group-class="mb-3" type="text" wire:model="name" id="name" label="name"/>
<x-form::quill group-class="mb-3" type="text" wire:model="description" id="description" label="description" />
<x-form::button class="btn-primary" type="submit">Create</x-form::button>
</x-form::form>
</div>

9
resources/views/livewire/maintenance/form.blade.php
View File

@ -3,8 +3,13 @@
<x-form::input group-class="mb-3" type="text" wire:model="name" id="name" label="name" />
<x-form::quill group-class="mb-3" type="text" wire:model="description" id="description" label="description" />
<x-form::input group-class="mb-3" type="text" wire:model="schedule" id="schedule" label="schedule" />
<x-form::select group-class="mb-3" wire:model="hosts" label="Livewire Select" :options="$hosts_available" placeholder="Select value..." multiple />
<x-form::select group-class="mb-3" wire:model.live="hosts" label="Livewire Select" :options="$hosts_available" placeholder="Select value..." multiple />
@foreach($hosts as $host_id)
<x-form::select group-class="mb-3" wire:model="hosts_tasks.{{ $host_id }}" label="Select Tasks for Host {{ $hosts_available[$host_id] }}" :options="$hosts_tasks_available" placeholder="Select value..." multiple />
@endforeach
<x-form::button class="btn-primary" type="submit">Create</x-form::button>
@dump($hosts)
@dump($hosts_tasks)
</x-form::form>
</div>

13
resources/views/task/index.blade.php Normal file
View File

@ -0,0 +1,13 @@
<x-layout-app>
<div class="container-xl">
<div class="page-header">
<h1>{{ __('boilerplate::maintenance-task.title') }}</h1>
<button class="btn btn-primary" onclick="Livewire.dispatch('openModal', {livewireComponents: 'maintenance-task.form', title: '{{ __('boilerplate::maintenance-task.create') }}'})">
<i class="me-2 fas fa-plus"></i><span>{{ __('boilerplate::ui.add') }}</span>
</button>
</div>
@livewire('maintenance-task.data-table', [], key('data-table'))
</div>
</x-layout-app>

1
routes/web.php
View File

@ -14,6 +14,7 @@ Route::get('/maintenance/planned/{maintenance_history}', [App\Http\Controllers\M
Route::get('/host', [App\Http\Controllers\HostController::class, 'index'])->name('host');
Route::get('/maintenance', [App\Http\Controllers\MaintenanceController::class, 'index'])->name('maintenance');
Route::get('/tasks', [App\Http\Controllers\TaskController::class, 'index'])->name('tasks');
Route::prefix('profile')->name('profile.')->middleware(['auth'])->group(function () {