Merge branch 'duty-hours' into 'develop'

Duty hours

See merge request ldc-web/projets/support-web!19

app/Http/Controllers/Controller.php

@@ -10,6 +10,8 @@ use App\Enums\TicketStatus;
 use App\Models\Ticket;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 
 class Controller extends BaseController
@@ -130,4 +132,43 @@ class Controller extends BaseController
         }
         return $query;
     }
+
+    /**
+     * Sort columns with a query
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param array                                 $ignore
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function sortQuery(Builder $query, array $ignore = []): Builder
+    {
+        $rName = request()->route()->getName();
+        $table = $query->getModel()->getTable();
+        if (request()->sort_col) {
+            Session::put("$rName.sort_col", request()->sort_col);
+            Session::put("$rName.sorted", true);
+        }
+        if (request()->sort_way) {
+            Session::put("$rName.sort_way", request()->sort_way);
+            Session::put("$rName.sorted", true);
+        }
+        if (request()->rst) {
+            Session::remove("$rName.sorted");
+            Session::remove("$rName.sort_col");
+            Session::remove("$rName.sort_way");
+        }
+        if (request()->sort_col and request()->sort_way and Schema::hasColumn($table, request()->sort_col)) {
+            if (
+                !isset($ignore) or
+                (isset($ignore) and !in_array(request()->sort_col, $ignore))
+            ) {
+                $query = $query->orderBy(\sprintf("$table.%s", request()->sort_col), request()->sort_way);
+            }
+        } elseif (Schema::hasColumn($table, 'order')) {
+            $query = $query->orderBy('order', 'ASC');
+            Session::put("$rName.sort_col", 'order');
+            Session::put("$rName.sort_way", 'asc');
+        }
+        return $query;
+    }
 }

app/Http/Controllers/DutyhourController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\Dutyhour;
+use Kwaadpepper\CrudPolicies\Traits\CrudController;
+
+class DutyhourController extends Controller
+{
+    use CrudController;
+
+    /** @var \App\Models\MacroSchedule\Marker */
+    public static $modelClass = Dutyhour::class;
+
+    /**
+     * Crud Layout
+     *
+     * @var string
+     */
+    public static $layout = 'layout.app';
+}

app/Http/Controllers/HomeController.php

@@ -2,15 +2,24 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Dutyhour;
+use Illuminate\Http\Request;
+
 class HomeController extends Controller
 {
     /**
      * Show Home page
      *
+     * @param Illuminate\Http\Request $request
      * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
      */
-    public function home()
+    public function home(Request $request)
     {
-        return view('home');
+        /**
+         * Get only duty hours for today or later.
+         * @var \Illuminate\Database\Eloquent\Builder $dutyhour
+        */
+        $dutyhourModels = Dutyhour::where('date', '>', now()->modify('-1 day'))->orderBy('date', 'asc')->limit(10)->get();
+        return view('home', compact('dutyhourModels'));
     }
 }

app/Models/Dutyhour.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Kwaadpepper\CrudPolicies\Enums\CrudAction;
+use Kwaadpepper\CrudPolicies\Enums\CrudType;
+use Kwaadpepper\CrudPolicies\Traits\IsCrudModel;
+
+class Dutyhour extends Model
+{
+    use HasFactory;
+    use IsCrudModel;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
+    public $timestamps = true;
+
+    /**
+     * Crud label column
+     *
+     * @var string
+     */
+    protected $crudLabelColumn = 'date';
+
+    /**
+     * Crud value column
+     *
+     * @var string
+     */
+    protected $crudValueColumn = 'id';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'date', 'person', 'place'
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'date' => 'date'
+    ];
+
+    /**
+     * Package
+     *
+     * @param array $attributes
+     */
+    public function __construct(array $attributes = [])
+    {
+        self::$editableProperties = [
+            'date' => [
+                'label' => trans('Date'),
+                'type' => CrudType::date(),
+                'validate' => [
+                    'date',
+                    'after_or_equal:today',
+                    // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
+                    function ($attribute, $value, $fail) {
+                        $q = static::query();
+                        if (request()->dutyhour) {
+                            $q = $q->where('id', '!=', $this->id);
+                        }
+                        if ($q->where('date', $value)->exists()) {
+                            $fail(__('La :attribute est déjà utilisée', [
+                                'attribute' => $attribute
+                            ]));
+                        }
+                    }
+                ],
+                'nullable' => false,
+                'actions' => [
+                    CrudAction::viewAny(),
+                    CrudAction::view(),
+                    CrudAction::update(),
+                    CrudAction::create()
+                ]
+            ],
+            'person' => [
+                'label' => trans('Personne présente'),
+                'type' => CrudType::string(),
+                'validate' => [
+                    'string',
+                    'max:255'
+                ],
+                'nullable' => false,
+                'actions' => [
+                    CrudAction::viewAny(),
+                    CrudAction::view(),
+                    CrudAction::update(),
+                    CrudAction::create()
+                ]
+            ],
+            'place' => [
+                'label' => trans('Lieu'),
+                'type' => CrudType::string(),
+                'validate' => [
+                    'string',
+                    'max:255'
+                ],
+                'nullable' => false,
+                'actions' => [
+                    CrudAction::viewAny(),
+                    CrudAction::view(),
+                    CrudAction::update(),
+                    CrudAction::create()
+                ]
+            ],
+        ];
+        parent::__construct($attributes);
+    }
+}

