Timon/SmartCane
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

some more work

Browse source
This commit is contained in:
Martin Folkerts 2024-07-09 15:47:53 +02:00
parent f9c5b9d181
commit 3ea7eec68e
7 changed files with 81 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
laravel_app/app/Jobs/ProjectInterpolateGrowthModelJob.php
View file

@ -22,6 +22,7 @@ class ProjectInterpolateGrowthModelJob implements ShouldQueue
public function __construct(Project $project)
{
logger(__CLASS__ . __METHOD__);
$this->project = $project;
}

1
laravel_app/app/Livewire/Projects/ReportRow.php
View file

@ -14,7 +14,6 @@ class ReportRow extends Component
// 'Badge:refresh' => '$refresh',
];
#[Reactive]
public ProjectReport $report;
public MailingForm $mailingForm;

7
laravel_app/app/Models/Project.php
View file

@ -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();

1
laravel_app/resources/views/livewire/components/badge.blade.php
View file

@ -1,7 +1,6 @@
<span class="inline-flex items-center rounded-md {{ $this->getColorClasses() }} px-1.5 py-0.5 text-xs font-medium"
@if($this->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();

7
laravel_app/resources/views/livewire/projects/report-row.blade.php
View file

@ -5,9 +5,11 @@
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 lg:pl-8">{{ $report->name }}</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
<livewire:components.badge :status="$report->status" :id="$report->id" :type="'report'" wire:key="{{$report->id}}"></livewire:components.badge>
<livewire:components.badge :status="$report->status" :id="$report->id" :type="'report'"
wire:key="{{$report->id}}"></livewire:components.badge>
</td>
<td class="py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6 lg:pr-8 flex justify-end">
<x-menu>
<x-menu.button>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
@ -18,6 +20,7 @@
</x-menu.button>
<x-menu.items>
@if($report->status == \App\Enums\Status::Success->value)
<x-menu.close>
<x-menu.item wire:click="download">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
@ -118,7 +121,7 @@ class="text-center rounded-xl bg-blue-500 text-white px-6 py-2 font-semibold dis
</form>
</x-dialog.panel>
</x-dialog>
@endif
<x-dialog>
<x-dialog.open>
<x-menu.item>

BIN
r_app/Rplots.pdf
View file

Binary file not shown.

1
r_app/ci_extraction.R
View file

@ -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.")