diff --git a/laravel_app/app/Livewire/Projects/DownloadManager.php b/laravel_app/app/Livewire/Projects/DownloadManager.php index f104c25..6eb6e6f 100644 --- a/laravel_app/app/Livewire/Projects/DownloadManager.php +++ b/laravel_app/app/Livewire/Projects/DownloadManager.php @@ -56,7 +56,6 @@ public function saveDownloads() $this->project->startDownload($date); }); - $this->showDownloadModal = false; } diff --git a/laravel_app/app/Livewire/Projects/MailingManager.php b/laravel_app/app/Livewire/Projects/MailingManager.php index d1bac0b..13525a8 100644 --- a/laravel_app/app/Livewire/Projects/MailingManager.php +++ b/laravel_app/app/Livewire/Projects/MailingManager.php @@ -55,7 +55,10 @@ private function resetFormData() public function render() { return view('livewire.projects.mailing-manager', [ - 'mailings' => $this->project->mailings()->orderBy('created_at', 'desc')->paginate(10, pageName: 'mailingPage'), + 'mailings' => $this->project + ->mailings() + ->orderBy('created_at', 'desc') + ->paginate(10, pageName: 'mailingPage'), ]); } } diff --git a/laravel_app/app/Livewire/Projects/MosaicManager.php b/laravel_app/app/Livewire/Projects/MosaicManager.php index e9b24a2..dde0300 100644 --- a/laravel_app/app/Livewire/Projects/MosaicManager.php +++ b/laravel_app/app/Livewire/Projects/MosaicManager.php @@ -5,9 +5,12 @@ use App\Jobs\ProjectMosiacGeneratorJob; use App\Models\Project; use Livewire\Component; +use Livewire\WithPagination; class MosaicManager extends Component { + use WithPagination; + public $project; public $formData = [ @@ -23,7 +26,10 @@ public function mount(Project $project) { public function render() { return view('livewire.projects.mosaic-manager', [ - 'downloads' => $this->project + 'mosaics' => $this->project->mosaics() + ->orderBy('year','desc') + ->orderBy('week', 'desc') + ->paginate(10, pageName: 'mosaicPage') ]); } diff --git a/laravel_app/app/Livewire/Projects/ReportManager.php b/laravel_app/app/Livewire/Projects/ReportManager.php index da95ff0..85ec155 100644 --- a/laravel_app/app/Livewire/Projects/ReportManager.php +++ b/laravel_app/app/Livewire/Projects/ReportManager.php @@ -7,9 +7,12 @@ use App\Models\ProjectReport; use App\Rules\AllMosaicsPresentRule; use Livewire\Component; +use Livewire\WithPagination; class ReportManager extends Component { + use WithPagination; + public $formData = []; public $project_id; @@ -30,8 +33,12 @@ public function mount(Project $project) public function render() { - $project = Project::find($this->project_id); - return view('livewire.projects.report-manager')->with(compact('project')); + $reports = Project::find($this->project_id) + ->reports() + ->orderBy('year', 'desc') + ->orderBy('week', 'desc') + ->paginate(10, pageName: 'reportPage'); + return view('livewire.projects.report-manager')->with(compact('reports')); } private function resetFormData() diff --git a/laravel_app/resources/views/livewire/projects/mosaic-manager.blade.php b/laravel_app/resources/views/livewire/projects/mosaic-manager.blade.php index 292ec99..231e561 100644 --- a/laravel_app/resources/views/livewire/projects/mosaic-manager.blade.php +++ b/laravel_app/resources/views/livewire/projects/mosaic-manager.blade.php @@ -26,6 +26,9 @@ class="block rounded-md bg-indigo-600 px-3 py-2 text-center text-sm font-semibol class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 lg:pl-8"> Name +