adjusted dates to iso dates
This commit is contained in:
parent
9b29dc4d57
commit
4db80688ca
|
|
@ -94,23 +94,12 @@ public static function handleFor(Project $project, Carbon $endDate, int $offset)
|
||||||
if (Carbon::parse($project->mail_day)->dayOfWeek < $endDate->dayOfWeek) {
|
if (Carbon::parse($project->mail_day)->dayOfWeek < $endDate->dayOfWeek) {
|
||||||
$endDate->next($project->mail_day);
|
$endDate->next($project->mail_day);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var ProjectMosaic $mosaic
|
* @var ProjectMosaic $mosaic
|
||||||
*/
|
*/
|
||||||
$mosaic = $project->mosaics()->updateOrCreate(
|
$mosaic = $project->createOrUpdateMosaic($endDate, $offset);
|
||||||
[
|
|
||||||
'name' => sprintf('Week_%s_%s', $endDate->week, $endDate->year),
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'name' => sprintf('Week_%s_%s', $endDate->week, $endDate->year),
|
|
||||||
'path' => sprintf('%s/%s/%s',
|
|
||||||
$project->download_path,
|
|
||||||
'mosaics',
|
|
||||||
sprintf('week_%s_%s.tif', $endDate->week, $endDate->year)
|
|
||||||
),
|
|
||||||
'end_date' => $endDate->format('Y-m-d'),
|
|
||||||
'offset' => $offset,
|
|
||||||
]);
|
|
||||||
return new self($mosaic);
|
return new self($mosaic);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ public function saveMosaic()
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$mosaic = $this->project->mosaics()->updateOrCreate([
|
$mosaic = $this->project->mosaics()->updateOrCreate([
|
||||||
'name' => sprintf('Week %s, %s', $this->formData['week'], $this->formData['year']),
|
'name' => sprintf('Week %s, %s', str_pad($this->formData['week'], 2, '0', STR_PAD_LEFT), $this->formData['year']),
|
||||||
'year' => $this->formData['year'],
|
'year' => $this->formData['year'],
|
||||||
'week' => $this->formData['week'],
|
'week' => $this->formData['week'],
|
||||||
], [
|
], [
|
||||||
|
|
|
||||||
|
|
@ -565,4 +565,24 @@ public function createAllMosaicsInDatabaseAndUpdateStatusForAllDownloadedImages(
|
||||||
})
|
})
|
||||||
->unique();
|
->unique();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function createOrUpdateMosaic(Carbon $date, $offset)
|
||||||
|
{
|
||||||
|
$lpadWeek = str_pad($date->isoWeek(), 2, '0', STR_PAD_LEFT);
|
||||||
|
$name = sprintf('Week_%s_%s', $lpadWeek, $date->isoWeekYear());
|
||||||
|
return $this->mosaics()->updateOrCreate(
|
||||||
|
[
|
||||||
|
'name' => $name,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'name' => $name,
|
||||||
|
'path' => sprintf('%s/%s/%s',
|
||||||
|
$this->download_path,
|
||||||
|
'mosaics',
|
||||||
|
sprintf('week_%s_%s.tif', $lpadWeek, $date->isoWeekYear())
|
||||||
|
),
|
||||||
|
'end_date' => $date->format('Y-m-d'),
|
||||||
|
'offset' => $offset,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue