From 1d07b4fb8f74b0ba6bbe41b586d7f9a5bb69bb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 28 Sep 2023 16:21:05 +0200 Subject: [PATCH] Tons of corrections + service stats --- app/Http/Controllers/Bo/ServiceController.php | 12 +- app/Http/Controllers/Bo/StatsController.php | 62 ++--- app/Http/Controllers/Bo/UsersController.php | 12 +- ...dRequest.php => StatsByServiceRequest.php} | 2 +- app/Models/ArcadiaBrandStat.php | 77 ------ app/Models/ServiceStat.php | 20 +- app/Providers/AppServiceProvider.php | 3 + app/Providers/RouteServiceProvider.php | 3 - composer.json | 2 +- ...10018_create_arcadia_brand_stats_table.php | 47 ---- ...2023_09_19_145010_create_service_stats.php | 2 +- .../forged_file_since_none_available.xml | 28 +-- resources/lang/en/crud.php | 40 +-- resources/lang/en/models.php | 9 +- resources/lang/fr/crud.php | 40 +-- resources/lang/fr/models.php | 9 +- resources/views/bo/layouts/nav-list.blade.php | 20 +- .../bo/modules/search-bar-brand.blade.php | 2 +- .../views/bo/pages/brands/form.blade.php | 4 +- .../views/bo/pages/brands/index.blade.php | 9 +- .../views/bo/pages/brands/show.blade.php | 6 +- .../views/bo/pages/services/create.blade.php | 16 +- .../views/bo/pages/services/edit.blade.php | 20 +- .../views/bo/pages/services/form.blade.php | 6 +- .../bo/pages/services/index-list.blade.php | 26 +- .../views/bo/pages/services/index.blade.php | 54 ++-- .../views/bo/pages/services/show.blade.php | 18 +- .../stats/view-stats-by-brands.blade.php | 237 ------------------ .../stats/view-stats-by-services.blade.php | 183 ++++++++++++++ .../views/bo/pages/users/create.blade.php | 65 +++-- resources/views/bo/pages/users/edit.blade.php | 108 ++++---- resources/views/bo/pages/users/form.blade.php | 81 +++--- .../views/bo/pages/users/index.blade.php | 8 +- .../views/bo/pages/xml_incos/form.blade.php | 8 +- .../views/bo/pages/xml_incos/index.blade.php | 8 +- .../views/bo/pages/xml_incos/show.blade.php | 6 +- .../breadcrumbs/breadcrumb-body.blade.php | 15 +- .../breadcrumbs/breadcrumb-head.blade.php | 15 +- .../breadcrumbs/breadcrumb-layout.blade.php | 30 +-- routes/api.php | 18 -- routes/breadcrumbs-bo.php | 67 ++++- routes/web-bo.php | 6 +- 42 files changed, 629 insertions(+), 775 deletions(-) rename app/Http/Requests/Bo/{StatsByBrandRequest.php => StatsByServiceRequest.php} (97%) delete mode 100644 app/Models/ArcadiaBrandStat.php delete mode 100644 database/migrations/2023_09_19_110018_create_arcadia_brand_stats_table.php delete mode 100644 resources/views/bo/pages/stats/view-stats-by-brands.blade.php create mode 100644 resources/views/bo/pages/stats/view-stats-by-services.blade.php diff --git a/app/Http/Controllers/Bo/ServiceController.php b/app/Http/Controllers/Bo/ServiceController.php index ba1ad10..307deeb 100644 --- a/app/Http/Controllers/Bo/ServiceController.php +++ b/app/Http/Controllers/Bo/ServiceController.php @@ -93,14 +93,14 @@ class ServiceController extends Controller ->route('bo.services.edit', $service) ->with('success', trans( ':model a été créé.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); } return redirect() ->back() ->with('error', trans( ':model n\'a pas été créé.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); }); } @@ -137,14 +137,14 @@ class ServiceController extends Controller ->route('bo.services.edit', $service) ->with('success', trans( ':model a été mis à jour.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); } return redirect() ->back() ->with('error', trans( ':model n\'a pas été mis à jour.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); }); } @@ -174,13 +174,13 @@ class ServiceController extends Controller return redirect()->route('bo.services.index') ->with('success', trans( ':model a été supprimé.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); } return redirect()->back() ->with('error', trans( ':model n\'a pas pu être supprimé.', - ['model' => Str::singular(trans('models.classes.services'))] + ['model' => Str::singular(trans('models.classes.service'))] )); } diff --git a/app/Http/Controllers/Bo/StatsController.php b/app/Http/Controllers/Bo/StatsController.php index d42a0fd..8fcc7d0 100644 --- a/app/Http/Controllers/Bo/StatsController.php +++ b/app/Http/Controllers/Bo/StatsController.php @@ -3,10 +3,11 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; -use App\Http\Requests\Bo\StatsByBrandRequest; -use App\Models\ArcadiaBrand; -use App\Models\ArcadiaBrandStat; +use App\Http\Requests\Bo\StatsByServiceRequest; +use App\Models\Service; +use App\Models\ServiceStat; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Http\Response; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Schema; use League\Csv\Writer; @@ -17,58 +18,61 @@ use League\Csv\Writer; class StatsController extends Controller { /** - * Shows stats by brand. + * Shows stats by service. * - * @param \App\Http\Requests\Bo\StatsByBrandRequest $request + * @param \App\Http\Requests\Bo\StatsByServiceRequest $request * @return \Illuminate\Http\Response */ - public function viewStatsByBrand(StatsByBrandRequest $request) + public function viewStatsByService(StatsByServiceRequest $request) { $stats = null; - if ($request->has('brand')) { - /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\ArcadiaBrandStat> */ - $stats = ArcadiaBrandStat::query()->whereDate('created_at', '>=', $request->start) - ->whereDate('created_at', '<=', $request->end) - ->whereHas('arcadiaBrand', fn (Builder $q) => $q->where('id', $request->brand)) + if ($request->has('service')) { + /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\ServiceStat> */ + $stats = ServiceStat::query() + ->with('service') + ->whereDate('date', '>=', $request->start) + ->whereDate('date', '<=', $request->end) + ->whereHas('service', fn (Builder $q) => $q->where('id', $request->service)) ->get(); } - return view('bo.pages.stats.view-stats-by-brands', \compact('stats')); + return view('bo.pages.stats.view-stats-by-services', \compact('stats')); } /** - * Exports stats by brand as a csv file. + * Exports stats by service as a csv file. * - * @param \App\Http\Requests\StatsByBrandRequest $request + * @param \App\Http\Requests\Bo\StatsByServiceRequest $request * @return \Illuminate\Http\Response */ - public function exportByBrandCsv(StatsByBrandRequest $request): \Illuminate\Http\Response + public function exportByBrandCsv(StatsByServiceRequest $request): Response { - /** @var \App\Models\ArcadiaBrand */ - $brand = ArcadiaBrand::query()->findOrFail($request->brand); - /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\ArcadiaBrandStat> */ - $stats = ArcadiaBrandStat::query()->with('arcadiaBrand') - ->whereHas('arcadiaBrand', fn (Builder $q) => $q->where('id', $request->brand)) - ->whereDate('created_at', '>=', $request->start) - ->whereDate('created_at', '<=', $request->end) + /** @var \App\Models\Service */ + $service = Service::query()->findOrFail($request->service); + /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\ServiceStat> */ + $stats = ServiceStat::query() + ->with('service.arcadiaBrand') + ->whereDate('date', '>=', $request->start) + ->whereDate('date', '<=', $request->end) + ->whereHas('service', fn (Builder $q) => $q->where('id', $request->service)) ->get(); - $columns = Schema::getColumnListing((new ArcadiaBrandStat())->getTable()); - $columns = Arr::where($columns, fn ($value) => !in_array($value, ['created_at', 'brand_id'])); + $columns = Schema::getColumnListing((new ServiceStat())->getTable()); + $columns = Arr::where($columns, fn ($value) => !in_array($value, ['date', 'service_id'])); /** @var array $columns */ - $header = '"date";"marque";' . implode(';', $columns); + $header = '"date";"service";' . implode(';', $columns); $w = Writer::createFromString($header . PHP_EOL); $w->setDelimiter(';'); $w->setEnclosure('"'); $w->setOutputBOM(Writer::BOM_UTF8); - /** @var \App\Models\ArcadiaBrandStat $stat */ + /** @var \App\Models\ServiceStat $stat */ foreach ($stats as $stat) { /** @var array $cols */ $cols = [ - $stat->created_at->isoFormat('YYYY-MM-DD'), - $stat->arcadiaBrand->label + $stat->date->isoFormat('YYYY-MM-DD'), + $service->label ]; foreach ($columns as $colname) { $cols[] = $stat->{$colname}; @@ -79,7 +83,7 @@ class StatsController extends Controller 'Content-Encoding' => 'none', 'Content-Type' => 'text/csv; charset=UTF-8', // phpcs:ignore Generic.Files.LineLength.TooLong - 'Content-Disposition' => "attachment; filename=\"Statistiques du $request->start au $request->end pour $brand->label.csv\"", + 'Content-Disposition' => "attachment; filename=\"Statistiques du {$request->start} au {$request->end} pour {$service->name}.csv\"", 'Content-Description' => 'File Transfer', ]); } diff --git a/app/Http/Controllers/Bo/UsersController.php b/app/Http/Controllers/Bo/UsersController.php index c8f0858..539abf9 100644 --- a/app/Http/Controllers/Bo/UsersController.php +++ b/app/Http/Controllers/Bo/UsersController.php @@ -92,12 +92,12 @@ class UsersController extends Controller if ($user->saveOrFail()) { return redirect()->route('bo.users.edit', $user->id) ->with('success', __('crud.messages.has_been_created', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); } return redirect()->back() ->with('error', __('crud.messages.cannot_be_created', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); }); } @@ -129,12 +129,12 @@ class UsersController extends Controller if ($user->saveOrFail()) { return redirect()->route('bo.users.edit', $user->id) ->with('success', __('crud.messages.has_been_updated', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); } return redirect()->route('bo.users.edit', $user->id) ->with('error', __('crud.messages.cannot_be_updated', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); }); } @@ -150,12 +150,12 @@ class UsersController extends Controller if ($user->deleteOrFail()) { return redirect()->route('bo.users.index') ->with('success', __('crud.messages.has_been_deleted', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); } return redirect()->back() ->with('error', __('crud.messages.cannot_be_deleted', [ - 'model' => Str::singular(__('models.classes.users')) + 'model' => __('models.classes.user') ])); } diff --git a/app/Http/Requests/Bo/StatsByBrandRequest.php b/app/Http/Requests/Bo/StatsByServiceRequest.php similarity index 97% rename from app/Http/Requests/Bo/StatsByBrandRequest.php rename to app/Http/Requests/Bo/StatsByServiceRequest.php index d06b898..78bcb25 100644 --- a/app/Http/Requests/Bo/StatsByBrandRequest.php +++ b/app/Http/Requests/Bo/StatsByServiceRequest.php @@ -10,7 +10,7 @@ use Illuminate\Validation\ValidationException; /** * @codeCoverageIgnore */ -class StatsByBrandRequest extends FormRequest +class StatsByServiceRequest extends FormRequest { /** * Determine if the user is authorized to make this request. diff --git a/app/Models/ArcadiaBrandStat.php b/app/Models/ArcadiaBrandStat.php deleted file mode 100644 index 666ac85..0000000 --- a/app/Models/ArcadiaBrandStat.php +++ /dev/null @@ -1,77 +0,0 @@ - 'date', - ]; - - /** - * Perform any actions required after the model boots. - * - * @return void - */ - protected static function booted(): void - { - static::creating(function (self $model) { - if (!$model->created_at) { - $model->created_at = now(); - } - }); - } - - // * RELATIONS - - /** - * Get the Arcadia Brand that owns the ArcadiaBrandStat - * - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function arcadiaBrand(): BelongsTo - { - return $this->belongsTo(ArcadiaBrand::class); - } -} diff --git a/app/Models/ServiceStat.php b/app/Models/ServiceStat.php index 638e879..80df20e 100644 --- a/app/Models/ServiceStat.php +++ b/app/Models/ServiceStat.php @@ -7,10 +7,12 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * @property integer $id The service id. - * @property string $name The service name. - * @property string $bearer_token The service name. - * @property string $bearer_pwd The service name. + * @property integer $id The service id. + * @property \Carbon\Carbon $date La journée concernée. + * @property integer $nb_calls Le nombre d'appels du service pour la journée. + * @property integer $service_id Service foreign key. + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at * @package App\Models */ class ServiceStat extends Model @@ -24,6 +26,16 @@ class ServiceStat extends Model */ protected $fillable = ['date']; + /** + * The attributes that should be cast. + * + * @var array + */ + protected $casts = [ + 'date' => 'immutable_date', + 'nb_calls' => 'int', + ]; + /** * The model's attributes. * diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 3957f3c..dbb4f9b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -10,6 +10,7 @@ use Illuminate\Support\Carbon; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\RateLimiter; use Illuminate\Support\Facades\URL; +use Illuminate\Support\Pluralizer; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -44,6 +45,8 @@ class AppServiceProvider extends ServiceProvider \strtoupper(config('app.locale')) )); Carbon::setLocale(config('app.locale')); + // * I18n + Pluralizer::useLanguage('french'); // * Force bootstrap paginator Paginator::useBootstrap(); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f08f055..640987e 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,7 +2,6 @@ namespace App\Providers; -use App\Models\User; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Http\Request; @@ -44,8 +43,6 @@ class RouteServiceProvider extends ServiceProvider ->namespace($this->namespace) ->group(base_path('routes/api.php')); }); - - Route::model('user', User::class); } /** diff --git a/composer.json b/composer.json index 3c1cdd5..5c7c73f 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "uwil/laravel-base-project", + "name": "uwil/flucollector", "version": "1.0.0", "type": "project", "description": "Laravel base project reference.", diff --git a/database/migrations/2023_09_19_110018_create_arcadia_brand_stats_table.php b/database/migrations/2023_09_19_110018_create_arcadia_brand_stats_table.php deleted file mode 100644 index 7207160..0000000 --- a/database/migrations/2023_09_19_110018_create_arcadia_brand_stats_table.php +++ /dev/null @@ -1,47 +0,0 @@ -unsignedInteger('active') - ->comment('Le nombre de comptes actifs (dernière connexion inférieure à 6 mois)'); - $table->unsignedInteger('inactive') - ->comment('Le nombre de comptes inactifs (dernière connexion supérieure à 6 mois)'); - $table->unsignedInteger('old_accounts') - ->comment('Le nombre d’anciens comptes (date de création supérieure à 6 mois'); - $table->unsignedInteger('new_accounts') - ->comment('Le nombre de nouveaux comptes (date de création inférieure à 6 mois)'); - $table->unsignedInteger('total_accounts') - ->comment('Le nombre de comptes total'); - $table->unsignedInteger('total_opt_in') - ->comment('Le nombre d’optins (single optin compris)'); - - $table->timestamp('created_at')->nullable(); - - $table->foreignId('arcadia_brand_id')->constrained('arcadia_brands'); - - $table->index(['arcadia_brand_id', 'created_at']); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('arcadia_brand_stats'); - } -} diff --git a/database/migrations/2023_09_19_145010_create_service_stats.php b/database/migrations/2023_09_19_145010_create_service_stats.php index a579fb6..5ab2408 100644 --- a/database/migrations/2023_09_19_145010_create_service_stats.php +++ b/database/migrations/2023_09_19_145010_create_service_stats.php @@ -18,7 +18,7 @@ class CreateServiceStats extends Migration $table->id(); $table->foreignId('service_id')->comment('Le clé primaire du service.')->constrained('services'); - $table->date('date')->comment('Le journée concernée.'); + $table->date('date')->comment('La journée concernée.'); $table->unsignedBigInteger('nb_calls')->default(0) ->comment('Le nombre d\'appels du service pour la journée.'); diff --git a/resources/documents/arcadia/forged_file_since_none_available.xml b/resources/documents/arcadia/forged_file_since_none_available.xml index 99d5c73..f4ef83b 100644 --- a/resources/documents/arcadia/forged_file_since_none_available.xml +++ b/resources/documents/arcadia/forged_file_since_none_available.xml @@ -490,7 +490,7 @@ - + @@ -2518,7 +2518,7 @@ - + @@ -2678,7 +2678,7 @@ - + @@ -2698,7 +2698,7 @@ - + @@ -2754,11 +2754,11 @@ - + - + @@ -2886,15 +2886,15 @@ - + - + - + @@ -3618,7 +3618,7 @@ - + @@ -3786,7 +3786,7 @@ - + @@ -3842,7 +3842,7 @@ - + @@ -3918,7 +3918,7 @@ - + @@ -3942,7 +3942,7 @@ - + diff --git a/resources/lang/en/crud.php b/resources/lang/en/crud.php index 820675b..dabec69 100644 --- a/resources/lang/en/crud.php +++ b/resources/lang/en/crud.php @@ -2,29 +2,29 @@ return [ 'actions' => [ - 'list' => 'List', - 'view' => 'View', - 'create' => 'Create', - 'duplicate' => 'Duplicate', - 'update' => 'Update', - 'delete' => 'Delete', - 'save' => 'Save', - 'edit' => 'Edit', + 'list' => 'list', + 'view' => 'view', + 'create' => 'create', + 'duplicate' => 'duplicate', + 'update' => 'update', + 'delete' => 'delete', + 'save' => 'save', + 'edit' => 'edit', ], 'helpers' => [ - 'list' => 'List', - 'list_all' => 'List all :model', - 'create_model' => 'Create :model', - 'view_model' => 'View :model', - 'update_model' => 'Update :model', - 'duplicate_model' => 'Duplicate :model', - 'delete_model' => 'Delete :model', - 'save_model' => 'Save :model', - 'edit_model' => 'Edit :model', - 'no_results' => 'No results for :models', - 'publish' => 'Publish', - 'unpublish' => 'Unpublish', + 'list' => 'list', + 'list_all' => 'list all :model', + 'create_model' => 'create :model', + 'view_model' => 'view :model', + 'update_model' => 'update :model', + 'duplicate_model' => 'duplicate :model', + 'delete_model' => 'delete :model', + 'save_model' => 'save :model', + 'edit_model' => 'edit :model', + 'no_results' => 'no results for :models', + 'publish' => 'publish', + 'unpublish' => 'unpublish', ], 'libs' => [ diff --git a/resources/lang/en/models.php b/resources/lang/en/models.php index 48e0cde..f2d8ac3 100644 --- a/resources/lang/en/models.php +++ b/resources/lang/en/models.php @@ -2,9 +2,10 @@ return [ 'classes' => [ - 'users' => 'Users', - 'arcadia_brands' => 'Brands', - 'xml_incos' => 'Inco Sheets', - 'services' => 'Services', + 'user' => 'user', + 'arcadia_brand' => 'brand', + 'xml_inco' => 'inco sheet', + 'service' => 'service', + 'service_stat' => 'statistic per service|statistics per service', ] ]; diff --git a/resources/lang/fr/crud.php b/resources/lang/fr/crud.php index 3465c18..132b504 100644 --- a/resources/lang/fr/crud.php +++ b/resources/lang/fr/crud.php @@ -2,29 +2,29 @@ return [ 'actions' => [ - 'list' => 'Liste', - 'view' => 'Voir', - 'create' => 'Créer', - 'duplicate' => 'Dupliquer', - 'update' => 'Éditer', - 'delete' => 'Supprimer', - 'save' => 'Sauvegarder', - 'edit' => 'Mettre à jour', + 'list' => 'liste', + 'view' => 'voir', + 'create' => 'créer', + 'duplicate' => 'dupliquer', + 'update' => 'éditer', + 'delete' => 'supprimer', + 'save' => 'sauvegarder', + 'edit' => 'mettre à jour', ], 'helpers' => [ - 'list' => 'Liste', - 'list_all' => 'Lister tous les :model', - 'create_model' => 'Créer :model', - 'view_model' => 'Voir :model', - 'update_model' => 'Éditer :model', - 'duplicate_model' => 'Dupliquer :model', - 'delete_model' => 'Supprimer :model', - 'save_model' => 'Sauvegarder :model', - 'edit_model' => 'Mettre à jour :model', - 'no_results' => 'Aucun résultat pour :model', - 'publish' => 'Publié', - 'unpublish' => 'Dépublié', + 'list' => 'liste', + 'list_all' => 'lister tous les :model', + 'create_model' => 'créer :model', + 'view_model' => 'voir :model', + 'update_model' => 'éditer :model', + 'duplicate_model' => 'dupliquer :model', + 'delete_model' => 'supprimer :model', + 'save_model' => 'sauvegarder :model', + 'edit_model' => 'mettre à jour :model', + 'no_results' => 'aucun résultat pour :model', + 'publish' => 'publié', + 'unpublish' => 'dépublié', ], 'libs' => [ diff --git a/resources/lang/fr/models.php b/resources/lang/fr/models.php index 5bfec98..657539a 100644 --- a/resources/lang/fr/models.php +++ b/resources/lang/fr/models.php @@ -2,9 +2,10 @@ return [ 'classes' => [ - 'users' => 'Utilisateurs', - 'arcadia_brands' => 'Marques', - 'xml_incos' => 'Fiches Inco', - 'services' => 'Services', + 'user' => 'utilisateur', + 'arcadia_brand' => 'marque', + 'xml_inco' => 'fiche inco|fiches inco', + 'service' => 'service', + 'service_stat' => 'statistique par service|statistiques par service', ] ]; diff --git a/resources/views/bo/layouts/nav-list.blade.php b/resources/views/bo/layouts/nav-list.blade.php index 99fbb4f..11918c1 100644 --- a/resources/views/bo/layouts/nav-list.blade.php +++ b/resources/views/bo/layouts/nav-list.blade.php @@ -10,8 +10,8 @@ @endcan @@ -19,31 +19,31 @@ @endcan diff --git a/resources/views/bo/modules/search-bar-brand.blade.php b/resources/views/bo/modules/search-bar-brand.blade.php index 99c66e2..7990157 100644 --- a/resources/views/bo/modules/search-bar-brand.blade.php +++ b/resources/views/bo/modules/search-bar-brand.blade.php @@ -1,5 +1,5 @@
-
+
- {{ __('Fin') }} - - - -
- @if ($stats) -
- {{ __('Export des données') }} - - -
- @endif - -
- - @if ($stats) -
-
- -
-
- @endif - - - - -@endsection - diff --git a/resources/views/bo/pages/stats/view-stats-by-services.blade.php b/resources/views/bo/pages/stats/view-stats-by-services.blade.php new file mode 100644 index 0000000..3728715 --- /dev/null +++ b/resources/views/bo/pages/stats/view-stats-by-services.blade.php @@ -0,0 +1,183 @@ +@extends('bo.layout') + +@section('title', __('Statistiques par marque')) +@section('description', __('La page de statistiques par marque avec une plage de dates donnée')) +@section('metaIndex', 'noindex,nofollow') +@section('breadcrumb', + request()->route()->getName()) + +@section('content') +
+
+
+
+
+
+ @include('modules.breadcrumbs.breadcrumb-body') +
+
+
+
+
+
+
+
+ + + + {{ __('Début') }} + + {{ __('Fin') }} + + + +
+ @if ($stats) +
+ {{ __('Export des données') }} + + +
+ @endif +
+
+
+ @if ($stats) +
+
+ +
+
+ @endif +
+
+
+
+@endsection + +@push('scripts') + +@endpush diff --git a/resources/views/bo/pages/users/create.blade.php b/resources/views/bo/pages/users/create.blade.php index 9a35908..4a9276d 100644 --- a/resources/views/bo/pages/users/create.blade.php +++ b/resources/views/bo/pages/users/create.blade.php @@ -1,46 +1,37 @@ @extends('bo.layout', ['brParam' => $userModel]) -@section('title', __('Création d\'un :model', ['model' => Str::singular(__('models.classes.users'))])) -@section('description', __('Création d\'un tout nouveau :model', ['model' => Str::singular(__('models.classes.users'))])) -@section('breadcrumb', request()->route()->getName()) +@section('title', __('Création d\'un :model', ['model' => __('models.classes.user')])) +@section('description', __('Création d\'un tout nouveau :model', ['model' => __('models.classes.user')])) +@section('breadcrumb', + request()->route()->getName()) @section('content') -
-
- - - - @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $userModel]) -
-
- -
-
-
- @csrf - @include('bo.pages.users.form') -
-
-
-
+
+ @csrf + @include('bo.pages.users.form') +
+
+ +
+
+
@endsection diff --git a/resources/views/bo/pages/users/edit.blade.php b/resources/views/bo/pages/users/edit.blade.php index f73d74e..322ddca 100644 --- a/resources/views/bo/pages/users/edit.blade.php +++ b/resources/views/bo/pages/users/edit.blade.php @@ -1,69 +1,53 @@ @extends('bo.layout', ['brParam' => $userModel]) -@section('title', __('Édition d\'un :model', ['model' => Str::singular(__('models.classes.users'))])) -@section('description', __('Édition d\'un :model déjà existant', ['model' => Str::singular(__('models.classes.users'))])) -@section('breadcrumb', request()->route()->getName()) +@section('title', __('Édition d\'un :model', ['model' => __('models.classes.user')])) +@section('description', __('Édition d\'un :model déjà existant', ['model' => __('models.classes.user')])) +@section('breadcrumb', + request()->route()->getName()) @section('content') -
-
- - - - @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $userModel]) -
-
-
- @csrf - @method('DELETE') -
- - - - - -
-
-
-
-
- @csrf - @method('PUT') - @include('bo.pages.users.form') -
-
- +
+
+ + + + @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $userModel]) +
+
+ + @csrf + @method('DELETE') +
+ + + + + +
+
- +
+ @csrf + @method('PUT') + @include('bo.pages.users.form') +
+
+ +
+
+
@endsection diff --git a/resources/views/bo/pages/users/form.blade.php b/resources/views/bo/pages/users/form.blade.php index 2a91202..f99ffa6 100644 --- a/resources/views/bo/pages/users/form.blade.php +++ b/resources/views/bo/pages/users/form.blade.php @@ -1,21 +1,21 @@
{{-- FIRSTNAME --}}
-
+
{{ __('Prénom') }}
@include('bo.partials.inputs.varchar', [ 'id' => 'userFirstname', - 'label' => __('Prénom de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('Prénom de l\':model', ['model' => __('models.classes.user')]), 'hasWordCounter' => true, 'name' => 'firstname', 'required' => true, 'model' => $userModel ?? null, 'helper' => __('validation.between.string', [ - 'attribute' => __('prénom de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'attribute' => __('prénom de l\':model', ['model' => __('models.classes.user')]), 'min' => 3, - 'max' => 255 + 'max' => 255, ]), 'placeholder' => __('Un beau prénom'), ]) @@ -25,21 +25,21 @@
{{-- LASTNAME --}}
-
+
{{ __('Nom') }}
@include('bo.partials.inputs.varchar', [ 'id' => 'userLastname', - 'label' => __('Nom de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('Nom de l\':model', ['model' => __('models.classes.user')]), 'hasWordCounter' => true, 'name' => 'lastname', 'required' => true, 'model' => $userModel ?? null, 'helper' => __('validation.between.string', [ - 'attribute' => __('nom de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'attribute' => __('nom de l\':model', ['model' => __('models.classes.user')]), 'min' => 3, - 'max' => 255 + 'max' => 255, ]), 'placeholder' => __('Un beau nom'), ]) @@ -49,21 +49,21 @@
{{-- EMAIL --}}
-
+
{{ __('E-mail') }}
@include('bo.partials.inputs.varchar', [ 'id' => 'userEmail', - 'label' => __('E-mail de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('E-mail de l\':model', ['model' => __('models.classes.user')]), 'hasWordCounter' => true, 'name' => 'email', 'required' => true, 'model' => $userModel ?? null, 'helper' => __('validation.between.string', [ - 'attribute' => __('E-mail de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'attribute' => __('E-mail de l\':model', ['model' => __('models.classes.user')]), 'min' => 3, - 'max' => 255 + 'max' => 255, ]), 'placeholder' => __('aaaa.bbb@gmail.com'), ]) @@ -73,7 +73,7 @@
{{-- ROLE --}}
-
+
{{ __('Rôle') }}
@@ -92,24 +92,27 @@
{{-- PASSWORD --}}
-
+
{{ __('Mot de passe') }}
@include('bo.partials.inputs.varchar-password', [ 'id' => 'userPassword', - 'label' => __('Mot de passe de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('Mot de passe de l\':model', ['model' => __('models.classes.user')]), 'name' => 'password', 'hasWordCounter' => true, 'required' => false, 'model' => null, - 'helper' => __('Doît respecter certaines contraintes (8 caractères minimum, lettres, chiffres, caractères spéciaux).'), + 'helper' => __( + 'Doît respecter certaines contraintes (8 caractères minimum, lettres, chiffres, caractères spéciaux).'), ])
@include('bo.partials.inputs.varchar-password', [ 'id' => 'userPassword_confirmation', - 'label' => __('Confirmation du mot de passe de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('Confirmation du mot de passe de l\':model', [ + 'model' => __('models.classes.user'), + ]), 'name' => 'password_confirmation', 'hasWordCounter' => true, 'required' => false, @@ -122,14 +125,14 @@
{{-- STATUS --}}
-
+
{{ __('Visibilité') }}
@include('bo.partials.inputs.tinyint-boolean', [ 'id' => 'userPublished', 'name' => 'published', - 'label' => __('État de publication de l\':model', ['model' => Str::singular(__('models.classes.users'))]), + 'label' => __('État de publication de l\':model', ['model' => __('models.classes.user')]), 'helper' => __('Deux réponses possibles : oui ou non.'), 'model' => $userModel ?? null, ]) @@ -140,26 +143,26 @@
@push('scripts') - + // If we edit the password, the confirmation is required. + const passwordInput = document.getElementById('userPassword'); + const confirmPasswordInput = document.getElementById('userPassword_confirmation'); + passwordInput.addEventListener('input', () => { + if (passwordInput.value !== '') { + confirmPasswordInput.required = true; + } else { + confirmPasswordInput.required = false; + } + }) + }); + @endpush diff --git a/resources/views/bo/pages/users/index.blade.php b/resources/views/bo/pages/users/index.blade.php index a6ba0aa..d69e56e 100644 --- a/resources/views/bo/pages/users/index.blade.php +++ b/resources/views/bo/pages/users/index.blade.php @@ -1,14 +1,14 @@ @extends('bo.layout') -@section('title', __('models.classes.users')) -@section('description', __('Liste de tous les :model', ['model' => __('models.classes.users')])) +@section('title', __('models.classes.user')) +@section('description', __('Liste de tous les :model', ['model' => __('models.classes.user')])) @section('content')
@include('modules.breadcrumbs.breadcrumb-body') @can('isConceptor') + title="{{ __('crud.helpers.create_model', ['model' => __('models.classes.user')]) }}"> @endcan @@ -76,7 +76,7 @@ @else - {{ __('crud.other.no_model_found', ['model' => __('models.classes.users')]) }} + {{ __('crud.other.no_model_found', ['model' => __('models.classes.user')]) }} @endif diff --git a/resources/views/bo/pages/xml_incos/form.blade.php b/resources/views/bo/pages/xml_incos/form.blade.php index 81144d9..c10fe00 100644 --- a/resources/views/bo/pages/xml_incos/form.blade.php +++ b/resources/views/bo/pages/xml_incos/form.blade.php @@ -6,7 +6,7 @@
@include('bo.partials.inputs.int-number', [ 'id' => 'xmlIncoId', - 'label' => __('Id Arcadia de la :model', ['model' => Str::lower(__('models.classes.xml_incos'))]), + 'label' => __('Id Arcadia de la :model', ['model' => Str::lower(__('models.classes.xml_inco'))]), 'hasWordCounter' => true, 'name' => 'id', 'required' => false, @@ -26,7 +26,7 @@
@include('bo.partials.inputs.varchar', [ 'id' => 'xmlIncoName', - 'label' => __('Nom de la :model', ['model' => Str::lower(__('models.classes.xml_incos'))]), + 'label' => __('Nom de la :model', ['model' => Str::lower(__('models.classes.xml_inco'))]), 'hasWordCounter' => false, 'name' => 'name', 'required' => false, @@ -61,9 +61,9 @@
diff --git a/resources/views/bo/pages/xml_incos/index.blade.php b/resources/views/bo/pages/xml_incos/index.blade.php index 608deb4..c52725b 100644 --- a/resources/views/bo/pages/xml_incos/index.blade.php +++ b/resources/views/bo/pages/xml_incos/index.blade.php @@ -1,7 +1,9 @@ @extends('bo.layout') -@section('title', __('models.classes.xml_incos')) -@section('description', __('Liste de tous les :model', ['model' => __('models.classes.xml_incos')])) +@section('title', __('models.classes.xml_inco')) +@section('description', __('Liste de tous les :model', ['model' => __('models.classes.xml_inco')])) +@section('breadcrumb', + request()->route()->getName()) @section('content')
@@ -41,7 +43,7 @@ @else - {{ __('crud.other.no_model_found', ['model' => __('models.classes.xml_incos')]) }} + {{ __('crud.other.no_model_found', ['model' => __('models.classes.xml_inco')]) }} @endif diff --git a/resources/views/bo/pages/xml_incos/show.blade.php b/resources/views/bo/pages/xml_incos/show.blade.php index 009a871..5e32189 100644 --- a/resources/views/bo/pages/xml_incos/show.blade.php +++ b/resources/views/bo/pages/xml_incos/show.blade.php @@ -1,7 +1,7 @@ @extends('bo.layout', ['brParam' => $xmlIncoModel]) -@section('title', __('Édition d\'un :model', ['model' => Str::singular(__('models.classes.xml_incos'))])) -@section('description', __('Édition d\'un :model déjà existant', ['model' => Str::singular(__('models.classes.xml_incos'))])) +@section('title', __('Édition d\'un :model', ['model' => __('models.classes.xml_inco')])) +@section('description', __('Édition d\'un :model déjà existant', ['model' => __('models.classes.xml_inco')])) @section('breadcrumb', request()->route()->getName()) @@ -10,7 +10,7 @@
+ title="{{ __('crud.helpers.list_all', ['model' => __('models.classes.xml_inco')]) }}"> @include('modules.breadcrumbs.breadcrumb-body', ['brParam' => $xmlIncoModel]) diff --git a/resources/views/modules/breadcrumbs/breadcrumb-body.blade.php b/resources/views/modules/breadcrumbs/breadcrumb-body.blade.php index 2f17974..8b3d898 100644 --- a/resources/views/modules/breadcrumbs/breadcrumb-body.blade.php +++ b/resources/views/modules/breadcrumbs/breadcrumb-body.blade.php @@ -1,12 +1,7 @@ @hasSection('breadcrumb') -@if(Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) -{{ call_user_func_array('Breadcrumbs::render', array_merge( - [app()->view->getSections()['breadcrumb']], - !empty($brParam) ? (is_array($brParam) ? $brParam : [$brParam]) : [] -)) }} -@endif -@elseif(request()->route() != null) -@if(Breadcrumbs::exists(request()->route()->getName())) -{{ Breadcrumbs::render(request()->route()->getName()) }} -@endif + @if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) + {{ call_user_func_array('Breadcrumbs::render', array_merge([app()->view->getSections()['breadcrumb']], Arr::wrap($brParam ?? []))) }} + @endif +@elseif(Breadcrumbs::exists(request()->route()->getName())) + {{ Breadcrumbs::render(request()->route()->getName()) }} @endif diff --git a/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php b/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php index b2d8502..1614066 100644 --- a/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php +++ b/resources/views/modules/breadcrumbs/breadcrumb-head.blade.php @@ -1,9 +1,10 @@ @hasSection('breadcrumb') -@if(Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) -{{ Breadcrumbs::view('breadcrumbs::json-ld', app()->view->getSections()['breadcrumb'], $brParam ?? null) }} -@endif -@elseif(request()->route() != null) -@if (Breadcrumbs::exists(request()->route()->getName())) -{{ Breadcrumbs::view('breadcrumbs::json-ld', request()->route()->getName()) }} -@endif + @if (Breadcrumbs::exists(app()->view->getSections()['breadcrumb'])) + {{ call_user_func_array( + 'Breadcrumbs::view', + array_merge(['breadcrumbs::json-ld', app()->view->getSections()['breadcrumb']], Arr::wrap($brParam ?? [])), + ) }} + @endif +@elseif(Breadcrumbs::exists(request()->route()->getName())) + {{ Breadcrumbs::view('breadcrumbs::json-ld',request()->route()->getName()) }} @endif diff --git a/resources/views/modules/breadcrumbs/breadcrumb-layout.blade.php b/resources/views/modules/breadcrumbs/breadcrumb-layout.blade.php index 4179eff..7d07c2b 100644 --- a/resources/views/modules/breadcrumbs/breadcrumb-layout.blade.php +++ b/resources/views/modules/breadcrumbs/breadcrumb-layout.blade.php @@ -1,17 +1,17 @@ @if (count($breadcrumbs)) - + @endif diff --git a/routes/api.php b/routes/api.php index 789bc2e..b3d9bbc 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,19 +1 @@ name('apiV1.')->group(function () { - - // * PUBLIC - Route::get('/ping', [V1ApiController::class, 'ping'])->name('ping'); - - // * PRIVATE - Route::middleware('auth:api')->group(function () { - Route::prefix('inco')->name('incos.')->group(function () { - Route::get('/', [V1XmlIncoController::class, 'index'])->name('index'); - Route::get('/{xmlinco}', [V1XmlIncoController::class, 'show'])->name('show'); - }); - }); -}); diff --git a/routes/breadcrumbs-bo.php b/routes/breadcrumbs-bo.php index 01d47f0..7b780ae 100644 --- a/routes/breadcrumbs-bo.php +++ b/routes/breadcrumbs-bo.php @@ -1,22 +1,81 @@ push(trans('Users'), route('bo.users.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc'])); + $trail->push( + Str::of(trans('models.classes.user'))->plural()->ucfirst(), + route('bo.users.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) + ); }); Breadcrumbs::for('bo.users.create', function (Generator $trail) { $trail->parent('bo.users.index'); - $trail->push(trans('Create'), route('bo.users.create')); + $trail->push(Str::ucfirst(trans('crud.actions.create')), route('bo.users.create')); }); Breadcrumbs::for('bo.users.edit', function (Generator $trail, User $user) { $trail->parent('bo.users.index'); - $trail->push(trans('Edit'), route('bo.users.edit', $user->id)); + $trail->push(Str::ucfirst(trans('crud.actions.edit')), route('bo.users.edit', $user)); }); Breadcrumbs::for('bo.users.duplicate', function (Generator $trail, User $user) { $trail->parent('bo.users.index'); - $trail->push(trans('Duplicate'), route('bo.users.duplicate', $user->id)); + $trail->push(Str::ucfirst(trans('crud.actions.duplicate')), route('bo.users.duplicate', $user)); +}); + +// * BRANDS +Breadcrumbs::for('bo.brands.index', function (Generator $trail) { + $trail->push( + Str::of(trans('models.classes.arcadia_brand'))->plural()->ucfirst(), + route('bo.brands.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) + ); +}); +Breadcrumbs::for('bo.brands.show', function (Generator $trail, ArcadiaBrand $brand) { + $trail->parent('bo.brands.index'); + $trail->push(Str::ucfirst(trans('crud.actions.view')), route('bo.brands.show', $brand)); +}); + +// * SERVICES +Breadcrumbs::for('bo.services.index', function (Generator $trail) { + $trail->push( + Str::of(trans('models.classes.service'))->plural()->ucfirst(), + route('bo.services.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) + ); +}); +Breadcrumbs::for('bo.services.create', function (Generator $trail) { + $trail->parent('bo.services.index'); + $trail->push(Str::ucfirst(trans('crud.actions.create')), route('bo.services.create')); +}); +Breadcrumbs::for('bo.services.edit', function (Generator $trail, Service $service) { + $trail->parent('bo.services.index'); + $trail->push(Str::ucfirst(trans('crud.actions.edit')), route('bo.services.edit', $service)); +}); +Breadcrumbs::for('bo.services.show', function (Generator $trail, Service $service) { + $trail->parent('bo.services.index'); + $trail->push(Str::ucfirst(trans('crud.actions.view')), route('bo.services.show', $service)); +}); + +// * INCO +Breadcrumbs::for('bo.xml_incos.index', function (Generator $trail) { + $trail->push( + Str::of(trans_choice('models.classes.xml_inco', '*'))->ucfirst(), + route('bo.xml_incos.index', ['sort_col' => 'updated_at', 'sort_way' => 'desc']) + ); +}); +Breadcrumbs::for('bo.xml_incos.show', function (Generator $trail, XmlInco $xml_inco) { + $trail->parent('bo.xml_incos.index'); + $trail->push(Str::ucfirst(trans('crud.actions.view')), route('bo.xml_incos.show', $xml_inco)); +}); + +// * STATS +Breadcrumbs::for('bo.stats.view-by-service', function (Generator $trail) { + $trail->push( + Str::of(trans_choice('models.classes.service_stat', '*'))->ucfirst(), + route('bo.stats.view-by-service') + ); }); diff --git a/routes/web-bo.php b/routes/web-bo.php index 1c31720..a5a436a 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -56,9 +56,9 @@ Route::prefix('bo') ->name('generate-token-service'); // * Stats - Route::match(['get', 'post'], '/stats/brand', [StatsController::class, 'viewStatsByBrand']) - ->name('stats.viewByBrand'); + Route::match(['get', 'post'], '/stats/brand', [StatsController::class, 'viewStatsByService']) + ->name('stats.view-by-service'); Route::get('/stats/brand/csv', [StatsController::class, 'exportByBrandCsv']) - ->name('stats.viewByBrandExportCsv'); + ->name('stats.view-by-service-export-csv'); }); });