some more work
This commit is contained in:
parent
f9c5b9d181
commit
3ea7eec68e
|
|
@ -22,6 +22,7 @@ class ProjectInterpolateGrowthModelJob implements ShouldQueue
|
||||||
|
|
||||||
public function __construct(Project $project)
|
public function __construct(Project $project)
|
||||||
{
|
{
|
||||||
|
logger(__CLASS__ . __METHOD__);
|
||||||
$this->project = $project;
|
$this->project = $project;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ class ReportRow extends Component
|
||||||
// 'Badge:refresh' => '$refresh',
|
// 'Badge:refresh' => '$refresh',
|
||||||
];
|
];
|
||||||
|
|
||||||
#[Reactive]
|
|
||||||
public ProjectReport $report;
|
public ProjectReport $report;
|
||||||
|
|
||||||
public MailingForm $mailingForm;
|
public MailingForm $mailingForm;
|
||||||
|
|
|
||||||
|
|
@ -308,13 +308,14 @@ public function scheduleReport(?Carbon $endDate = null, ?int $offset = null)
|
||||||
|
|
||||||
$endDate ??= Carbon::yesterday();
|
$endDate ??= Carbon::yesterday();
|
||||||
$offset ??= 7;
|
$offset ??= 7;
|
||||||
|
logger('Scheduling report for '.$endDate->format('d-m-Y').' with offset '.$offset.' days');
|
||||||
Bus::chain([
|
Bus::chain([
|
||||||
Bus::batch($this->getFileDownloadsFor($endDate, $offset)),
|
Bus::batch($this->getFileDownloadsFor($endDate->clone(), $offset)),
|
||||||
Bus::batch($this->getMosaicsFor($endDate, $offset)),
|
Bus::batch($this->getMosaicsFor($endDate->clone(), $offset)),
|
||||||
Bus::batch(
|
Bus::batch(
|
||||||
[
|
[
|
||||||
new ProjectInterpolateGrowthModelJob($this),
|
new ProjectInterpolateGrowthModelJob($this),
|
||||||
$this->getReportFor($endDate, $offset, true)
|
$this->getReportFor($endDate->clone(), $offset, true)
|
||||||
]),
|
]),
|
||||||
])
|
])
|
||||||
->dispatch();
|
->dispatch();
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<span class="inline-flex items-center rounded-md {{ $this->getColorClasses() }} px-1.5 py-0.5 text-xs font-medium"
|
<span class="inline-flex items-center rounded-md {{ $this->getColorClasses() }} px-1.5 py-0.5 text-xs font-medium"
|
||||||
@if($this->type)
|
@if($this->type)
|
||||||
x-init="Echo.private(`{{$this->type}}.{{$this->id}}`).listen('Project{{ucfirst($this->type)}}Status', (e) => {
|
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){
|
if(e.project{{ucfirst($this->type)}}.status){
|
||||||
$wire.setStatus(e.project{{ucfirst($this->type)}}.status);
|
$wire.setStatus(e.project{{ucfirst($this->type)}}.status);
|
||||||
$wire.refreshPendingMessage();
|
$wire.refreshPendingMessage();
|
||||||
|
|
|
||||||
|
|
@ -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 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">
|
<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>
|
||||||
<td class="py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6 lg:pr-8 flex justify-end">
|
<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>
|
||||||
<x-menu.button>
|
<x-menu.button>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
|
<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.button>
|
||||||
|
|
||||||
<x-menu.items>
|
<x-menu.items>
|
||||||
|
@if($report->status == \App\Enums\Status::Success->value)
|
||||||
<x-menu.close>
|
<x-menu.close>
|
||||||
<x-menu.item wire:click="download">
|
<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"
|
<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>
|
</form>
|
||||||
</x-dialog.panel>
|
</x-dialog.panel>
|
||||||
</x-dialog>
|
</x-dialog>
|
||||||
|
@endif
|
||||||
<x-dialog>
|
<x-dialog>
|
||||||
<x-dialog.open>
|
<x-dialog.open>
|
||||||
<x-menu.item>
|
<x-menu.item>
|
||||||
|
|
|
||||||
BIN
r_app/Rplots.pdf
BIN
r_app/Rplots.pdf
Binary file not shown.
|
|
@ -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)
|
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 <- bind_rows(pivot_stats, combined_CI_data)
|
||||||
# pivot_stats2 <- combined_CI_data
|
# pivot_stats2 <- combined_CI_data
|
||||||
print("All CI values extracted from latest image.")
|
print("All CI values extracted from latest image.")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue