diff --git a/laravel_app/app/Events/ProjectDownloadStatus.php b/laravel_app/app/Events/ProjectDownloadStatus.php index 7e7f96b..a579047 100644 --- a/laravel_app/app/Events/ProjectDownloadStatus.php +++ b/laravel_app/app/Events/ProjectDownloadStatus.php @@ -4,6 +4,7 @@ use App\Models\ProjectDownload; +use Illuminate\Broadcasting\Channel; use Illuminate\Broadcasting\PrivateChannel; use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow; use Illuminate\Queue\SerializesModels; @@ -26,8 +27,8 @@ public function __construct($projectDownload) * Get the channels the event should broadcast on. * */ - public function broadcastOn(): array + public function broadcastOn(): Channel { - return [new PrivateChannel('download.'.$this->projectDownload->id)]; + return new PrivateChannel('download.'.$this->projectDownload->id); } } diff --git a/laravel_app/app/Jobs/ProjectDownloadTiffJob.php b/laravel_app/app/Jobs/ProjectDownloadTiffJob.php index 97654fa..3a5f862 100644 --- a/laravel_app/app/Jobs/ProjectDownloadTiffJob.php +++ b/laravel_app/app/Jobs/ProjectDownloadTiffJob.php @@ -44,11 +44,13 @@ public function handle(): void ]; $process = new Process($command); - $process->setTimeout(3600); + $process->setTimeout(600); $process->run(); if (!$process->isSuccessful()) { logger('error', [$process->getErrorOutput()]); + $this->download->setStatusFailed(); + return; } logger($process->getOutput()); diff --git a/laravel_app/app/Models/ProjectDownload.php b/laravel_app/app/Models/ProjectDownload.php index ed527aa..ea3af3d 100644 --- a/laravel_app/app/Models/ProjectDownload.php +++ b/laravel_app/app/Models/ProjectDownload.php @@ -27,7 +27,7 @@ public function project(): \Illuminate\Database\Eloquent\Relations\BelongsTo protected static function booted(): void { parent::booted(); - static::updated(function (ProjectDownload $projectDownload) { + self::updated(function (ProjectDownload $projectDownload) { event(new ProjectDownloadStatus($projectDownload)); }); } diff --git a/laravel_app/resources/views/livewire/components/badge.blade.php b/laravel_app/resources/views/livewire/components/badge.blade.php index cb88905..94dfcd0 100644 --- a/laravel_app/resources/views/livewire/components/badge.blade.php +++ b/laravel_app/resources/views/livewire/components/badge.blade.php @@ -1,12 +1,12 @@ type) - x-init="Echo.private(`{{$this->type}}.@js($this->id)`).listen('Project{{ucfirst($this->type)}}Status', (e) => { + x-init="Echo.private(`{{$this->type}}.{{$this->id}}`).listen('Project{{ucfirst($this->type)}}Status', (e) => { if(e.project{{ucfirst($this->type)}}.status){ $wire.setStatus(e.project{{ucfirst($this->type)}}.status); $wire.refreshPendingMessage(); } });" - x-destroy="Echo.leaveChannel(`{{$this->type}}.@js($this->id)`);" + x-destroy="Echo.leaveChannel(`{{$this->type}}.{{$this->id}}`);" @endif > {{ $status }} diff --git a/laravel_app/resources/views/livewire/projects/tabs/download.blade.php b/laravel_app/resources/views/livewire/projects/tabs/download.blade.php index 88efc5c..2d9e1d9 100644 --- a/laravel_app/resources/views/livewire/projects/tabs/download.blade.php +++ b/laravel_app/resources/views/livewire/projects/tabs/download.blade.php @@ -1,61 +1,66 @@ -
-
-
-

Downloads

- +
+
+
+
+

Downloads

+ +
+
+ + + {{ __('Create Download') }} + +
-
- - - {{ __('Create Download') }} - -
-
-
-
-
-
- - - - - - - - - - - @foreach($downloads as $download) +
+
+
+
+
- Name - - File - - Status -
+ - - - + + + + - @endforeach - -
{{ $download->name }} - {{ $download->path }} - - - + Name + + File + + Status +
+ + + @foreach($downloads as $download) + + {{ $download->name }} + + {{ $download->path }} + + + + + + @endforeach + + -
-
-
- Results: {{ \Illuminate\Support\Number::format($downloads->total()) }}
+
+
+ Results: {{ \Illuminate\Support\Number::format($downloads->total()) }} +
- {{ $downloads->links('livewire.pagination') }} + {{ $downloads->links('livewire.pagination') }} +
diff --git a/laravel_app/resources/views/livewire/projects/tabs/mailings.blade.php b/laravel_app/resources/views/livewire/projects/tabs/mailings.blade.php index 3270f3d..93430e0 100644 --- a/laravel_app/resources/views/livewire/projects/tabs/mailings.blade.php +++ b/laravel_app/resources/views/livewire/projects/tabs/mailings.blade.php @@ -1,68 +1,75 @@
-
+
-
+

{{ __('Mailing') }}

-
+
-
+
-
-
- - - - - - - - - - - - - @foreach($mailings as $mail) +
+
+
+
- Id - @lang('Subject')@lang('Status')#@lang('Attachment') - - Edit -
+ - - - - - - + + + + + + - @endforeach - -
{{ $mail->id }}{{ $mail->subject }} - - {{ $mail->recipients()->count() }}{{ $mail->attachments()->pluck('name')->join( ', ') }} - - + Id + @lang('Subject')@lang('Status') + # + @lang('Attachment') + + Edit +
-
-
-
-
- Results: {{ \Illuminate\Support\Number::format($mailings->total()) }} + + + @foreach($mailings as $mail) + + {{ $mail->id }} + {{ $mail->subject }} + + + + {{ $mail->recipients()->count() }} + + {{ $mail->attachments()->pluck('name')->join( ', ') }} + + + + + + @endforeach + + +
+
+
+ Results: {{ \Illuminate\Support\Number::format($mailings->total()) }} +
- {{ $mailings->links('livewire.pagination') }} + {{ $mailings->links('livewire.pagination') }} +
diff --git a/laravel_app/resources/views/livewire/projects/tabs/mosaic.blade.php b/laravel_app/resources/views/livewire/projects/tabs/mosaic.blade.php index 47a205b..17777c9 100644 --- a/laravel_app/resources/views/livewire/projects/tabs/mosaic.blade.php +++ b/laravel_app/resources/views/livewire/projects/tabs/mosaic.blade.php @@ -1,7 +1,7 @@
-
+
-
+

Mosaics

diff --git a/laravel_app/resources/views/livewire/projects/tabs/report.blade.php b/laravel_app/resources/views/livewire/projects/tabs/report.blade.php index 458e042..2c24ff2 100644 --- a/laravel_app/resources/views/livewire/projects/tabs/report.blade.php +++ b/laravel_app/resources/views/livewire/projects/tabs/report.blade.php @@ -1,11 +1,11 @@ -
-
+
+
-
+

Reports

-
+
@@ -52,7 +52,6 @@ class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 lg
-
diff --git a/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php b/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php index bd4fa24..da7669a 100644 --- a/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php +++ b/laravel_app/resources/views/livewire/projects/tabs/settings.blade.php @@ -40,10 +40,9 @@ this.initMap(); this.initMapLayer(); this.addLayer(data,type); - console.log('GeoJson loaded on the map.'); + console.log('GeoJson loaded.'); }, addLayerData(data,layer){ - console.log('here'); var basicColors = ['orange', 'purple']; if(data && layer){ layer.clearLayers(); @@ -64,9 +63,11 @@ switch(type){ case 'pivot_file': this.addLayerData(layerData,window.pivotLayer); + console.log('Pivot file added.'); break; case 'span_file': this.addLayerData(layerData,window.spanLayer); + console.log('Span file added.'); break; default: break; @@ -87,8 +88,12 @@