update
parent
706d1fa061
commit
60fdf3c216
|
|
@ -129,8 +129,7 @@ class FormController implements HasMiddleware
|
||||||
{
|
{
|
||||||
// Filter by Year
|
// Filter by Year
|
||||||
$inventoryYear = request('inventoryYear') ?? date('Y');
|
$inventoryYear = request('inventoryYear') ?? date('Y');
|
||||||
$instansi = request('instansi') ?? null;
|
$instansi = request('instansi') ?? @session('agency_id');
|
||||||
dd(session());
|
|
||||||
|
|
||||||
// Retrieve data
|
// Retrieve data
|
||||||
$data = $this->data($sector, $code, $inventoryYear, $instansi);
|
$data = $this->data($sector, $code, $inventoryYear, $instansi);
|
||||||
|
|
@ -146,7 +145,7 @@ class FormController implements HasMiddleware
|
||||||
|
|
||||||
// Filter by Year
|
// Filter by Year
|
||||||
$inventoryYear = $request->input('inventoryYear') ?? date('Y');
|
$inventoryYear = $request->input('inventoryYear') ?? date('Y');
|
||||||
$instansi = request('instansi') ?? null;
|
$instansi = request('instansi') ?? @session('agency_id');
|
||||||
if ($instansi && $instansi != 'all' && $instansi != 'none') {
|
if ($instansi && $instansi != 'all' && $instansi != 'none') {
|
||||||
$agency = Agency::where('name', $instansi)->rowActive()->first();
|
$agency = Agency::where('name', $instansi)->rowActive()->first();
|
||||||
$instansi = $agency ? $agency->id : null;
|
$instansi = $agency ? $agency->id : null;
|
||||||
|
|
@ -175,7 +174,7 @@ class FormController implements HasMiddleware
|
||||||
|
|
||||||
// Filter by Year
|
// Filter by Year
|
||||||
$inventoryYear = $request->input('inventoryYear') ?? date('Y');
|
$inventoryYear = $request->input('inventoryYear') ?? date('Y');
|
||||||
$instansi = request('instansi') ?? null;
|
$instansi = request('instansi') ?? @session('agency_id');
|
||||||
if ($instansi && $instansi != 'all' && $instansi != 'none') {
|
if ($instansi && $instansi != 'all' && $instansi != 'none') {
|
||||||
$agency = Agency::where('name', $instansi)->rowActive()->first();
|
$agency = Agency::where('name', $instansi)->rowActive()->first();
|
||||||
$instansi = $agency ? $agency->id : null;
|
$instansi = $agency ? $agency->id : null;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue