From 8a53681feae7d5e19528683214904ed75bc5ebf1 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Wed, 7 Jan 2026 13:32:12 +0700 Subject: [PATCH] update --- app/Exports/GcomCrfExport.php | 6 +- app/Exports/GpcOutputExport.php | 2 +- .../Controllers/Reports/GcomCrfController.php | 9 +- .../Reports/GpcOutputController.php | 7 +- app/ModelsOld/AR.php | 15 - app/ModelsOld/EF.php | 23 - app/ModelsOld/FileDataAktivitas.php | 19 - app/ModelsOld/FilePengumuman.php | 15 - app/ModelsOld/GHG.php | 15 - app/ModelsOld/GWP.php | 23 - app/ModelsOld/Kategori.php | 15 - app/ModelsOld/Log.php | 24 - app/ModelsOld/Master/AccessMenu.php | 14 - app/ModelsOld/Master/Activity.php | 15 - app/ModelsOld/Master/Agency.php | 12 - app/ModelsOld/Master/Group.php | 14 - app/ModelsOld/Master/Menu.php | 206 ------ app/ModelsOld/Master/Sektor.php | 15 - app/ModelsOld/Master/SubSektor.php | 19 - app/ModelsOld/SumberDataEF.php | 12 - app/ModelsOld/Unit.php | 19 - app/ModelsOld/UnitKonversi.php | 15 - app/ModelsOld/User.php | 58 -- .../reports/gcom-crf/index-backup.blade.php | 695 ------------------ .../modules/reports/gcom-crf/index.blade.php | 33 +- .../modules/reports/gcom-crf/note.blade.php | 5 +- .../modules/reports/gcom-crf/report.blade.php | 2 +- .../reports/gpc-output/index.blade.php | 34 +- .../reports/gpc-output/report.blade.php | 2 +- routes/modules/modules.php | 8 +- 30 files changed, 41 insertions(+), 1310 deletions(-) delete mode 100644 app/ModelsOld/AR.php delete mode 100644 app/ModelsOld/EF.php delete mode 100644 app/ModelsOld/FileDataAktivitas.php delete mode 100644 app/ModelsOld/FilePengumuman.php delete mode 100644 app/ModelsOld/GHG.php delete mode 100644 app/ModelsOld/GWP.php delete mode 100644 app/ModelsOld/Kategori.php delete mode 100644 app/ModelsOld/Log.php delete mode 100644 app/ModelsOld/Master/AccessMenu.php delete mode 100644 app/ModelsOld/Master/Activity.php delete mode 100644 app/ModelsOld/Master/Agency.php delete mode 100644 app/ModelsOld/Master/Group.php delete mode 100644 app/ModelsOld/Master/Menu.php delete mode 100644 app/ModelsOld/Master/Sektor.php delete mode 100644 app/ModelsOld/Master/SubSektor.php delete mode 100644 app/ModelsOld/SumberDataEF.php delete mode 100644 app/ModelsOld/Unit.php delete mode 100644 app/ModelsOld/UnitKonversi.php delete mode 100644 app/ModelsOld/User.php delete mode 100644 resources/views/modules/reports/gcom-crf/index-backup.blade.php diff --git a/app/Exports/GcomCrfExport.php b/app/Exports/GcomCrfExport.php index 3c4e2dd..73f2eac 100644 --- a/app/Exports/GcomCrfExport.php +++ b/app/Exports/GcomCrfExport.php @@ -11,6 +11,10 @@ use PhpOffice\PhpSpreadsheet\Style\Alignment; class GcomCrfExport implements FromView, WithStyles { + protected $title = 'GCOM CRF'; + protected $template = 'modules.reports.gcom-crf'; + protected $route = 'modules.laporan.gcom'; + protected $inventoryYear, $activityYear, $gpcData, $gpc; public function __construct($inventoryYear, $activityYear, $gpcData, $gpc) @@ -23,7 +27,7 @@ class GcomCrfExport implements FromView, WithStyles public function view(): View { - return view('reports.gcom-crf.report', [ + return view($this->template.'.report', [ 'inventoryYear' => $this->inventoryYear, 'activityYear' => $this->activityYear, 'gpcData' => $this->gpcData, diff --git a/app/Exports/GpcOutputExport.php b/app/Exports/GpcOutputExport.php index ab762ba..561b66a 100644 --- a/app/Exports/GpcOutputExport.php +++ b/app/Exports/GpcOutputExport.php @@ -22,7 +22,7 @@ class GpcOutputExport implements FromView, WithStyles public function view(): View { - return view('reports.gpc-output.report', [ + return view('modules.reports.gpc-output.report', [ 'inventoryYear' => $this->inventoryYear, 'gpcOutputs' => $this->gpcOutputs, 'gpcOutputRList' => $this->gpcOutputRList, diff --git a/app/Http/Controllers/Reports/GcomCrfController.php b/app/Http/Controllers/Reports/GcomCrfController.php index 15492e7..efb31bd 100644 --- a/app/Http/Controllers/Reports/GcomCrfController.php +++ b/app/Http/Controllers/Reports/GcomCrfController.php @@ -13,6 +13,9 @@ use Maatwebsite\Excel\Facades\Excel; class GcomCrfController extends Controller { + protected $title = 'GCOM CRF'; + protected $template = 'modules.reports.gcom-crf'; + protected $route = 'modules.laporan.gcom'; protected $service; public function __construct(GcomCrfService $service) @@ -33,12 +36,12 @@ class GcomCrfController extends Controller $gpcData = GcomCrfData::getAllData(); - return view('reports.gcom-crf.index', [ + return view($this->template.'.index', [ + 'title' => $this->title, + 'route' => $this->route, 'inventoryYear' => $inventoryYear ?? date('Y'), 'activityYear' => $activityYear ?? date('Y') - 1, - 'gpcData' => $gpcData, - 'gpcOutput' => $gpcOutput, 'gpc' => $gpc, ]); diff --git a/app/Http/Controllers/Reports/GpcOutputController.php b/app/Http/Controllers/Reports/GpcOutputController.php index ad3d002..5e9e6d2 100644 --- a/app/Http/Controllers/Reports/GpcOutputController.php +++ b/app/Http/Controllers/Reports/GpcOutputController.php @@ -12,6 +12,9 @@ use Illuminate\Http\Request; class GpcOutputController extends Controller { + protected $title = 'GPC Output'; + protected $template = 'modules.reports.gpc-output'; + protected $route = 'modules.laporan.gpc'; protected $service; public function __construct(GpcOutputService $service) @@ -34,7 +37,9 @@ class GpcOutputController extends Controller $gpcOutputRList[] = $gpcOutput->getAllColumnsWithReference(); } - return view('reports.gpc-output.index', [ + return view($this->template.'.index', [ + 'title' => $this->title, + 'route' => $this->route, 'inventoryYear' => $inventoryYear, 'gpcOutputs' => $gpcOutputs, 'gpcOutputRList' => $gpcOutputRList, diff --git a/app/ModelsOld/AR.php b/app/ModelsOld/AR.php deleted file mode 100644 index 5f8d125..0000000 --- a/app/ModelsOld/AR.php +++ /dev/null @@ -1,15 +0,0 @@ -belongsTo(\App\Models\Master\Activity::class,'ms_activity_id'); - } - - function sumberdata(){ - return $this->belongsTo(\App\Models\SumberDataEF::class,'sumberdata_ef_id'); - } -} diff --git a/app/ModelsOld/FileDataAktivitas.php b/app/ModelsOld/FileDataAktivitas.php deleted file mode 100644 index 3023c15..0000000 --- a/app/ModelsOld/FileDataAktivitas.php +++ /dev/null @@ -1,19 +0,0 @@ -belongsTo(\App\Models\Master\Sektor::class,'ms_sektor_id'); - } -} diff --git a/app/ModelsOld/FilePengumuman.php b/app/ModelsOld/FilePengumuman.php deleted file mode 100644 index f4f2e72..0000000 --- a/app/ModelsOld/FilePengumuman.php +++ /dev/null @@ -1,15 +0,0 @@ -belongsTo(\App\Models\GHG::class,'ghg_id'); - } - - function ar() { - return $this->belongsTo(\App\Models\AR::class,'ar_id'); - } -} diff --git a/app/ModelsOld/Kategori.php b/app/ModelsOld/Kategori.php deleted file mode 100644 index 778dd9c..0000000 --- a/app/ModelsOld/Kategori.php +++ /dev/null @@ -1,15 +0,0 @@ -belongsTo('App\Models\User','id','user_id'); - } -} diff --git a/app/ModelsOld/Master/AccessMenu.php b/app/ModelsOld/Master/AccessMenu.php deleted file mode 100644 index 338ed0a..0000000 --- a/app/ModelsOld/Master/AccessMenu.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(Menu::class,'parent_id','id'); - } - - public static function coreMenus($type, array $status = [1]): mixed - { - return Menu::where('parent_id', '=', 0) - ->where('menu_type', '=', $type) - ->whereIn('status', $status); - } - - public static function coreMenusByParent($id, array $status = [1]): mixed - { - return Menu::where('parent_id', '=', $id) - ->whereIn('status', $status); - } - - public static function getMenuByParentPosition($id, $type, array $active = [1], int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('parent_id', '=', $id) - ->where('menu_type', '=', $type) - ->whereIn('status', $active) - ->union(Menu::coreMenus($type, $active)) - ->orderBy('ordering') - ->get(); - } - - /** - * @author alex.gz - * @created 08/12/2023 12:53 - * - * @param $type - * @param int|null $year - * - * @return mixed - */ - public static function getParentByType($type, int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('parent_id', '=', 0) - ->where('menu_type', '=', $type) - ->union(Menu::coreMenus($type)) - ->orderBy('ordering') - ->get(); - } - - /** - * @author alex.gz - * @created 08/12/2023 18:07 - * - * @param $type - * @param int|null $year - * - * @return mixed - */ - public static function getMenuByYear($type, int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('parent_id', '=', 0) - ->where('menu_type', '=', $type) - ->where('status', '=', true) - ->orderBy('ordering') - ->get(); - } - - /** - * @author alex.gz - * @created 08/12/2023 12:54 - * - * @param $type - * @param int|null $year - * - * @return mixed - */ - public static function getParentByTypeStatus($type, int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('parent_id', '=', 0) - ->where('menu_type', '=', $type) - ->where('status', '=', true) - ->union(Menu::coreMenus($type)) - ->orderBy('ordering') - ->get(); - } - - /** - * @author alex.gz - * @created 08/12/2023 12:54 - * - * @param $id - * @param array $active - * @param int|null $year - * - * @return mixed - */ - public static function getMenuByParent($id, array $active = [1], int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('parent_id', '=', $id) - ->union(Menu::coreMenusByParent($id, $active)) - ->whereIn('status', $active) - ->orderBy('ordering') - ->get(); - } - - /** - * @author alex.gz - * @created 08/12/2023 14:54 - * - * @param int $year - * - * @return mixed - */ - public static function countMenuByYear(int $year): mixed - { - $model = Menu::where('status', '=', true); - return $model->count(); - } - - /** - * @author alex.gz - * @created 08/12/2023 12:55 - * - * @param $id - * @param int|null $year - * - * @return mixed - */ - public static function getActiveById($id, int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('id', '=', $id) - ->where('status', '=', true) - ->first(); - } - - /** - * @author alex.gz - * @created 08/12/2023 12:55 - * - * @param $type - * @param int|null $year - * - * @return mixed - */ - public static function getActiveByPosition($type, int $year = null): mixed - { - if ($year) { - $currYear = $year; - } else { - $currYear = date('Y'); - } - - return Menu::where('menu_type', '=', $type) - ->where('status', '=', true) - ->union(Menu::coreMenus($type)) - ->orderBy('ordering') - ->get(); - } -} diff --git a/app/ModelsOld/Master/Sektor.php b/app/ModelsOld/Master/Sektor.php deleted file mode 100644 index b15603f..0000000 --- a/app/ModelsOld/Master/Sektor.php +++ /dev/null @@ -1,15 +0,0 @@ -belongsTo(\App\Models\Master\Sektor::class,'ms_sektor_id'); - } -} diff --git a/app/ModelsOld/SumberDataEF.php b/app/ModelsOld/SumberDataEF.php deleted file mode 100644 index 27ab6de..0000000 --- a/app/ModelsOld/SumberDataEF.php +++ /dev/null @@ -1,12 +0,0 @@ -belongsTo(\App\Models\Kategori::class,'kategori_id','KategoriId'); - } -} diff --git a/app/ModelsOld/UnitKonversi.php b/app/ModelsOld/UnitKonversi.php deleted file mode 100644 index 21972b7..0000000 --- a/app/ModelsOld/UnitKonversi.php +++ /dev/null @@ -1,15 +0,0 @@ - */ - use HasFactory, Notifiable; - - /** - * The attributes that are mass assignable. - * - * @var list - */ - protected $fillable = [ - 'name', - 'email', - 'password', - ]; - - /** - * The attributes that should be hidden for serialization. - * - * @var list - */ - protected $hidden = [ - 'password', - 'remember_token', - ]; - - /** - * Get the attributes that should be cast. - * - * @return array - */ - protected function casts(): array - { - return [ - 'email_verified_at' => 'datetime', - 'password' => 'hashed', - ]; - } - - public function group() - { - return $this->belongsTo(\App\Models\Master\Group::class,'ms_group_id','MsGroupId'); - } - - public function instansi() - { - return $this->belongsTo(\App\Models\InstansiUser::class,'id','user_id'); - } -} diff --git a/resources/views/modules/reports/gcom-crf/index-backup.blade.php b/resources/views/modules/reports/gcom-crf/index-backup.blade.php deleted file mode 100644 index 2a1b99b..0000000 --- a/resources/views/modules/reports/gcom-crf/index-backup.blade.php +++ /dev/null @@ -1,695 +0,0 @@ -@extends('layouts.master') - -@section('title') - GCOM CRF -@endsection - -@section('content') -
-
-
GCOM CRF
-
-
- @if ($errors->has('error')) -
- {{ $errors->first('error') }} -
- @endif - - @if (session('success')) -
- {{ session('success') }} -
- @endif - -
-
-
- -
-
- -
-
-
- -
-
-
-
-
- - @if ($gpcOutput) -
- - - - - - - - - - - - - - - - - - - - - - - @if ($gpcOutput['i_1_1'] == null || $gpcOutput['i_1_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_1_2'] == null || $gpcOutput['i_1_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_1_3'] == null || $gpcOutput['i_1_3'] == 0) - - - @else - - - @endif - - - - - @if ( - ($gpcOutput['i_2_1'] == null && $gpcOutput['i_6_1'] == null) || - ($gpcOutput['i_2_1'] == 0 && $gpcOutput['i_6_1'] == 0)) - - - @else - @php - $energyCommercialDirect = - ($gpcOutput['i_2_1'] ?? 0) + ($gpcOutput['i_6_1'] ?? 0); - @endphp - - - @endif - - @if ( - ($gpcOutput['i_2_2'] == null && $gpcOutput['i_6_2'] == null) || - ($gpcOutput['i_2_2'] == 0 && $gpcOutput['i_6_2'] == 0)) - - - @else - @php - $energyCommercialIndirect = - ($gpcOutput['i_2_2'] ?? 0) + ($gpcOutput['i_6_2'] ?? 0); - @endphp - - - @endif - - @if ( - ($gpcOutput['i_2_3'] == null && $gpcOutput['i_6_3'] == null) || - ($gpcOutput['i_2_3'] == 0 && $gpcOutput['i_6_3'] == 0)) - - - @else - @php - $energyCommercialOutside = - ($gpcOutput['i_2_3'] ?? 0) + ($gpcOutput['i_6_3'] ?? 0); - @endphp - - - @endif - - - - - - - - - - - - - - - @if ($gpcOutput['i_3_1'] == null || $gpcOutput['i_3_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_3_2'] == null || $gpcOutput['i_3_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_3_3'] == null || $gpcOutput['i_3_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['i_5_1'] == null || $gpcOutput['i_5_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_5_2'] == null || $gpcOutput['i_5_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['i_5_3'] == null || $gpcOutput['i_5_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['i_8_1'] == null || $gpcOutput['i_8_1'] == 0) - - - @else - - - @endif - - - - - - @if ($gpcOutput['vi_1'] == null || $gpcOutput['vi_1'] == 0) - - - @else - - - @endif - - - - @php - $totalEnergyDirect = ($gpcOutput['i_1_1'] ?? 0) + ($gpcOutput['i_2_1'] ?? 0) + ($gpcOutput['i_6_1'] ?? 0) + ($gpcOutput['i_3_1'] ?? 0) + ($gpcOutput['i_5_1'] ?? 0) + ($gpcOutput['i_8_1'] ?? 0); - $totalEnergyIndirect = ($gpcOutput['i_1_2'] ?? 0) + ($gpcOutput['i_2_2'] ?? 0) + ($gpcOutput['i_6_2'] ?? 0) + ($gpcOutput['i_3_2'] ?? 0) + ($gpcOutput['i_5_2'] ?? 0); - $totalEnergyOutside = ($gpcOutput['i_1_3'] ?? 0) + ($gpcOutput['i_2_3'] ?? 0) + ($gpcOutput['i_6_3'] ?? 0) + ($gpcOutput['i_3_3'] ?? 0) + ($gpcOutput['i_5_3'] ?? 0); - @endphp - - @if ($totalEnergyDirect == 0) - - - {{-- --}} - @else - - - @endif - - @if ($totalEnergyIndirect == 0) - - - {{-- --}} - @else - - - @endif - - @if ($totalEnergyOutside == 0) - - - @else - - - @endif - - - - - - - @if ($gpcOutput['ii_1_1'] == null || $gpcOutput['ii_1_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_1_2'] == null || $gpcOutput['ii_1_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_1_3'] == null || $gpcOutput['ii_1_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['ii_2_1'] == null || $gpcOutput['ii_2_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_2_2'] == null || $gpcOutput['ii_2_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_2_3'] == null || $gpcOutput['ii_2_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['ii_3_1'] == null || $gpcOutput['ii_3_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_3_2'] == null || $gpcOutput['ii_3_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_3_3'] == null || $gpcOutput['ii_3_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['ii_4_1'] == null || $gpcOutput['ii_4_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_4_2'] == null || $gpcOutput['ii_4_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_4_3'] == null || $gpcOutput['ii_4_3'] == 0) - - - @else - - - @endif - - - - - @if ($gpcOutput['ii_5_1'] == null || $gpcOutput['ii_5_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_5_2'] == null || $gpcOutput['ii_5_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_5_3'] == null || $gpcOutput['ii_5_3'] == 0) - - - @else - - - @endif - - - - @php - $totalTransDirect = ($gpcOutput['ii_1_1'] ?? 0) + ($gpcOutput['ii_2_1'] ?? 0) + - ($gpcOutput['ii_3_1'] ?? 0) + ($gpcOutput['ii_4_1'] ?? 0) + ($gpcOutput['ii_5_1'] ?? 0); - $totalTransIndirect = ($gpcOutput['ii_1_2'] ?? 0) + ($gpcOutput['ii_2_2'] ?? 0) + - ($gpcOutput['ii_3_2'] ?? 0) + ($gpcOutput['ii_4_2'] ?? 0) + ($gpcOutput['ii_5_2'] ?? 0); - $totalTransOutside = ($gpcOutput['ii_1_3'] ?? 0) + ($gpcOutput['ii_2_3'] ?? 0) + - ($gpcOutput['ii_3_3'] ?? 0) + ($gpcOutput['ii_4_3'] ?? 0) + ($gpcOutput['ii_5_3'] ?? 0); - @endphp - - @if ($totalTransDirect == 0) - - - {{-- --}} - @else - - - @endif - - @if ($totalTransIndirect == 0) - - - {{-- --}} - @else - - - @endif - - @if ($totalTransOutside == 0) - - - @else - - - @endif - - - - - - - - @if ($gpcOutput['ii_5_1'] == null || $gpcOutput['ii_5_1'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_5_2'] == null || $gpcOutput['ii_5_2'] == 0) - - - @else - - - @endif - - @if ($gpcOutput['ii_5_3'] == null || $gpcOutput['ii_5_3'] == 0) - - - @else - - - @endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Sectors and SubsectorsDirect Emissions (tCO2e)Indirect emissions from the use of grid-supplied electricity, heat, steam - and/or coolingEmissions occurring outside the city boundary as a result of in-city - activitiesPlease explain any excluded sources, identify any - emissions covered under an ETS and provide any other comments
Emissions in tCO2eNotation Key (if needed)Emissions in tCO2eNotation Key (if needed)Emissions in tCO2eNotation Key (if needed)
Stationary energy > Residential buildings{{ $gpcOutputR['i_1_1'] }}{{ getFormattedValue($gpcOutput['i_1_1'], 2) }}{{ $gpcOutputR['i_1_2'] }}{{ getFormattedValue($gpcOutput['i_1_2'], 2) }}{{ $gpcOutputR['i_1_3'] }}{{ getFormattedValue($gpcOutput['i_1_3'], 2) }}
Stationary energy > Commercial buildings & - facilities{{ $gpcOutputR['i_2_1'] }}{{ getFormattedValue($energyCommercialDirect, 2) }}{{ $gpcOutputR['i_2_2'] }}{{ getFormattedValue($energyCommercialIndirect, 2) }}{{ $gpcOutputR['i_2_3'] }}{{ getFormattedValue($energyCommercialOutside, 2) }}
Stationary energy > Institutional buildings & - facilitiesIEIEIEIncluded in Commercial Buildings and Facilities
Stationary energy > Industrial buildings & - facilities{{ $gpcOutputR['i_3_1'] }}{{ getFormattedValue($gpcOutput['i_3_1'], 2) }}{{ $gpcOutputR['i_3_2'] }}{{ getFormattedValue($gpcOutput['i_3_2'], 2) }}{{ $gpcOutputR['i_3_3'] }}{{ getFormattedValue($gpcOutput['i_3_3'], 2) }}
Stationary energy > Agriculture{{ $gpcOutputR['i_5_1'] }}{{ getFormattedValue($gpcOutput['i_5_1'], 2) }}{{ $gpcOutputR['i_5_2'] }}{{ getFormattedValue($gpcOutput['i_5_2'], 2) }}{{ $gpcOutputR['i_5_3'] }}{{ getFormattedValue($gpcOutput['i_5_3'], 2) }}
Stationary energy > Fugitive emissions{{ $gpcOutputR['i_8_1'] }}{{ getFormattedValue($gpcOutput['i_8_1'], 2) }}{{ $gpcOutputR['vi_1'] }}{{ getFormattedValue($gpcOutput['vi_1'], 2) }}
Total Stationary Energy{{ $gpcOutputR['i_2_1'] }}{{ getFormattedValue($totalEnergyDirect, 2) }}{{ $gpcOutputR['i_1_2'] }}{{ getFormattedValue($totalEnergyIndirect, 2) }}{{ getFormattedValue($totalEnergyOutside, 2) }}
Transportation > On-road{{ $gpcOutputR['ii_1_1'] }}{{ getFormattedValue($gpcOutput['ii_1_1'], 2) }}{{ $gpcOutputR['ii_1_2'] }}{{ getFormattedValue($gpcOutput['ii_1_2'], 2) }}{{ $gpcOutputR['ii_1_3'] }}{{ getFormattedValue($gpcOutput['ii_1_3'], 2) }}
Transportation > Rail{{ $gpcOutputR['ii_2_1'] }}{{ getFormattedValue($gpcOutput['ii_2_1'], 2) }}{{ $gpcOutputR['ii_2_2'] }}{{ getFormattedValue($gpcOutput['ii_2_2'], 2) }}{{ $gpcOutputR['ii_2_3'] }}{{ getFormattedValue($gpcOutput['ii_2_3'], 2) }}
Transportation > Waterborne navigation{{ $gpcOutputR['ii_3_1'] }}{{ getFormattedValue($gpcOutput['ii_3_1'], 2) }}{{ $gpcOutputR['ii_3_2'] }}{{ getFormattedValue($gpcOutput['ii_3_2'], 2) }}{{ $gpcOutputR['ii_3_3'] }}{{ getFormattedValue($gpcOutput['ii_3_3'], 2) }}
Transportation > Aviation{{ $gpcOutputR['ii_4_1'] }}{{ getFormattedValue($gpcOutput['ii_4_1'], 2) }}{{ $gpcOutputR['ii_4_2'] }}{{ getFormattedValue($gpcOutput['ii_4_2'], 2) }}{{ $gpcOutputR['ii_4_3'] }}{{ getFormattedValue($gpcOutput['ii_4_3'], 2) }}
Transportation > Off-road{{ $gpcOutputR['ii_5_1'] }}{{ getFormattedValue($gpcOutput['ii_5_1'], 2) }}{{ $gpcOutputR['ii_5_2'] }}{{ getFormattedValue($gpcOutput['ii_5_2'], 2) }}{{ $gpcOutputR['ii_5_3'] }}{{ getFormattedValue($gpcOutput['ii_5_3'], 2) }}
Total Transport{{ $gpcOutputR['i_2_1'] }}{{ getFormattedValue($totalTransDirect, 2) }}{{ $gpcOutputR['i_1_2'] }}{{ getFormattedValue($totalTransIndirect, 2) }}{{ getFormattedValue($totalTransOutside, 2) }}
Waste > Solid waste disposal{{ $gpcOutputR['ii_5_1'] }}{{ getFormattedValue($gpcOutput['ii_5_1'], 2) }}{{ $gpcOutputR['ii_5_2'] }}{{ getFormattedValue($gpcOutput['ii_5_2'], 2) }}{{ $gpcOutputR['ii_5_3'] }}{{ getFormattedValue($gpcOutput['ii_5_3'], 2) }}
Waste > Biological treatment{{ getFormattedValue($gpcOutput['biological_treatment']) }}{{ getFormattedValue($gpcOutput['biological_treatment_indirect']) }}{{ getFormattedValue($gpcOutput['biological_treatment_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Waste > Incineration and open burning{{ getFormattedValue($gpcOutput['incineration_open_burning']) }}{{ getFormattedValue($gpcOutput['incineration_open_burning_indirect']) }}{{ getFormattedValue($gpcOutput['incineration_open_burning_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Waste > Wastewater{{ getFormattedValue($gpcOutput['wastewater']) }}{{ getFormattedValue($gpcOutput['wastewater_indirect']) }}{{ getFormattedValue($gpcOutput['wastewater_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Total Waste{{ getFormattedValue($gpcOutput['total_waste']) }}{{ getFormattedValue($gpcOutput['total_waste_indirect']) }}{{ getFormattedValue($gpcOutput['total_waste_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
IPPU > Industrial process{{ getFormattedValue($gpcOutput['industrial_process']) }}{{ getFormattedValue($gpcOutput['industrial_process_indirect']) }}{{ getFormattedValue($gpcOutput['industrial_process_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
IPPU > Produce Use{{ getFormattedValue($gpcOutput['produce_use']) }}{{ getFormattedValue($gpcOutput['produce_use_indirect']) }}{{ getFormattedValue($gpcOutput['produce_use_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Total IPPU{{ getFormattedValue($gpcOutput['total_ippu']) }}{{ getFormattedValue($gpcOutput['total_ippu_indirect']) }}{{ getFormattedValue($gpcOutput['total_ippu_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
AFOLU > Livestock{{ getFormattedValue($gpcOutput['livestock']) }}{{ getFormattedValue($gpcOutput['livestock_indirect']) }}{{ getFormattedValue($gpcOutput['livestock_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
AFOLU > Land use{{ getFormattedValue($gpcOutput['land_use']) }}{{ getFormattedValue($gpcOutput['land_use_indirect']) }}{{ getFormattedValue($gpcOutput['land_use_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
AFOLU > Other AFOLU{{ getFormattedValue($gpcOutput['other_afolu']) }}{{ getFormattedValue($gpcOutput['other_afolu_indirect']) }}{{ getFormattedValue($gpcOutput['other_afolu_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Total AFOLU{{ getFormattedValue($gpcOutput['total_afolu']) }}{{ getFormattedValue($gpcOutput['total_afolu_indirect']) }}{{ getFormattedValue($gpcOutput['total_afolu_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Generation of grid-supplied energy > - Electricity-only generation{{ getFormattedValue($gpcOutput['electricity_only_generation']) }}{{ getFormattedValue($gpcOutput['electricity_only_generation_indirect']) }}{{ getFormattedValue($gpcOutput['electricity_only_generation_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Generation of grid-supplied energy > CHP - generation{{ getFormattedValue($gpcOutput['chp_generation']) }}{{ getFormattedValue($gpcOutput['chp_generation_indirect']) }}{{ getFormattedValue($gpcOutput['chp_generation_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Generation of grid-supplied energy > Heat/cold - generation{{ getFormattedValue($gpcOutput['heat_cold_generation']) }}{{ getFormattedValue($gpcOutput['heat_cold_generation_indirect']) }}{{ getFormattedValue($gpcOutput['heat_cold_generation_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Generation of grid-supplied energy > Local - renewable generation{{ getFormattedValue($gpcOutput['local_renewable_generation']) }}{{ getFormattedValue($gpcOutput['local_renewable_generation_indirect']) }}{{ getFormattedValue($gpcOutput['local_renewable_generation_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Total Generation of grid-supplied energy{{ getFormattedValue($gpcOutput['total_grid_supplied_energy']) }}{{ getFormattedValue($gpcOutput['total_grid_supplied_energy_indirect']) }}{{ getFormattedValue($gpcOutput['total_grid_supplied_energy_outside']) }}{{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
Total Emissions (excluding generation of - grid-supplied energy){{ getFormattedValue($gpcOutput['total_emissions_excluding_grid_energy']) }}{{ getFormattedValue($gpcOutput['total_emissions_excluding_grid_energy_indirect']) }} - {{ getFormattedValue($gpcOutput['total_emissions_excluding_grid_energy_outside']) }} - {{ getFormattedValue($gpcOutput['residential_buildings']) }}{{ getFormattedValue($gpcOutput['residential_buildings_indirect']) }}{{ getFormattedValue($gpcOutput['residential_buildings_outside']) }}
-
- @endif -
-
-@endsection - -@push('styles') - {{-- Include any custom styles here --}} -@endsection - -@section('js') - -@endsection - diff --git a/resources/views/modules/reports/gcom-crf/index.blade.php b/resources/views/modules/reports/gcom-crf/index.blade.php index 0e97f06..4bf2358 100644 --- a/resources/views/modules/reports/gcom-crf/index.blade.php +++ b/resources/views/modules/reports/gcom-crf/index.blade.php @@ -1,24 +1,11 @@ @extends('layouts.master') -@section('title', 'GCOM CRF') - @section('content')
-
GCOM CRF
+
{{ @$title }}
- @if ($errors->has('error')) -
- {{ $errors->first('error') }} -
- @endif - - @if (session('success')) -
- {{ session('success') }} -
- @endif
@@ -28,20 +15,16 @@
-
+
- Ekspor Excel + Ekspor Excel
-
- - -
-
@@ -52,9 +35,9 @@
@if ($gpcData) - @include('reports.gcom-crf.table') + @include('modules.reports.gcom-crf.table') @endif - @include('reports.gcom-crf.note') + @include('modules.reports.gcom-crf.note')
@endsection @@ -83,7 +66,7 @@ const inventoryYear = $('#inventoryYear').val(); const activityYear = $('#activityYear').val() || ''; - let actionUrl = `{{ url('reports/gcom_crf') }}/${inventoryYear}`; + let actionUrl = `{{ url('laporan/gcom') }}/${inventoryYear}`; if (activityYear) actionUrl += `/${activityYear}`; return actionUrl; diff --git a/resources/views/modules/reports/gcom-crf/note.blade.php b/resources/views/modules/reports/gcom-crf/note.blade.php index bee23f4..28d195f 100644 --- a/resources/views/modules/reports/gcom-crf/note.blade.php +++ b/resources/views/modules/reports/gcom-crf/note.blade.php @@ -4,9 +4,6 @@
-
@@ -69,7 +66,7 @@
- +
diff --git a/resources/views/modules/reports/gcom-crf/report.blade.php b/resources/views/modules/reports/gcom-crf/report.blade.php index 7d0e00b..69455fd 100644 --- a/resources/views/modules/reports/gcom-crf/report.blade.php +++ b/resources/views/modules/reports/gcom-crf/report.blade.php @@ -6,4 +6,4 @@

-@include('reports.gcom-crf.table') \ No newline at end of file +@include('modules.reports.gcom-crf.table') \ No newline at end of file diff --git a/resources/views/modules/reports/gpc-output/index.blade.php b/resources/views/modules/reports/gpc-output/index.blade.php index c9107a3..b13e643 100644 --- a/resources/views/modules/reports/gpc-output/index.blade.php +++ b/resources/views/modules/reports/gpc-output/index.blade.php @@ -1,47 +1,29 @@ @extends('layouts.master') -@section('title') - GPC Output -@endsection - @section('content')
-
GPC Output
+
{{ @$title }}
- @if ($errors->has('error')) -
- {{ $errors->first('error') }} -
- @endif - - @if (session('success')) -
- {{ session('success') }} -
- @endif
-
+
- $inventoryYear, ]) }}" - class="btn btn-info">Ekspor Excel + class="btn btn-success">Ekspor Excel
-
- -
-
@@ -51,9 +33,9 @@
@if ($gpcOutputs->isNotEmpty()) - @include('reports.gpc-output.table') + @include('modules.reports.gpc-output.table') @endif - @include('reports.gcom-crf.note') + @include('modules.reports.gcom-crf.note')
@endsection @@ -75,7 +57,7 @@ const inventoryYear = $('#inventoryYear').val(); const activityYear = $('#activityYear').val() || ''; - let actionUrl = `{{ url('reports/gpc_output') }}/${inventoryYear}`; + let actionUrl = `{{ url('laporan/gpc') }}/${inventoryYear}`; if (activityYear) actionUrl += `/${activityYear}`; return actionUrl; diff --git a/resources/views/modules/reports/gpc-output/report.blade.php b/resources/views/modules/reports/gpc-output/report.blade.php index 36cb84d..275119c 100644 --- a/resources/views/modules/reports/gpc-output/report.blade.php +++ b/resources/views/modules/reports/gpc-output/report.blade.php @@ -6,4 +6,4 @@

-@include('reports.gpc-output.table') \ No newline at end of file +@include('modules.reports.gpc-output.table') \ No newline at end of file diff --git a/routes/modules/modules.php b/routes/modules/modules.php index 497b3d9..d79381d 100644 --- a/routes/modules/modules.php +++ b/routes/modules/modules.php @@ -215,11 +215,11 @@ Route::name('management.')->prefix('management')->group(function () { Route::get('crf/export', [CrfController::class, 'export'])->name('crf.export'); Route::get('crf/{inventoryYear?}/{activityYear?}/{sectorCode?}', [CrfController::class, 'show'])->name('crf.show'); - Route::get('gpc_output/export', [GpcOutputController::class, 'export'])->name('gpcOutput.export'); - Route::get('gpc_output/{inventoryYear?}', [GpcOutputController::class, 'show'])->name('gpcOutput.show'); + Route::get('gpc/export', [GpcOutputController::class, 'export'])->name('gpc.export'); + Route::get('gpc/{inventoryYear?}', [GpcOutputController::class, 'show'])->name('gpc.show'); - Route::get('gcom_crf/export', [GcomCrfController::class, 'export'])->name('gcomCrf.export'); - Route::get('gcom_crf/{inventoryYear?}/{activityYear?}', [GcomCrfController::class, 'show'])->name('gcomCrf.show'); + Route::get('gcom/export', [GcomCrfController::class, 'export'])->name('gcom.export'); + Route::get('gcom/{inventoryYear?}/{activityYear?}', [GcomCrfController::class, 'show'])->name('gcom.show'); }); // Additional others Routing