From 36b15d4f7f898930990142161c8346596562c4ad Mon Sep 17 00:00:00 2001 From: Adam McKissock Date: Wed, 4 Sep 2024 17:43:13 +0100 Subject: [PATCH 1/5] Add support for scaling seating plans When creating larger seating plans, the default scale of the grid means that the plan ends up quite big. Added a percentile-based scale which can scale the layout grid down (or up) to help with larger layouts. --- _ide_helper_models.php | 1 + .../Admin/SeatingPlanController.php | 1 + .../Admin/SeatingPlanUpdateRequest.php | 1 + ...9_04_154938_add_scale_to_seating_plans.php | 28 +++++++++++++++++++ .../views/admin/seatingplans/_form.blade.php | 16 +++++++++++ .../views/admin/seatingplans/show.blade.php | 6 +++- resources/views/seatingplans/_plan.blade.php | 2 +- 7 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php diff --git a/_ide_helper_models.php b/_ide_helper_models.php index 00780f05..18a6b80a 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -344,6 +344,7 @@ class IdeHelperSeat {} * @property int $order * @property int $revision * @property string|null $image_url + * @property int $scale * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at * @property-read \App\Models\Event $event diff --git a/app/Http/Controllers/Admin/SeatingPlanController.php b/app/Http/Controllers/Admin/SeatingPlanController.php index 5c1cd6b4..4daa67e1 100644 --- a/app/Http/Controllers/Admin/SeatingPlanController.php +++ b/app/Http/Controllers/Admin/SeatingPlanController.php @@ -35,6 +35,7 @@ protected function updateObject(SeatingPlan $plan, Request $request) { $plan->name = $request->input('name'); $plan->image_url = $request->input('image_url'); + $plan->scale = $request->input('scale') ? $request->input('scale') : 100; $plan->save(); } diff --git a/app/Http/Requests/Admin/SeatingPlanUpdateRequest.php b/app/Http/Requests/Admin/SeatingPlanUpdateRequest.php index bfbcc2f2..305dc737 100644 --- a/app/Http/Requests/Admin/SeatingPlanUpdateRequest.php +++ b/app/Http/Requests/Admin/SeatingPlanUpdateRequest.php @@ -38,6 +38,7 @@ function (string $attribute, mixed $value, Closure $fail) { }, ], 'image_url' => 'sometimes|url:http,https|nullable', + 'scale' => 'sometimes|integer|numeric|min:25|max:200|nullable', ]; } } diff --git a/database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php b/database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php new file mode 100644 index 00000000..36f2a178 --- /dev/null +++ b/database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php @@ -0,0 +1,28 @@ +integer('scale')->default(100)->after('order'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('seating_plans', function (Blueprint $table) { + $table->dropColumn('scale'); + }); + } +}; diff --git a/resources/views/admin/seatingplans/_form.blade.php b/resources/views/admin/seatingplans/_form.blade.php index c9e0e162..93d91ee8 100644 --- a/resources/views/admin/seatingplans/_form.blade.php +++ b/resources/views/admin/seatingplans/_form.blade.php @@ -22,4 +22,20 @@ @enderror +
+ +
+
+ +
+
%
+
+
+ The scale of the seating plan grid, expressed as a percentile. Valid range is 25-200. + @error('scale') +

{{ $message }}

+ @enderror +
+
diff --git a/resources/views/admin/seatingplans/show.blade.php b/resources/views/admin/seatingplans/show.blade.php index 29e9360c..d1bc1c04 100644 --- a/resources/views/admin/seatingplans/show.blade.php +++ b/resources/views/admin/seatingplans/show.blade.php @@ -58,6 +58,10 @@ +
+
Scale
+
{{ $plan->scale }}%
+
@@ -148,7 +152,7 @@ class="btn btn-primary"> @endphp Date: Wed, 4 Sep 2024 21:04:46 +0100 Subject: [PATCH 2/5] Scale seating plan container size based on background image In some cases, if there isnt a seat placed at the bottom of the background image, it'll get cut off either to the bottom or the right. --- resources/views/admin/seatingplans/show.blade.php | 2 ++ resources/views/seatingplans/_plan.blade.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/resources/views/admin/seatingplans/show.blade.php b/resources/views/admin/seatingplans/show.blade.php index d1bc1c04..747c6b97 100644 --- a/resources/views/admin/seatingplans/show.blade.php +++ b/resources/views/admin/seatingplans/show.blade.php @@ -123,6 +123,8 @@ class="btn btn-primary">
diff --git a/resources/views/seatingplans/_plan.blade.php b/resources/views/seatingplans/_plan.blade.php index 608eb598..4151d469 100644 --- a/resources/views/seatingplans/_plan.blade.php +++ b/resources/views/seatingplans/_plan.blade.php @@ -2,6 +2,8 @@
From 8843e3a59539e3c4db8cd2c0bbca0d100ce60d9f Mon Sep 17 00:00:00 2001 From: Adam McKissock Date: Wed, 4 Sep 2024 21:23:10 +0100 Subject: [PATCH 3/5] Fixed the "fix" Last fix wasnt actually the right thing. Now looking at the actual size of the background image and setting the element to that size. --- resources/views/admin/seatingplans/show.blade.php | 6 +++--- resources/views/seatingplans/_plan.blade.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/admin/seatingplans/show.blade.php b/resources/views/admin/seatingplans/show.blade.php index 747c6b97..43309d66 100644 --- a/resources/views/admin/seatingplans/show.blade.php +++ b/resources/views/admin/seatingplans/show.blade.php @@ -123,10 +123,10 @@ class="btn btn-primary">
id] ?? [])->max('y') * 2) + 4 }}em;" @endif - min-height: {{ ($seats->max('y') * 2) + 4 }}em;" > @foreach($seats as $seat) @php diff --git a/resources/views/seatingplans/_plan.blade.php b/resources/views/seatingplans/_plan.blade.php index 4151d469..a004d930 100644 --- a/resources/views/seatingplans/_plan.blade.php +++ b/resources/views/seatingplans/_plan.blade.php @@ -2,10 +2,10 @@
id] ?? [])->max('y') * 2) + 4 }}em;" @endif - min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" > @foreach($seats[$plan->id] ?? [] as $seat) @php From 8ec8bc5107d06067ead8783dee8fa7a120a08c52 Mon Sep 17 00:00:00 2001 From: Adam McKissock Date: Wed, 4 Sep 2024 22:06:15 +0100 Subject: [PATCH 4/5] Missed a page Missed a page --- resources/views/admin/events/seats.blade.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/views/admin/events/seats.blade.php b/resources/views/admin/events/seats.blade.php index 97eeaf31..68ecb9cb 100644 --- a/resources/views/admin/events/seats.blade.php +++ b/resources/views/admin/events/seats.blade.php @@ -125,10 +125,12 @@ class="badge bg-muted text-muted-fg">{{ $clanMember->clan->name }} style="min-width: {{ collect($seats[$plan->id] ?? [])->max('x') * 2 + 4 }}em;">
image_url) + background-image:url('{{ $plan->image_url }}'); + min-height: {{ getimagesize($plan->image_url)[1] }}px" + @else + min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" + @endif > @foreach($seats[$plan->id] as $seat) @php @@ -168,7 +170,7 @@ class="badge bg-muted text-muted-fg">{{ $clanMember->clan->name }} @if($link) href="{{ $link }}" @endif - style="left: {{ $seat->x * 2 }}em; top: {{ $seat->y * 2 }}em;" + style="left: {{ $seat->x * 0.02 * $plan->scale }}em; top: {{ $seat->y * 0.02 * $plan->scale }}em; width: {{ 0.019 * $plan->scale }}em; height: {{ 0.019 * $plan->scale }}em;" data-bs-trigger="hover" data-bs-toggle="popover" data-bs-placement="right" data-bs-html="true" title="{{ $seat->description }} {{ $seat->label }}" From affe873c7b001df7fe532064550604e444ad4d07 Mon Sep 17 00:00:00 2001 From: Adam McKissock Date: Fri, 6 Sep 2024 00:05:15 +0100 Subject: [PATCH 5/5] Image dimensions calculation Change the image height and width to be calculated on seating plan property save instead of loaded on each page load. --- _ide_helper_models.php | 2 ++ .../Controllers/Admin/SeatingPlanController.php | 2 ++ ...4938_add_scale_and_sizing_to_seating_plans.php} | 14 ++++++++++++++ resources/views/admin/events/seats.blade.php | 3 ++- resources/views/admin/seatingplans/show.blade.php | 3 ++- resources/views/seatingplans/_plan.blade.php | 5 +++-- 6 files changed, 25 insertions(+), 4 deletions(-) rename database/migrations/{2024_09_04_154938_add_scale_to_seating_plans.php => 2024_09_04_154938_add_scale_and_sizing_to_seating_plans.php} (51%) diff --git a/_ide_helper_models.php b/_ide_helper_models.php index 18a6b80a..7a3839ce 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -344,6 +344,8 @@ class IdeHelperSeat {} * @property int $order * @property int $revision * @property string|null $image_url + * @property string|null $image_height + * @property string|null $image_width * @property int $scale * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at diff --git a/app/Http/Controllers/Admin/SeatingPlanController.php b/app/Http/Controllers/Admin/SeatingPlanController.php index 4daa67e1..b94dc732 100644 --- a/app/Http/Controllers/Admin/SeatingPlanController.php +++ b/app/Http/Controllers/Admin/SeatingPlanController.php @@ -35,6 +35,8 @@ protected function updateObject(SeatingPlan $plan, Request $request) { $plan->name = $request->input('name'); $plan->image_url = $request->input('image_url'); + $plan->image_height = getimagesize($request->input('image_url'))[1]; + $plan->image_width = getimagesize($request->input('image_url'))[0]; $plan->scale = $request->input('scale') ? $request->input('scale') : 100; $plan->save(); } diff --git a/database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php b/database/migrations/2024_09_04_154938_add_scale_and_sizing_to_seating_plans.php similarity index 51% rename from database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php rename to database/migrations/2024_09_04_154938_add_scale_and_sizing_to_seating_plans.php index 36f2a178..d23ad7f9 100644 --- a/database/migrations/2024_09_04_154938_add_scale_to_seating_plans.php +++ b/database/migrations/2024_09_04_154938_add_scale_and_sizing_to_seating_plans.php @@ -1,5 +1,6 @@ integer('scale')->default(100)->after('order'); + $table->integer('image_height')->after('image_url')->nullable(); + $table->integer('image_width')->after('image_height')->nullable(); }); + + foreach (SeatingPlan::all() as $plan) { + if ($plan->image_url) + { + $plan->image_height = getimagesize($plan->image_url)[1]; + $plan->image_width = getimagesize($plan->image_url)[0]; + $plan->save(); + } + } } /** @@ -23,6 +35,8 @@ public function down(): void { Schema::table('seating_plans', function (Blueprint $table) { $table->dropColumn('scale'); + $table->dropColumn('image_height'); + $table->dropColumn('image_width'); }); } }; diff --git a/resources/views/admin/events/seats.blade.php b/resources/views/admin/events/seats.blade.php index 68ecb9cb..8fb11c0c 100644 --- a/resources/views/admin/events/seats.blade.php +++ b/resources/views/admin/events/seats.blade.php @@ -127,7 +127,8 @@ class="badge bg-muted text-muted-fg">{{ $clanMember->clan->name }}
image_height}}px; + min-width: {{ $plan->image_width}}px"; @else min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" @endif diff --git a/resources/views/admin/seatingplans/show.blade.php b/resources/views/admin/seatingplans/show.blade.php index 43309d66..83ba6aa6 100644 --- a/resources/views/admin/seatingplans/show.blade.php +++ b/resources/views/admin/seatingplans/show.blade.php @@ -123,7 +123,8 @@ class="btn btn-primary">
image_height}}px; + min-width: {{ $plan->image_width}}px"; @else min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" @endif diff --git a/resources/views/seatingplans/_plan.blade.php b/resources/views/seatingplans/_plan.blade.php index a004d930..1b07f825 100644 --- a/resources/views/seatingplans/_plan.blade.php +++ b/resources/views/seatingplans/_plan.blade.php @@ -2,9 +2,10 @@
image_height}}px; + min-width: {{ $plan->image_width}}px"; @else - min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" + min-height: {{ (collect($seats[$plan->id] ?? [])->max('y') * 2) + 4 }}em;" @endif > @foreach($seats[$plan->id] ?? [] as $seat)