From 4e8a1ab987574a304cb442b1ace05fc6c54fb402 Mon Sep 17 00:00:00 2001 From: Sebastien Hattry Date: Thu, 17 Aug 2023 12:43:22 +0000 Subject: [PATCH 1/5] Change Datetime to Date --- resources/views/bo/pages/dutyhours/form-inputs.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/bo/pages/dutyhours/form-inputs.blade.php b/resources/views/bo/pages/dutyhours/form-inputs.blade.php index 5a5a000..2ad44a9 100644 --- a/resources/views/bo/pages/dutyhours/form-inputs.blade.php +++ b/resources/views/bo/pages/dutyhours/form-inputs.blade.php @@ -5,7 +5,7 @@ {{ Str::ucfirst(__('validation.attributes.date')) }}
- @include('bo.partials.inputs.timestamp-datetime', [ + @include('bo.partials.inputs.date', [ 'id' => 'dutyhourDate', 'label' => __(':field de la :model', [ 'field' => Str::ucfirst(__('validation.attributes.date')), From c16871abb04e834f4a177d487e0d6d63071ebae0 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 17 Aug 2023 16:52:17 +0200 Subject: [PATCH 2/5] Fixed missing validations, some wording, SearchBelongsToDropdownComponent old values --- app/Http/Controllers/Bo/InvoiceController.php | 4 ++-- app/Http/Requests/Bo/Brands/StoreBrandRequest.php | 2 +- .../Bo/Informations/StoreInformationRequest.php | 4 ++-- .../Requests/Bo/Packages/StorePackageRequest.php | 4 ++-- .../Bo/TicketTypes/UpdateTicketTypeRequest.php | 3 --- .../ts/bo/components/InputTextAutoComponent.vue | 13 ------------- .../views/bo/pages/brands/form-inputs.blade.php | 2 +- resources/views/bo/pages/invoices/create.blade.php | 8 ++++---- .../views/bo/pages/invoices/form-inputs.blade.php | 2 +- resources/views/bo/pages/invoices/index.blade.php | 4 ++-- resources/views/bo/pages/invoices/show.blade.php | 4 ++-- .../views/bo/pages/packages/form-inputs.blade.php | 3 +-- .../views/bo/pages/sites/form-inputs.blade.php | 2 +- .../bo/pages/ticket_types/form-inputs.blade.php | 5 +++-- .../inputs/search-belongs-to-dropdown.blade.php | 8 ++++++++ .../views/bo/partials/inputs/tinyint-enum.blade.php | 2 +- 16 files changed, 31 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index 489e6ab..f00561a 100644 --- a/app/Http/Controllers/Bo/InvoiceController.php +++ b/app/Http/Controllers/Bo/InvoiceController.php @@ -156,14 +156,14 @@ class InvoiceController extends Controller ->route('bo.invoices.edit', $invoice) ->with('success', __( 'crud.messages.has_been_updated', - ['model' => Str::singular(__('models.classes.invoices'))] + ['model' => __('models.classes.invoices')] )); } //end if return redirect() ->back() ->with('error', __( 'crud.messages.cannot_be_updated', - ['model' => Str::singular(__('models.classes.invoices'))] + ['model' => __('models.classes.invoices')] )); }); } diff --git a/app/Http/Requests/Bo/Brands/StoreBrandRequest.php b/app/Http/Requests/Bo/Brands/StoreBrandRequest.php index d000081..7b5261c 100644 --- a/app/Http/Requests/Bo/Brands/StoreBrandRequest.php +++ b/app/Http/Requests/Bo/Brands/StoreBrandRequest.php @@ -25,7 +25,7 @@ class StoreBrandRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', + 'name' => 'required|string|min:3|max:255', 'sites' => 'nullable|array', 'sites.*.id' => 'required|exists:sites,id' ]; diff --git a/app/Http/Requests/Bo/Informations/StoreInformationRequest.php b/app/Http/Requests/Bo/Informations/StoreInformationRequest.php index c1f5bf3..c1c18e0 100644 --- a/app/Http/Requests/Bo/Informations/StoreInformationRequest.php +++ b/app/Http/Requests/Bo/Informations/StoreInformationRequest.php @@ -27,8 +27,8 @@ class StoreInformationRequest extends FormRequest public function rules() { return [ - 'title' => 'required|string|max:255', - 'message' => 'required|string|max:255', + 'title' => 'required|string|min:3|max:255', + 'message' => 'required|string|min:3|max:255', 'type' => [ 'required', Rule::in(collect(InfoColorsEnum::cases())->pluck('value')->all()), diff --git a/app/Http/Requests/Bo/Packages/StorePackageRequest.php b/app/Http/Requests/Bo/Packages/StorePackageRequest.php index 1d64258..179cf88 100644 --- a/app/Http/Requests/Bo/Packages/StorePackageRequest.php +++ b/app/Http/Requests/Bo/Packages/StorePackageRequest.php @@ -25,8 +25,8 @@ class StorePackageRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', - 'amount' => 'required|numeric|regex:/^\d+(\.\d{1,2})?$/', + 'name' => 'required|string|min:3|max:255', + 'amount' => 'required|numeric|min:0|regex:/^\d+(\.\d{1,2})?$/', ]; } diff --git a/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php b/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php index d6ba55c..759f50f 100644 --- a/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php +++ b/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php @@ -2,10 +2,8 @@ namespace App\Http\Requests\Bo\TicketTypes; -use App\Enums\Tickets\TicketTypeEnum; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; -use Illuminate\Validation\Rules\Enum; class UpdateTicketTypeRequest extends FormRequest { @@ -27,7 +25,6 @@ class UpdateTicketTypeRequest extends FormRequest public function rules(): array { return [ - 'type' => ['required', new Enum(TicketTypeEnum::class)], 'template' => 'required|string|min:3|max:255', ]; } diff --git a/resources/ts/bo/components/InputTextAutoComponent.vue b/resources/ts/bo/components/InputTextAutoComponent.vue index 8e2dc88..6189b76 100644 --- a/resources/ts/bo/components/InputTextAutoComponent.vue +++ b/resources/ts/bo/components/InputTextAutoComponent.vue @@ -13,7 +13,6 @@ :placeholder="intPlaceholder" :required="intRequired" @input="onInput" - @blur="onBlur" v-model="intValue" />
@@ -80,18 +79,6 @@ export default defineComponent({ }; }, methods: { - onBlur() { - const el = textarea.value; - if (!el) { - throw new Error("undefined textarea element"); - } - // * Remove every new line char - el.value = el.value.replace(/[\n\r]/g, ""); - this.$nextTick(() => { - el.style.height = "auto"; - el.style.height = `${el.scrollHeight}px`; - }); - }, onInput() { const el = textarea.value; if (!el) { diff --git a/resources/views/bo/pages/brands/form-inputs.blade.php b/resources/views/bo/pages/brands/form-inputs.blade.php index 2d1d231..a724e8e 100644 --- a/resources/views/bo/pages/brands/form-inputs.blade.php +++ b/resources/views/bo/pages/brands/form-inputs.blade.php @@ -49,7 +49,7 @@ 'helper' => __('Séléctionnez les sites à associer à cet utilisateur (minimum 0, maximum :max)', [ 'max' => count($siteModels) ]), - 'required' => true, + 'required' => false, ])
diff --git a/resources/views/bo/pages/invoices/create.blade.php b/resources/views/bo/pages/invoices/create.blade.php index 5293e1f..ae61d0a 100644 --- a/resources/views/bo/pages/invoices/create.blade.php +++ b/resources/views/bo/pages/invoices/create.blade.php @@ -1,7 +1,7 @@ @extends('layout.app', ['brParam' => $invoiceModel]) -@section('title', __('Création d\'un :model', ['model' => Str::singular(__('models.classes.invoices'))])) -@section('description', __('Création d\'un tout nouveau :model', ['model' => Str::singular(__('models.classes.invoices'))])) +@section('title', __('Création d\'un :model', ['model' => __('models.classes.invoices')])) +@section('description', __('Création d\'un tout nouveau :model', ['model' => __('models.classes.invoices')])) @section('breadcrumb', request()->route()->getName()) @section('content') @@ -22,7 +22,7 @@ class="btn btn-primary" data-bs-toggle="tooltip" data-bs-placement="top" - title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.invoices'))]) }}"> + title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.invoices')]) }}"> {{ __('crud.actions.save') }} @@ -37,7 +37,7 @@ class="btn btn-primary" data-bs-toggle="tooltip" data-bs-placement="top" - title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.invoices'))]) }}"> + title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.invoices')]) }}"> {{ __('crud.actions.save') }} diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 731db72..184494a 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -340,7 +340,7 @@ -@if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened) +@if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->status === null) @push('scripts') - - diff --git a/resources/views/bo/pages/schedule/index.blade.php b/resources/views/bo/pages/schedule/index.blade.php deleted file mode 100644 index 1dbfd28..0000000 --- a/resources/views/bo/pages/schedule/index.blade.php +++ /dev/null @@ -1,76 +0,0 @@ -@extends('layout.app') - -@section('title', __('Planning')) -@section('description', __('Planning de l\'équipe Uwil')) - -@section('content') -
-
-
-

