Correction Cost indicator R$/MWh.
This commit is contained in:
parent
d8a399ede1
commit
ae15694ca6
@ -21,19 +21,20 @@ class Helpers
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function orderByDate($result, $format ='M/Y', $field = 'mes'): array
|
public static function orderByDate($result, $old_format = 'Y-m-d', $format ='M/Y', $field = 'mes'): array
|
||||||
{
|
{
|
||||||
return collect($result)
|
return collect($result)
|
||||||
->transform(fn($value) => Arr::set(
|
->transform(fn($value) => Arr::set(
|
||||||
$value,
|
$value,
|
||||||
$field,
|
$field,
|
||||||
Carbon::createFromFormat('ym', $value[$field])->locale('pt-BR')
|
Carbon::createFromFormat($old_format, $value[$field])->locale('pt-BR')
|
||||||
->translatedFormat($format)))
|
->translatedFormat($format)))
|
||||||
->all();
|
->all();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function checkDate($value): array
|
public static function checkDate($value): array
|
||||||
{
|
{
|
||||||
|
|
||||||
$year = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
|
$year = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
|
||||||
->explode('-')->offsetGet(0)))->unique()->toArray();
|
->explode('-')->offsetGet(0)))->unique()->toArray();
|
||||||
$month = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
|
$month = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes'])
|
||||||
|
|||||||
@ -7,6 +7,7 @@ namespace App\Repositories\Economy;
|
|||||||
use App\Helpers\Helpers;
|
use App\Helpers\Helpers;
|
||||||
use App\Models\Economy;
|
use App\Models\Economy;
|
||||||
use App\Repositories\AbstractRepository;
|
use App\Repositories\AbstractRepository;
|
||||||
|
use Carbon\Carbon;
|
||||||
use DateInterval;
|
use DateInterval;
|
||||||
use DatePeriod;
|
use DatePeriod;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
@ -152,6 +153,9 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
|
|||||||
->orderBy(DB::raw("mes, dad_estimado"))
|
->orderBy(DB::raw("mes, dad_estimado"))
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
return Helpers::checkDate($value);
|
$result = Helpers::checkDate($value);
|
||||||
|
|
||||||
|
return Helpers::orderByDate($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user