diff --git a/laravel_app/app/Jobs/ProjectInterpolateGrowthModelJob.php b/laravel_app/app/Jobs/ProjectInterpolateGrowthModelJob.php index bf12427..a9bb916 100644 --- a/laravel_app/app/Jobs/ProjectInterpolateGrowthModelJob.php +++ b/laravel_app/app/Jobs/ProjectInterpolateGrowthModelJob.php @@ -22,6 +22,7 @@ class ProjectInterpolateGrowthModelJob implements ShouldQueue public function __construct(Project $project) { + logger(__CLASS__ . __METHOD__); $this->project = $project; } diff --git a/laravel_app/app/Livewire/Projects/ReportRow.php b/laravel_app/app/Livewire/Projects/ReportRow.php index 1d3f8ef..5c85321 100644 --- a/laravel_app/app/Livewire/Projects/ReportRow.php +++ b/laravel_app/app/Livewire/Projects/ReportRow.php @@ -14,7 +14,6 @@ class ReportRow extends Component // 'Badge:refresh' => '$refresh', ]; - #[Reactive] public ProjectReport $report; public MailingForm $mailingForm; diff --git a/laravel_app/app/Models/Project.php b/laravel_app/app/Models/Project.php index 33442fc..f2d04af 100644 --- a/laravel_app/app/Models/Project.php +++ b/laravel_app/app/Models/Project.php @@ -308,13 +308,14 @@ public function scheduleReport(?Carbon $endDate = null, ?int $offset = null) $endDate ??= Carbon::yesterday(); $offset ??= 7; + logger('Scheduling report for '.$endDate->format('d-m-Y').' with offset '.$offset.' days'); Bus::chain([ - Bus::batch($this->getFileDownloadsFor($endDate, $offset)), - Bus::batch($this->getMosaicsFor($endDate, $offset)), + Bus::batch($this->getFileDownloadsFor($endDate->clone(), $offset)), + Bus::batch($this->getMosaicsFor($endDate->clone(), $offset)), Bus::batch( [ new ProjectInterpolateGrowthModelJob($this), - $this->getReportFor($endDate, $offset, true) + $this->getReportFor($endDate->clone(), $offset, true) ]), ]) ->dispatch(); diff --git a/laravel_app/resources/views/livewire/components/badge.blade.php b/laravel_app/resources/views/livewire/components/badge.blade.php index 20f4b30..94dfcd0 100644 --- a/laravel_app/resources/views/livewire/components/badge.blade.php +++ b/laravel_app/resources/views/livewire/components/badge.blade.php @@ -1,7 +1,6 @@ type) x-init="Echo.private(`{{$this->type}}.{{$this->id}}`).listen('Project{{ucfirst($this->type)}}Status', (e) => { - console.log(e); if(e.project{{ucfirst($this->type)}}.status){ $wire.setStatus(e.project{{ucfirst($this->type)}}.status); $wire.refreshPendingMessage(); diff --git a/laravel_app/resources/views/livewire/projects/report-row.blade.php b/laravel_app/resources/views/livewire/projects/report-row.blade.php index 0d53d73..d4005f2 100644 --- a/laravel_app/resources/views/livewire/projects/report-row.blade.php +++ b/laravel_app/resources/views/livewire/projects/report-row.blade.php @@ -5,9 +5,11 @@ {{ $report->name }} - + + - - - - - + @if($report->status == \App\Enums\Status::Success->value) + + + + + - Download - - + Download + + - - - - - - - + + + + + + + - Create Mail - - - + Create Mail + + + - -
-

@lang('Create report email')

+ +
+

@lang('Create report email')

-
+
- - + - + - - - - - - - + + + - - -
- - + + + + + + + + @endif diff --git a/r_app/Rplots.pdf b/r_app/Rplots.pdf index 7a8f208..ad6bce6 100644 Binary files a/r_app/Rplots.pdf and b/r_app/Rplots.pdf differ diff --git a/r_app/ci_extraction.R b/r_app/ci_extraction.R index eac9719..34cd953 100644 --- a/r_app/ci_extraction.R +++ b/r_app/ci_extraction.R @@ -197,6 +197,7 @@ pivot_stats <- extracted_values %>% combined_CI_data <- readRDS(here(cumulative_CI_vals_dir,"combined_CI_data.rds")) #%>% drop_na(pivot_quadrant) +head(combined_CI_data) pivot_stats2 <- bind_rows(pivot_stats, combined_CI_data) # pivot_stats2 <- combined_CI_data print("All CI values extracted from latest image.")