{{__('Légende')}}

-
- @foreach(\App\Enums\Planning\CellTypeEnum::cases() as $type) - {{ $type->label() }} - @endforeach -
-
- @if (\auth()->user()->role->equals(\App\Enums\Users\RoleEnum::developper)) -
- @if (request()->cookie('userAuthSchedule')) - {{__('Afficher les plannings')}} - @else - {{__('Afficher mon planning')}} - @endif -
- @endif -
- @php - $dataVue = [ - 'browseDate' => $date, - 'schedules' => $arSchedules, - 'activities' => \App\Enums\Planning\ActivityTypeEnum::toArray(), - 'models' => \App\Enums\Planning\CellModelEnum::toArray(), - 'users' => $users, - 'weeks' => $weekCells, - 'daySlots' => Config::get('schedules.daySlots'), - 'showWeekends' => 'false', - ]; - @endphp -
-
-@endsection - -@push('styles') - -@endpush diff --git a/resources/views/bo/pages/users/stats.blade.php b/resources/views/bo/pages/users/stats.blade.php deleted file mode 100644 index 0e89fe3..0000000 --- a/resources/views/bo/pages/users/stats.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layout.app') - -@section('title', __('Statistiques')) -@section('description', __('Statistiques de l\':model :user', ['model' => Str::singular(__('models.classes.users')), 'user' => auth()->user()->name])) - -@section('content') -
- @include('breadcrumbs.breadcrumb-body') -
-@foreach ($stats as $index => $stat) - - - - - - - - - - @php - $workdays = 260; - if (strpos($index, '2021') !== false) { - $workdays = 105; - } - $sum = 0; - @endphp - @foreach ($stat as $data) - - - - - - @php $sum += $data->nb; @endphp - @endforeach - - - - - - -
{{ $index }}{{ __('Jour(s)') }}%
{{ $data->activity->label() }}{{ $data->nb / Config::get('schedules.daySlots') }}{{ round((($data->nb / Config::get('schedules.daySlots')) / $workdays) * 100) }}%
{{ __('Total') }}{{ $sum / Config::get('schedules.daySlots') }} / {{ $workdays }}{{ round((($sum / 8) / $workdays) * 100) }}%
-@endforeach -@endsection - -@push('styles') - -@endpush diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php index 2273b31..05eb030 100644 --- a/resources/views/layout/nav.blade.php +++ b/resources/views/layout/nav.blade.php @@ -68,11 +68,6 @@ @endcan @endif - @can('isAdmin') - - @endcan @can('isAdmin')