app/Policies/DutyhourPolicy.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use App\Policies\Rules\UserRoleRules as URR;
+use Illuminate\Auth\Access\HandlesAuthorization;
+use Illuminate\Database\Eloquent\Model;
+use Kwaadpepper\CrudPolicies\Policies\RootPolicy;
+
+class DutyhourPolicy extends RootPolicy
+{
+    use HandlesAuthorization;
+
+    /**
+     * Init policies on call
+     *
+     * @param \App\Models\User                    $user
+     * @param \Illuminate\Database\Eloquent\Model $model
+     * @return void
+     * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
+     */
+    public function setPolicies(User $user, Model $model = null)
+    {
+        // phpcs:enable
+        /**
+         * This first rule to return true in a policy action authorises the action
+         */
+        $this->policies = [
+            'dutyhour' => [
+                'viewAny' => URR::make('userIsAdmin', $user),
+                'create' => URR::make('userIsAdmin', $user),
+                'update' => URR::make('userIsAdmin', $user),
+                'delete' => URR::make('userIsAdmin', $user)
+            ]
+        ];
+    }
+}

app/Providers/RouteServiceProvider.php

@@ -6,6 +6,7 @@ use App\Models\Brand;
 use App\Models\Company;
 use App\Models\Credit\Account;
 use App\Models\Credit\CreditLog;
+use App\Models\Dutyhour;
 use App\Models\File;
 use App\Models\Invoice;
 use App\Models\Label;
@@ -91,6 +92,7 @@ class RouteServiceProvider extends ServiceProvider
         Route::model('label', Label::class);
         Route::model('marker', Marker::class);
         Route::model('package', Package::class);
+        Route::model('dutyhour', Dutyhour::class);
         Route::model('company', Company::class);
         Route::model('invoice', Invoice::class);
         Route::model('file', File::class);

database/migrations/2023_04_18_123853_create_dutyhours_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateDutyhoursTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('dutyhours', function (Blueprint $table) {
+            $table->id();
+            $table->date('date')->unique();
+            $table->string('person');
+            $table->string('place');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('dutyhours');
+    }
+}

resources/lang/en/models.php

@@ -16,5 +16,6 @@ return [
         'packages' => 'Packages',
         'invoices' => 'Invoices',
         'companies' => 'Companies',
+        'dutyhours' => 'Duty Hours',
     ]
 ];

resources/lang/fr/models.php

@@ -16,5 +16,6 @@ return [
         'packages' => 'Forfaits',
         'invoices' => 'Devis',
         'companies' => 'Sociétés',
+        'dutyhours' => 'Permanences',
     ]
 ];

resources/views/dutyhours/index.blade.php

@@ -0,0 +1,112 @@
+@extends($viewLayout)
+
+@section('title', sprintf('%s - %s', transFb(sprintf('models.classes.%s', strtolower(Str::plural(class_basename($modelClass)))), Str::plural(class_basename($modelClass))), __('crud-policies::crud.viewAny')))
+@section('description', sprintf('%s %s', __('crud-policies::crud.viewAny'), trans(Str::plural(class_basename($modelClass)))))
+@section('metaIndex', 'noindex,nofollow')
+
+@section('content')
+<div class="card">
+    @include('crud-policies::crud.modules.flashMessage')
+    <div class="card-header">
+        @include('crud-policies::crud.modules.breadcrumb', ['action' => CrudAction::viewAny()])
+        @include('crud-policies::crud.modules.actionbar.bar', ['action' => CrudAction::viewAny()])
+    </div>
+    <div class="card-body">
+        <div class="row justify-content-center">
+            <div class="col">
+                {{ $models->links() }}
+            </div>
+            <div class="col">
+                <form action="{{ url()->current() }}">
+                    <div class="input-group mb-3">
+                        <input type="search" name="search" class="form-control" value="{{ request()->search }}"/>
+                        <input type="text" name="sort_col" class="d-none" value="{{ request()->sort_col }}"/>
+                        <input type="text" name="sort_way" class="d-none" value="{{ request()->sort_way }}"/>
+                        <a class="btn btn-danger" href="{{ url()->current() }}">{{ __('crud-policies::crud.reset') }}</a>
+                        <button type="submit" class="btn btn-primary">
+                            {{ __('crud-policies::crud.search') }}
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <table class="table text-center">
+            <thead class="thead-dark">
+            @include('crud-policies::crud.modules.sorter')
+            </thead>
+            <tbody>
+            @if(count($models))
+
+            {{-- INIT QUERIES for OPTIMIZING --}}
+            @foreach ($modelClass::getEditableProperties() as $fieldName => $prop)
+            @if($prop['type']->equals(CrudType::order()))
+            @php ${"$modelTable$fieldName"} = $modelClass::max($fieldName); @endphp
+            @endif
+            @if($prop['type']->equals(CrudType::belongsTo()))
+            @php try { $models->load(Str::singular((new $prop['belongsTo']())->getTable())); } catch(\Exception $e) {} @endphp
+            @endif
+            @if($prop['type']->equals(CrudType::belongsToMany()))
+            @php $models->load("$fieldName"); @endphp
+            @endif
+            @endforeach
+
+            {{-- DISPLAY MODELS --}}
+            @foreach($models as $model)
+            <tr>
+                @foreach ($modelClass::getEditableProperties() as $fieldName => $prop)
+                @if(in_array(CrudAction::viewAny(), $prop['actions']))
+                @switch($prop['type'])
+                    @case(CrudType::password())
+                        {{-- Ignore --}}
+                        @break
+                    @default
+                        <td>@include('crud-policies::crud.printfield', [
+                            'action' => CrudAction::viewAny(),
+                            'field' => $model->{$fieldName},
+                            'props' => $prop,
+                            "$modelTable$fieldName" => ${"$modelTable$fieldName"} ?? null
+                        ])</td>
+                @endswitch
+                @endif
+                @endforeach
+
+                {{-- MODEL ACTIONS --}}
+                <td>
+                    <div class="btn-group" role="group" aria-label="{{ Str::plural(__('crud-policies::crud.action')) }}">
+                        @can('view', $model)
+                        <a href="{{ CrudController::getRoutePrefixed("$modelTable.show", $model) }}" class="btn btn-sm btn-primary">{{ __('crud-policies::crud.view') }}</a>
+                        @endcan
+                        @can('update', $model)
+                        <a href="{{ CrudController::getRoutePrefixed("$modelTable.edit", $model) }}" class="btn btn-sm btn-info">{{ __('crud-policies::crud.edit') }}</a>
+                        @endcan
+                        @can('delete', $model)
+                        <form class="CrudConfirmDelete" action="{{ CrudController::getRoutePrefixed("$modelTable.destroy", $model) }}" method="POST">
+                            @csrf
+                            @method('DELETE')
+                            <button type="submit" class="btn btn-sm btn-danger">{{ __('crud-policies::crud.delete') }}</button>
+                        </form>
+                        @endcan
+                        @can('viewAny', \App\Models\Log::class)
+                        <a href="{{ CrudController::getRoutePrefixed("dutyhours.logs.index", $model) }}" class="btn btn-sm btn-dark">{{ __('models.classes.logs') }}</a>
+                        @endcan
+                        @can('viewAny', \App\Models\File::class)
+                        <a href="{{ CrudController::getRoutePrefixed("dutyhours.files.index", $model) }}" class="btn btn-sm btn-dark">{{ __('models.classes.files') }}</a>
+                        @endcan
+                    </div>
+                </td>
+            </tr>
+            @endforeach
+            @else
+            <tr>
+                <td colspan="{{ count($modelClass::getEditableProperties()) }}">
+                {{ __('crud-policies::crud.nothingtoshow') }}
+                </td>
+            </tr>
+            @endif
+            </tbody>
+        </table>
+        {{ $models->links() }}
+    </div>
+</div>
+@include('crud-policies::crud.modules.scriptConstants')
+@endsection

resources/views/home.blade.php

@@ -2,17 +2,51 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col">
-            <h1>Bienvenue sur le support LDC WEB.</h1>
-        </div>
-    </div>
     <div class="row mt-4">
-        <div class="col">
+        <div class="col mb-5">
             <a href="{{ route('ticket.create') }}" class="btn btn-primary">
                 {{ __('Créer un ticket') }}
             </a>
         </div>
     </div>
+    <div class="row">
+        <div class="col">
+            <h2 class="col h2 mb-3">
+                <span class="fw-bold">{{ __('models.classes.dutyhours') . __(' à venir') }}</span>
+            </h2>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <div class="table-responsive">
+                <table class="table fix-action m-0">
+                    <thead>
+                        <tr>
+                            <th>{{ __('Date') }}</th>
+                            <th>{{ __('Personne présente') }}</th>
+                            <th>{{ __('Lieu de la permanence') }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @if($dutyhourModels->count())
+                        @foreach ($dutyhourModels as $dutyhourModel)
+                        <tr>
+                            <td class="align-middle">{{ $dutyhourModel->date->formatLocalized('%d/%m/%Y') }}</td>
+                            <td class="align-middle">{{ $dutyhourModel->person }}</td>
+                            <td class="align-middle">{{ $dutyhourModel->place }}</td>
+                        </tr>
+                        @endforeach
+                        @else
+                        <tr>
+                            <td colspan="5" class="text-center">
+                                <span class="h3">{{ __('Aucune :model prévue prochainement', ['model' => Str::singular(__('models.classes.dutyhours')) ])}}</span>
+                            </td>
+                        </tr>
+                        @endif
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
 </div>
-@endsection
+@endsection

resources/views/layout/nav.blade.php

@@ -46,6 +46,9 @@
                         @can('viewAny', App\Models\Package::class)
                         <a class="dropdown-item @if(strpos(request()->route()->getName(), 'packages') === 0)active @endif" href="{{ route('packages.index') }}">{{ __('models.classes.packages') }}</a>
                         @endcan
+                        @can('viewAny', App\Models\Dutyhour::class)
+                        <a class="dropdown-item @if(strpos(request()->route()->getName(), 'dutyhours') === 0)active @endif" href="{{ route('dutyhours.index') }}">{{ __('models.classes.dutyhours') }}</a>
+                        @endcan
                     </div>
                 </li>
                 @endif

routes/web.php

@@ -5,6 +5,7 @@ use App\Http\Controllers\CompanyController;
 use App\Http\Controllers\Credit\AccountController;
 use App\Http\Controllers\Credit\CreditLogController;
 use App\Http\Controllers\Credit\EstimationController;
+use App\Http\Controllers\DutyhourController;
 use App\Http\Controllers\FileController;
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\InvoiceController;
@@ -74,6 +75,7 @@ Route::middleware('auth:web')->group(function () {
     Route::resource('ticket', TicketController::class)->except(['destroy']);
     Route::resource('users', UserController::class);
     Route::resource('packages', PackageController::class)->except('show');
+    Route::resource('dutyhours', DutyhourController::class)->except('show');
     Route::resource('companies', CompanyController::class)->except('show');
     Route::resource('invoices', InvoiceController::class);
     Route::resource('labels', LabelController::class)->except('show');