From 4dfedb75b37cccf6871d5683d806ee735eb2743b Mon Sep 17 00:00:00 2001 From: guillaume91 Date: Thu, 23 May 2024 11:21:12 +0200 Subject: [PATCH] [fix] Bug with bounding boxes in database, DBseeder and dropzone. --- .../app/Jobs/ProjectDownloadTiffJob.php | 1 - .../app/Livewire/Projects/DownloadManager.php | 3 +- ...24_123510_create_project_reports_table.php | 2 +- ..._30_124700_create_password_reset_table.php | 2 +- .../database/seeders/DatabaseSeeder.php | 53 ------------------- laravel_app/package-lock.json | 6 +-- .../download-manager-placeholder.blade.php | 2 +- .../projects/download-manager.blade.php | 2 +- .../livewire/dropzone.blade.php | 17 ++++-- 9 files changed, 22 insertions(+), 66 deletions(-) diff --git a/laravel_app/app/Jobs/ProjectDownloadTiffJob.php b/laravel_app/app/Jobs/ProjectDownloadTiffJob.php index 20ffe36..2dd3183 100644 --- a/laravel_app/app/Jobs/ProjectDownloadTiffJob.php +++ b/laravel_app/app/Jobs/ProjectDownloadTiffJob.php @@ -2,7 +2,6 @@ namespace App\Jobs; -use App\Enums\Status; use App\Models\Project; use App\Models\ProjectDownload; use Illuminate\Bus\Batchable; diff --git a/laravel_app/app/Livewire/Projects/DownloadManager.php b/laravel_app/app/Livewire/Projects/DownloadManager.php index 574c099..40a8b0d 100644 --- a/laravel_app/app/Livewire/Projects/DownloadManager.php +++ b/laravel_app/app/Livewire/Projects/DownloadManager.php @@ -16,7 +16,7 @@ class DownloadManager extends Component { use WithPagination; - public $project; + public Project $project; public $formData; @@ -88,6 +88,7 @@ public function placeholder() public function render() { + $query = $this->project->downloads()->orderBy('name', 'desc'); $query = $this->applySearch($query); $downloads = $query->paginate(10, pageName: 'downloadPage'); diff --git a/laravel_app/database/migrations/2023_10_24_123510_create_project_reports_table.php b/laravel_app/database/migrations/2023_10_24_123510_create_project_reports_table.php index 8085fe8..226dd1a 100644 --- a/laravel_app/database/migrations/2023_10_24_123510_create_project_reports_table.php +++ b/laravel_app/database/migrations/2023_10_24_123510_create_project_reports_table.php @@ -28,6 +28,6 @@ public function up(): void */ public function down(): void { - Schema::dropIfExists('reports'); + Schema::dropIfExists('project_reports'); } }; diff --git a/laravel_app/database/migrations/2024_01_30_124700_create_password_reset_table.php b/laravel_app/database/migrations/2024_01_30_124700_create_password_reset_table.php index a6abe20..8014c98 100644 --- a/laravel_app/database/migrations/2024_01_30_124700_create_password_reset_table.php +++ b/laravel_app/database/migrations/2024_01_30_124700_create_password_reset_table.php @@ -23,6 +23,6 @@ public function up(): void */ public function down(): void { - Schema::dropIfExists('password_resets'); + Schema::dropIfExists('password_reset_tokens'); } }; diff --git a/laravel_app/database/seeders/DatabaseSeeder.php b/laravel_app/database/seeders/DatabaseSeeder.php index 94ac982..a041397 100644 --- a/laravel_app/database/seeders/DatabaseSeeder.php +++ b/laravel_app/database/seeders/DatabaseSeeder.php @@ -45,27 +45,6 @@ private function createChembaProject() 'updated_at' => '2021-01-01 00:00:00', ]); - $chembaProject->boundingBoxes()->createMany([ - [ - 'name' => 'Chemba West', - 'top_left_latitude' => 34.9460, - 'top_left_longitude' => -17.3516, - 'bottom_right_latitude' => 34.9380, - 'bottom_right_longitude' => -17.2917, - 'created_at' => '2021-01-01 00:00:00', - 'updated_at' => '2021-01-01 00:00:00', - ], - [ - 'name' => 'Chemba East', - 'top_left_latitude' => 34.8830, - 'top_left_longitude' => -17.3516, - 'bottom_right_latitude' => 34.9380, - 'bottom_right_longitude' => -17.2917, - 'created_at' => '2021-01-01 00:00:00', - 'updated_at' => '2021-01-01 00:00:00', - ], - ]); - foreach ($chembaProject->getMergedTiffList() as $mergedTiff) { $download = $chembaProject->downloads()->create([ 'name' => basename($mergedTiff), @@ -151,27 +130,6 @@ private function createXinavaneProject() 'updated_at' => '2021-01-01 00:00:00', ]); - $project->boundingBoxes()->createMany([ - [ - 'name' => 'Xinavane West', - 'top_left_latitude' => 32.6213, - 'top_left_longitude' => -25.0647, - 'bottom_right_latitude' => 32.6284, - 'bottom_right_longitude' => -25.0570, - 'created_at' => '2021-01-01 00:00:00', - 'updated_at' => '2021-01-01 00:00:00', - ], - [ - 'name' => 'Xinavane East', - 'top_left_latitude' => 32.6790, - 'top_left_longitude' => -25.0333, - 'bottom_right_latitude' => 32.7453, - 'bottom_right_longitude' => -25.0235, - 'created_at' => '2021-01-01 00:00:00', - 'updated_at' => '2021-01-01 00:00:00', - ], - ]); - $project->emailRecipients()->createMany([ [ 'name' => 'Martin Folkerts', @@ -245,17 +203,6 @@ private function createKakiraProject() 'updated_at' => '2021-01-01 00:00:00', ]); - $project->boundingBoxes()->createMany([ - [ - 'name' => 'kakira_demo', - 'top_left_latitude' => 33.289993827426535, - 'top_left_longitude' => 0.491981861534345, - 'bottom_right_latitude' => 33.32572075441914, - 'bottom_right_longitude' => 0.5144195937114393, - 'created_at' => '2021-01-01 00:00:00', - 'updated_at' => '2021-01-01 00:00:00', - ], - ]); $project->emailRecipients()->createMany([ [ diff --git a/laravel_app/package-lock.json b/laravel_app/package-lock.json index 1d81b47..0215a03 100644 --- a/laravel_app/package-lock.json +++ b/laravel_app/package-lock.json @@ -728,9 +728,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001547", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz", - "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==", + "version": "1.0.30001621", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz", + "integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==", "dev": true, "funding": [ { diff --git a/laravel_app/resources/views/livewire/projects/download-manager-placeholder.blade.php b/laravel_app/resources/views/livewire/projects/download-manager-placeholder.blade.php index 0f6bd93..0518f60 100644 --- a/laravel_app/resources/views/livewire/projects/download-manager-placeholder.blade.php +++ b/laravel_app/resources/views/livewire/projects/download-manager-placeholder.blade.php @@ -27,7 +27,7 @@ class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 lg Name - Year-Week + File diff --git a/laravel_app/resources/views/livewire/projects/download-manager.blade.php b/laravel_app/resources/views/livewire/projects/download-manager.blade.php index 98de5c8..33c35e6 100644 --- a/laravel_app/resources/views/livewire/projects/download-manager.blade.php +++ b/laravel_app/resources/views/livewire/projects/download-manager.blade.php @@ -66,7 +66,7 @@ class="px-3 py-3.5 text-right pr-4 sm:pr-8 lg:pr-8 text-sm font-semibold text-gr {{ $downloads->links('livewire.pagination') }} -
+{{--
--}} diff --git a/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php b/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php index 14f9a80..4a86158 100644 --- a/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php +++ b/laravel_app/resources/views/vendor/livewire-dropzone/livewire/dropzone.blade.php @@ -5,7 +5,7 @@ uuid: @js($uuid), multiple: @js($multiple), })" - @dragenter.prevent.document="onDragenter($event)" + @dragenter.prevent="onDragenter($event)" @dragleave.prevent="onDragleave($event)" @dragover.prevent="onDragover($event)" @drop.prevent="onDrop" @@ -157,13 +157,22 @@ class="hidden" multiple ? _this.uploadMultiple(...args) : _this.upload(...args) }, onDragenter() { - this.isDragging = true + if(!this.isDragging){ + this.isDragging = true; + console.log('ondragenter:',uuid,'->',this.isDragging); + } }, onDragleave() { - this.isDragging = false + if(this.isDragging) { + this.isDragging = false; + console.log('ondragleave: ',uuid,'->', this.isDragging); + } }, onDragover() { - this.isDragging = true + if(!this.isDragging) { + this.isDragging = true; + console.log('ondragover: ',uuid,'->',this.isDragging); + } }, removeUpload(tmpFilename) { // Dispatch an event to remove the temporarily uploaded file