Merge branch 'main' of https://git.steelants.cz/JonatanRek/LAR_Maintenance
This commit is contained in:
commit
0b29730e7f
|
@ -4,10 +4,14 @@ namespace App\Http\Controllers;
|
|||
|
||||
use SteelAnts\LaravelAuth\Traits\Authentication;
|
||||
|
||||
|
||||
class AuthController
|
||||
class AuthController extends Controller
|
||||
{
|
||||
use Authentication;
|
||||
|
||||
protected string $redirectTo = "maintenance.planned";
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth')->only(['logout','root']);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,11 +62,13 @@ class MaintenanceController extends BaseController
|
|||
// }
|
||||
|
||||
|
||||
if ($request->has('skippedHostsSummary')) {
|
||||
foreach ($request->input('skippedHostsSummary') as $history_host_id => $summary) {
|
||||
$maintenance_history->historyHosts->find($history_host_id)->update([
|
||||
'summary' => $summary,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
if ($request->has('skippedHostTasksSummary')) {
|
||||
foreach ($maintenance_history->historyHosts as $history_host) {
|
||||
|
|
|
@ -44,6 +44,7 @@ class ScheduleNextMaintenance implements ShouldQueue
|
|||
'start_at' => $nextRunTime,
|
||||
'guestor_id' => $maintenance->guestor_id,
|
||||
]);
|
||||
|
||||
$maintenancePlanned->refresh();
|
||||
|
||||
$hosts = $maintenance->hosts;
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,8 +1,8 @@
|
|||
<div>
|
||||
<x-form::form wire:submit.prevent="{{ $action }}">
|
||||
<x-form::input group-class="mb-3" type="text" wire:model="name" id="name" label="name" />
|
||||
<x-form::select group-class="mb-3" wire:model="guestor_id" label="Livewire Select" :options="$guestor_available" placeholder="Select guestor..." />
|
||||
<x-form::select group-class="mb-3" wire:model.live="blocking_maintenance_id" label="Livewire Select" :options="$maintenances_available" placeholder="Select blocking maintenance..." />
|
||||
<x-form::select group-class="mb-3" wire:model="guestor_id" label="Responsible User" :options="$guestor_available" placeholder="Select guestor..." />
|
||||
<x-form::select group-class="mb-3" wire:model.live="blocking_maintenance_id" label="Blocking Maintenance" :options="$maintenances_available" placeholder="Select blocking maintenance..." />
|
||||
<x-form::quill group-class="mb-3" type="text" wire:model="description" id="description" label="description" />
|
||||
|
||||
@if(empty($blocking_maintenance_id))
|
||||
|
@ -12,7 +12,7 @@
|
|||
@endif
|
||||
|
||||
<x-form::input group-class="mb-3" type="text" wire:model="duration" id="duration" label="duration" help="in hours (60 minutes) maximum 24h" />
|
||||
<x-form::select group-class="mb-3" wire:model.live="hosts" label="Livewire Select" :options="$hosts_available" placeholder="Select value..." multiple />
|
||||
<x-form::select group-class="mb-3" wire:model.live="hosts" label="Hosts in Maintenance" :options="$hosts_available" placeholder="Select value..." multiple />
|
||||
|
||||
@foreach($hosts as $key => $host_id)
|
||||
<x-form::select group-class="mb-3" wire:key="{{ $host_id }}" wire:model="hosts_tasks.{{ $host_id }}" label="Select Tasks for Host {{ $hosts_available[$host_id] }}" :options="$hosts_tasks_available" placeholder="Select value..." multiple />
|
||||
|
|
|
@ -1,9 +1,13 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::auth();
|
||||
Route::get('/', function () {
|
||||
if (Auth::check()){
|
||||
return redirect()->route('maintenance.planned');
|
||||
}
|
||||
return redirect()->route('login');
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue