Merge branch 'trunk'

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 04.2023 -> 1.3.0
+- Update Status Enum
+- Update TicketStatusChanged event
+- Update TicketStatus Changed messages
+- Add DutyHours
+- Add Informations
+### 15.12.2022
+- Add Sentry
 ### 12.10.2022 -> 1.2.3
 - Hotfixed regular users could not create tickets anymore
 

IDEAS.md

@@ -1,11 +1,3 @@
-- Permettre à un user de suivre un projet
-- ~~permettre d'insérer des @user dans le texte avec lien vers user~~
-  ~~pas de liens vers user mais mise en form~~
-- ~~parse de @user + envoie de mail si un seul user est trouvé~~
-- ~~permettre de modifier son mot de passe ? (je crois que ça n'as pas été mis exprès)~~
-- ~~parser les liens http~~
-
-
 Algorithme charge de travail ticket
 
 

app/Enums/InfoColors.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Enums;
+
+use Kwaadpepper\Enum\BaseEnumRoutable;
+
+/**
+ * @method static self primary()
+ * @method static self secondary()
+ * @method static self success()
+ * @method static self danger()
+ * @method static self warning()
+ * @method static self info()
+ * @method static self light()
+ * @method static self dark()
+ * @method static self white()
+ */
+class InfoColors extends BaseEnumRoutable
+{
+    /**
+     * Enum values
+     *
+     * @return array
+     */
+    protected static function values(): array
+    {
+        return [
+            'primary' => 0,
+            'secondary' => 1,
+            'success' => 2,
+            'danger' => 3,
+            'warning' => 4,
+            'info' => 5,
+            'light' => 6,
+            'dark' => 7,
+            'white' => 8
+        ];
+    }
+
+    /**
+     * Enum labels
+     *
+     * @return array
+     */
+    protected static function labels(): array
+    {
+        return [
+            'primary' => trans('Primary'),
+            'secondary' => trans('Secondary'),
+            'success' => trans('Success'),
+            'danger' => trans('Danger'),
+            'warning' => trans('Warning'),
+            'info' => trans('Info'),
+            'light' => trans('Light'),
+            'dark' => trans('Dark'),
+            'white' => trans('white')
+        ];
+    }
+
+    /**
+     * Enum classes
+     *
+     * @return array
+     */
+    protected static function classes(): array
+    {
+        return [
+            'primary' => 'primary',
+            'secondary' => 'secondary',
+            'success' => 'success',
+            'danger' => 'danger',
+            'warning' => 'warning',
+            'info' => 'info',
+            'light' => 'light',
+            'dark' => 'dark',
+        ];
+    }
+
+    /**
+     * @param string $attribute
+     * @return integer|string
+     */
+    public function __get(string $attribute)
+    {
+        if ($attribute === 'class') {
+            return $this->classes()[$this->getDefinition()];
+        }
+        return parent::__get($attribute);
+    }
+}

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,6 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Dutyhour;
+
 class HomeController extends Controller
 {
     /**
@@ -11,6 +13,11 @@ class HomeController extends Controller
      */
     public function home()
     {
-        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/Http/Controllers/InformationController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\Information;
+use Kwaadpepper\CrudPolicies\Traits\CrudController;
+
+class InformationController extends Controller
+{
+    use CrudController;
+
+    /** @var \App\Models\MacroSchedule\Marker */
+    public static $modelClass = Information::class;
+
+    /**
+     * Crud Layout
+     *
+     * @var string
+     */
+    public static $layout = 'layout.app';
+
+    /**
+     * After store model middleware
+     *
+     * @return void
+     */
+    public function storedModel()
+    {
+        cache()->put('infos', Information::all(), 3600);
+    }
+
+    /**
+     * After update model middleware
+     *
+     * @return void
+     */
+    public function updatedModel()
+    {
+        cache()->put('infos', Information::all(), 3600);
+    }
+
+    /**
+     * After delete model middleware
+     *
+     * @return void
+     */
+    public function deletedModel()
+    {
+        cache()->put('infos', Information::all(), 3600);
+    }
+}

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/Models/Information.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\InfoColors;
+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;
+use Kwaadpepper\Enum\Traits\CastsEnums;
+
+class Information extends Model
+{
+    use CastsEnums;
+    use HasFactory;
+    use IsCrudModel;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
+    public $timestamps = true;
+
+    /**
+     * Crud label column
+     *
+     * @var string
+     */
+    protected $crudLabelColumn = 'title';
+
+    /**
+     * The table associated with this model
+     *
+     * @var string
+     */
+    protected $table = 'informations';
+
+    /**
+     * Crud value column
+     *
+     * @var string
+     */
+    protected $crudValueColumn = 'id';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'title',
+        'message',
+        'type'
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $enumCasts = [
+        'type' => InfoColors::class,
+    ];
+
+    /**
+     * Package
+     *
+     * @param array $attributes
+     */
+    public function __construct(array $attributes = [])
+    {
+        self::$editableProperties = [
+            'title' => [
+                'label' => trans('Titre'),
+                'type' => CrudType::string(),
+                'validate' => [
+                    'string',
+                    'max:255'
+                ],
+                'nullable' => false,
+                'actions' => [
+                    CrudAction::viewAny(),
+                    CrudAction::view(),
+                    CrudAction::update(),
+                    CrudAction::create()
+                ]
+            ],
+            'message' => [
+                'label' => trans('Message'),
+                'type' => CrudType::string(),
+                'validate' => [
+                    'string',
+                    'max:255'
+                ],
+                'nullable' => false,
+                'actions' => [
+                    CrudAction::viewAny(),
+                    CrudAction::view(),
+                    CrudAction::update(),
+                    CrudAction::create()
+                ]
+            ],
+            'type' => [
+                'label' => trans('Type d\'annonce'),
+                'type' => CrudType::enum(),
+                'enum' => InfoColors::class,
+                '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/Policies/InformationPolicy.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 InformationPolicy 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 = [
+            'information' => [
+                'viewAny' => URR::make('userIsAdmin', $user),
+                'create' => URR::make('userIsAdmin', $user),
+                'update' => URR::make('userIsAdmin', $user),
+                'delete' => URR::make('userIsAdmin', $user)
+            ]
+        ];
+    }
+}

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Models\Information;
 use App\Models\MacroSchedule\Marker;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Carbon;
@@ -27,16 +28,16 @@ class AppServiceProvider extends ServiceProvider
         // * LOCAL FORCE eg: for Carbon
         // * Remove numeric to prevent float seperator to breaking numeric transactions
         \collect([\LC_TIME, \LC_MESSAGES, \LC_COLLATE, \LC_CTYPE, \LC_MONETARY])
-        ->map(function ($contant) {
-            setlocale(
-                $contant,
-                \sprintf(
-                    '%s_%s.UTF-8',
-                    config('app.locale'),
-                    \strtoupper(config('app.locale'))
-                )
-            );
-        });
+            ->map(function ($contant) {
+                setlocale(
+                    $contant,
+                    \sprintf(
+                        '%s_%s.UTF-8',
+                        config('app.locale'),
+                        \strtoupper(config('app.locale'))
+                    )
+                );
+            });
         Carbon::setLocale(config('app.locale'));
 
         // * Force bootstrap paginator
@@ -51,17 +52,21 @@ class AppServiceProvider extends ServiceProvider
         });
 
         if (!app()->runningInConsole()) {
-            $appInfos = Cache::remember('composer', 360, function () {
+            $appInfos = Cache::remember('composer', 3600, function () {
                 return json_decode(File::get(\app_path('../composer.json')));
             });
             View::share('name', $appInfos->name);
             View::share('version', $appInfos->version);
             View::share('license', $appInfos->license);
-
             // * Groups
             View::share('markerLabels', Cache::rememberForever('markerLabels', function () {
                 return Marker::getCachedLabels() ?? [];
             }));
-        }//end if
+            // * Informations 
+            $infos = Cache::remember('infos', 3600, function () {
+                return Information::all();
+            });
+            View::share('informations', $infos);
+        } //end if
     }
 }

app/Providers/RouteServiceProvider.php

@@ -6,7 +6,9 @@ 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\Information;
 use App\Models\Invoice;
 use App\Models\Label;
 use App\Models\Log;
@@ -91,6 +93,8 @@ 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('information', Information::class);
         Route::model('company', Company::class);
         Route::model('invoice', Invoice::class);
         Route::model('file', File::class);

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "ldcweb/supportweb",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "type": "project",
     "description": "The Laravel Framework.",
     "keywords": [

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');
+    }
+}

