Update
parent
a6eb77838e
commit
666cd6fa88
|
|
@ -69,7 +69,9 @@ class ChartController extends Controller
|
|||
*/
|
||||
public function riceShrimpWeeklyPrice(Request $request)
|
||||
{
|
||||
$weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
|
||||
$now = now();
|
||||
|
||||
$weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'id');
|
||||
|
||||
$years = RiceShrimpWeeklyPrice::select('year')
|
||||
->groupBy('year')
|
||||
|
|
@ -98,6 +100,7 @@ class ChartController extends Controller
|
|||
});
|
||||
|
||||
return [
|
||||
'c_week' => ($now->month - 1) * 4 + ($now->weekOfMonth > 4 ? 4 : $now->weekOfMonth),
|
||||
'x_axis' => $weeks->values(),
|
||||
'series' => $series->sortKeys()->values()->all(),
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in New Issue