database/migrations/2023_04_18_150623_create_informations_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateInformationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('informations', function (Blueprint $table) {
+            $table->id();
+            $table->string('title');
+            $table->string('message');
+            $table->unsignedTinyInteger('type')->comment('Defined by the InfoColors enum.');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('informations');
+    }
+}

public/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Disallow: /

resources/lang/en/models.php

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

resources/lang/fr/models.php

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

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/errors/layout.blade.php

@@ -150,7 +150,7 @@
     </head>
     <body>
         <div class="flex-center position-ref full-height">
-            <img src="{{ asset('assets/images/supportweb_128.png') }}" alt="{{ config('app.name') }}">
+            <img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" alt="{{ config('app.name') }}">
             <div class="content">
                 <div class="title">
                     @yield('message')

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/informations/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("informations.logs.index", $model) }}" class="btn btn-sm btn-dark">{{ __('models.classes.logs') }}</a>
+                        @endcan
+                        @can('viewAny', \App\Models\File::class)
+                        <a href="{{ CrudController::getRoutePrefixed("informations.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/layout/app.blade.php

@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="fr">
+
 <head>
     <meta charset="utf-8">
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>Support LDCWEB</title>
+    <title>Support</title>
 
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
@@ -18,16 +19,26 @@
     <meta name="theme-color" content="#ffffff">
 
     <!-- Styles -->
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css', 'build') }}" rel="stylesheet">
     @crudPoliciesCSS
     @stack('styles')
 </head>
+
 <body>
     @include('layout.nav')
     <div id="app" class="content mt-5">
         <div class="container container-xxl">
             <div class="row justify-content-center">
                 <div class="col-12 @yield('bodyClass')">
+                    @auth
+                    @foreach ($informations as $information)
+                    <div class="alert alert-{{ $information->type->class }}" role="alert">
+                        <b>{{ $information->title }}</b><br>
+                        {{ $information->message }} - {{ __('Publié le') }} {{ $information->created_at->format('d-m-Y') }}
+                    </div>
+                    @endforeach
+                    @endauth
+
                     @if(!isset($modelClass))
                     {{-- Dont use for crud-policies --}}
                     @include('modules.flashMessage')
@@ -40,12 +51,15 @@
     @include('layout.footer')
     @stack('scriptsConstants')
     @include('modules.scriptConstants')
-    <script src="{{ mix('js/app.js') }}"></script>
+    <script src="{{ mix('js/app.js', 'build') }}"></script>
     @stack('scripts')
     @crudPoliciesJS()
     @auth
     {{-- JS SESSION ALERT IF SESSION TIMEOUT --}}
-    <script nonce="{{ $nonce }}">var __SESSION_WATCH = true;</script>
+    <script nonce="{{ $nonce }}">
+        var __SESSION_WATCH = true;
+    </script>
     @endauth
 </body>
-</html>
+
+</html>

resources/views/layout/footer.blade.php

@@ -1,6 +1,6 @@
 <footer id="footer" class="text-center text-lg-start">
     <div class="text-center p-2 bg-light">
-        <img src="{{ asset('assets/images/supportweb_128.png') }}" alt="{{ config('app.name', 'Laravel') }}" width="56">
+        <img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" alt="{{ config('app.name', 'Laravel') }}" width="56">
         <span class="text-reset">{{ $license }}</span>
         -
         <span class="text-reset">{{ $name }}&nbsp;-&nbsp;{{ $version }}</span>

resources/views/layout/nav.blade.php

@@ -46,6 +46,12 @@
                         @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
+                        @can('viewAny', App\Models\Information::class)
+                        <a class="dropdown-item @if(strpos(request()->route()->getName(), 'informations') === 0)active @endif" href="{{ route('informations.index') }}">{{ __('models.classes.informations') }}</a>
+                        @endcan
                     </div>
                 </li>
                 @endif

resources/views/vendor/mail/html/header.blade.php

@@ -1,7 +1,7 @@
 <tr>
 <td class="header">
 <a href="{{ $url }}" class="d-inline-block">
-<img src="{{ asset('assets/images/supportweb_128.png') }}" class="logo" alt="{{ config('app.name') }} Logo">
+<img src="{{ mix('assets/images/supportweb_128.png', 'build') }}" class="logo" alt="{{ config('app.name') }} Logo">
 </a>
 </td>
 </tr>

routes/web.php

@@ -5,8 +5,10 @@ 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\InformationController;
 use App\Http\Controllers\InvoiceController;
 use App\Http\Controllers\LabelController;
 use App\Http\Controllers\LogController;
@@ -74,6 +76,8 @@ 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('informations', InformationController::class)->except('show');
     Route::resource('companies', CompanyController::class)->except('show');
     Route::resource('invoices', InvoiceController::class);
     Route::resource('labels', LabelController::class)->except('show');

webpack.mix.js

@@ -1,5 +1,5 @@
-const path = require("path");
-const mix = require("laravel-mix");
+const path = require('path');
+const mix = require('laravel-mix');
 
 require("laravel-mix-polyfill");
 require("laravel-mix-clean");
@@ -14,6 +14,9 @@ const polyfill = {
     targets: "last 3 version, not dead, >0.3%",
 };
 
+mix.setPublicPath('public/build');
+mix.setResourceRoot('/build');
+
 mix.webpackConfig({
     resolve: {
         extensions: ["*", ".js", ".vue", ".ts"],
@@ -43,16 +46,14 @@ mix.webpackConfig({
     // Pour debug compilation errors
     // stats: {
     //     children: true,
-    //     warningsFilter: [
-    //         /\-\-underline\-color/,
-    //     ]
+    //     warningsFilter: [/\-\-underline\-color/],
     // },
 });
 
 mix.options({
     fileLoaderDirs: {
         fonts: `${assetDir}/fonts`,
-        images: `${assetDir}/images`,
+        images: `${assetDir}/images`
     },
     postCss: [
         require("postcss-discard-comments")({
@@ -62,11 +63,15 @@ mix.options({
 });
 
 mix.clean({
-    cleanOnceBeforeBuildPatterns: ["css/*", "js/*", "assets/*"],
+    cleanOnceBeforeBuildPatterns: [
+        "vendor/*",
+        "build/*"
+    ],
 });
 
-// mix Backend
-mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
+
+// * COMMON
+mix.ts("resources/ts/app.ts", "js", { transpileOnly: true })
     .vue({
         runtimeOnly: true,
         extractStyles: true,
@@ -76,7 +81,7 @@ mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
         fix: true,
         extensions: ["js", "ts"],
     })
-    .sass("resources/sass/app.scss", "public/css")
+    .sass("resources/sass/app.scss", "css")
     .stylelint({
         configFile: ".stylelintrc.json",
         files: ["**/*.scss"],
@@ -85,5 +90,5 @@ mix.ts("resources/ts/app.ts", "public/js/app.js", { transpileOnly: true })
     .version()
     .sourceMaps(true, "inline-source-map");
 
-// Copy Blade Images Assets
-mix.copyDirectory("resources/assets", "public/assets");
+// * Copy Blade Images Assets
+mix.copyDirectory("resources/assets", "public/build/assets");