From 7d349a1be270867ceefd622e2d18fed2ec349092 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Wed, 7 Jan 2026 14:18:57 +0700
Subject: [PATCH] update

---
 .../Controllers/Activity/FormController.php   |   5 +-
 resources/views/modules/form/action.blade.php |  69 ++-
 .../modules/form/aktivitas-user.blade.php     |   4 +-
 .../views/modules/form/approve.blade.php      |   2 +-
 resources/views/modules/form/copy.blade.php   |   8 +-
 resources/views/modules/form/import.blade.php |   6 +-
 .../form/index-adaptasi-edit.blade.php        |   2 +-
 .../form/index-adaptasi-thankyou.blade.php    |   4 +-
 .../modules/form/index-adaptasi.blade.php     |   2 +-
 .../modules/form/index-kehutanan.blade.php    |  10 +-
 .../form/index-mitigasi-edit.blade.php        |   2 +-
 .../form/index-mitigasi-thankyou.blade.php    |   4 +-
 .../form/index-mitigasi-view.blade.php        |   2 +-
 .../modules/form/index-mitigasi.blade.php     |   2 +-
 resources/views/modules/form/index.blade.php  |  33 +-
 resources/views/modules/form/lock.blade.php   |   4 +-
 .../modules/form/metadata/index.blade.php     |   6 +-
 .../views/modules/form/scripts.blade.php      |   8 +-
 resources/views/modules/form/table.blade.php  |   6 +-
 routes/modules/energi.php                     |  61 ---
 routes/modules/ippu.php                       |  37 --
 routes/modules/kalkulasi.php                  |  10 -
 routes/modules/limbah.php                     |   8 -
 routes/modules/modules.php                    | 428 +-----------------
 routes/modules/pengaturan.php                 |  10 -
 routes/modules/pertanian.php                  |  13 -
 26 files changed, 78 insertions(+), 668 deletions(-)
 delete mode 100644 routes/modules/energi.php
 delete mode 100644 routes/modules/ippu.php
 delete mode 100644 routes/modules/kalkulasi.php
 delete mode 100644 routes/modules/limbah.php
 delete mode 100644 routes/modules/pengaturan.php
 delete mode 100644 routes/modules/pertanian.php

diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php
index fbdf059..ca321ca 100644
--- a/app/Http/Controllers/Activity/FormController.php
+++ b/app/Http/Controllers/Activity/FormController.php
@@ -25,6 +25,9 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class FormController implements HasMiddleware
 {
+    // protected $title = 'Common Reporting Format (CRF)';
+    protected $template = 'modules.form';
+    protected $route = 'modules.laporan.crf';
     protected $formService;
 
     public function __construct(FormService $formService)
@@ -128,7 +131,7 @@ class FormController implements HasMiddleware
         // Retrieve data
         $data = $this->data($sector, $code, $inventoryYear, $instansi);
 
-        return view('form.index', $data);
+        return view($this->template.'.index', $data);
     }
 
     public function save(Request $request, $sector, $code)
diff --git a/resources/views/modules/form/action.blade.php b/resources/views/modules/form/action.blade.php
index ee6e187..ce1aeb1 100644
--- a/resources/views/modules/form/action.blade.php
+++ b/resources/views/modules/form/action.blade.php
@@ -1,47 +1,14 @@
 <div class="row">
-    <div class="col-md-8 order-md-2 d-flex justify-content-end align-items-center flex-wrap">
-        {{-- <div class="form-group mb-0 mr-2">
-            @include('form.lock')
-        </div> --}}
-        {{-- <div class="form-group mb-0 mr-2">
-            <button type="button" class="btn btn-info mb-2 mb-md-0" data-toggle="modal" data-target="#copyDataModal" {{ $isLocked ? 'disabled' : '' }}>
-                <i class="ti ti-files"></i>
-            </button>
-        </div> --}}
-        <div class="form-group mb-0 mr-2">
-            @include('form.approve')
-        </div>
-        <div class="form-group mb-0 mr-2">
-            <button type="button" class="btn btn-info mb-2 mb-md-0" onclick="showMetadataModal()"
-                {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
-                <i class="ti ti-menu-alt"></i>
-            </button>
-        </div>
-        <div class="form-group mb-0 mr-2">
-            <button type="button" class="btn btn-info mb-2 mb-md-0" onclick="showActivityUserModal()"
-                {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
-                Aktivitas User
-            </button>
-        </div>
-        <div class="form-group mb-0 mr-2">
-            <a href="{{ $routeExport }}" class="btn btn-info mb-2 mb-md-0">Ekspor Excel</a>
-        </div>
-        <div class="form-group mb-0 mr-2">
-            <button type="button" class="btn btn-info mb-2 mb-md-0" data-toggle="modal" data-target="#importModal">
-                Impor Data Aktivitas
-            </button>
-        </div>
-    </div>
-    <div class="col-md-4 order-md-1">
-        <form method="GET" action="{{ route('form.show', ['sector' => $form->sector, 'code' => $form->code]) }}"
+    <div class="col-md-12">
+        <form method="GET" action="{{ route('modules.form.show', ['sector' => $form->sector, 'code' => $form->code]) }}"
             id="filterForm">
             <div class="row">
                 <div class="col-md-4">
                     <x-inventory-year-select :selected-year="$inventoryYear" />
                 </div>
-
-                {{-- @if ($agencies->isNotEmpty()) --}}
-                <div class="col-md-8">
+            </div>
+            <div class="row">
+                <div class="col-md-4">
                     <div class="form-group">
                         <label for="instansi">Instansi:</label>
                         <div class="input-group">
@@ -64,7 +31,31 @@
                         </div>
                     </div>
                 </div>
-                {{-- @endif --}}
+                <div class="col-md-8 order-md-2 d-flex gap-1 justify-content-end align-items-center flex-wrap">
+                    <div class="form-group mb-0 mr-2">
+                        @include('modules.form.approve')
+                    </div>
+                    <div class="form-group mb-0 mr-2">
+                        <button type="button" class="btn btn-info mb-2 mb-md-0" onclick="showMetadataModal()"
+                            {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
+                            <i class="bx bx-menu"></i>
+                        </button>
+                    </div>
+                    <div class="form-group mb-0 mr-2">
+                        <button type="button" class="btn btn-info mb-2 mb-md-0" onclick="showActivityUserModal()"
+                            {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
+                            Aktivitas User
+                        </button>
+                    </div>
+                    <div class="form-group mb-0 mr-2">
+                        <a href="{{ $routeExport }}" class="btn btn-success mb-2 mb-md-0">Ekspor Excel</a>
+                    </div>
+                    <div class="form-group mb-0 mr-2">
+                        <button type="button" class="btn btn-warning mb-2 mb-md-0" data-bs-toggle="modal" data-bs-target="#importModal">
+                            Impor Data Aktivitas
+                        </button>
+                    </div>
+                </div>
             </div>
         </form>
     </div>
diff --git a/resources/views/modules/form/aktivitas-user.blade.php b/resources/views/modules/form/aktivitas-user.blade.php
index 32b21cd..ae8b018 100644
--- a/resources/views/modules/form/aktivitas-user.blade.php
+++ b/resources/views/modules/form/aktivitas-user.blade.php
@@ -3,9 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="userActivityModalLabel">Aktivitas User</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                
             </div>
             <div class="modal-body">
                 <div id="isLoadAktivitasUser" style="display: none;">Loading...</div>
diff --git a/resources/views/modules/form/approve.blade.php b/resources/views/modules/form/approve.blade.php
index 9f8b0fc..fa1dd57 100644
--- a/resources/views/modules/form/approve.blade.php
+++ b/resources/views/modules/form/approve.blade.php
@@ -3,6 +3,6 @@
     <button type="button" class="btn {{ $isApprove ? 'btn-warning' : 'btn-secondary' }} mb-2 mb-md-0"
         onclick="confirmApprove({{ $isApprove ? 'false' : 'true' }}, '{{ $routeApproval }}')"
         {{ !$activityForm || $isLocked || $instansi === 'all' || $instansi === null || $instansi === 'none' || $limitInternal ? 'disabled' : '' }}>
-        {!! $isApprove ? '<i class="ti ti-check"></i>' : '<i class="ti ti-close"></i>' !!}
+        {!! $isApprove ? '<i class="bx bx-check"></i>' : '<i class="bx bx-x"></i>' !!}
     </button>
 </form>
diff --git a/resources/views/modules/form/copy.blade.php b/resources/views/modules/form/copy.blade.php
index 652ed5e..a62f462 100644
--- a/resources/views/modules/form/copy.blade.php
+++ b/resources/views/modules/form/copy.blade.php
@@ -5,11 +5,9 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="copyDataModalLabel">Salin Data Aktivitas</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                
             </div>
-            <form action="{{ route('form.copy', ['sector' => $form->sector, 'code' => $form->code]) }}" method="POST">
+            <form action="{{ route('modules.form.copy', ['sector' => $form->sector, 'code' => $form->code]) }}" method="POST">
                 @csrf
                 <div class="modal-body">
                     <div class="form-group">
@@ -33,7 +31,7 @@
                     <input type="hidden" name="to_year" value="{{ $inventoryYear }}">
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
                     <button type="submit" class="btn btn-info" onclick="confirmCopy()">Salin Data</button>
                 </div>
             </form>
diff --git a/resources/views/modules/form/import.blade.php b/resources/views/modules/form/import.blade.php
index 73e7d89..d0680fb 100644
--- a/resources/views/modules/form/import.blade.php
+++ b/resources/views/modules/form/import.blade.php
@@ -3,9 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="importModalLabel">Impor Data Aktivitas</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                
             </div>
             <form
                 action="{{ $routeImport }}"
@@ -21,7 +19,7 @@
                         class="card-link">Unduh Template File Impor</a>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
                     <button type="submit" class="btn btn-primary" {{ $isLocked || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>Impor Sekarang</button>
                 </div>
             </form>
diff --git a/resources/views/modules/form/index-adaptasi-edit.blade.php b/resources/views/modules/form/index-adaptasi-edit.blade.php
index f5faaed..a500c21 100644
--- a/resources/views/modules/form/index-adaptasi-edit.blade.php
+++ b/resources/views/modules/form/index-adaptasi-edit.blade.php
@@ -192,7 +192,7 @@
     </form>
 @endsection
 
-@push('styles')
+@section('css')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <link href="https://cdn.jsdelivr.net/npm/@ttskch/select2-bootstrap4-theme@1.5.2/dist/select2-bootstrap4.min.css" rel="stylesheet" />
 @endsection
diff --git a/resources/views/modules/form/index-adaptasi-thankyou.blade.php b/resources/views/modules/form/index-adaptasi-thankyou.blade.php
index 83a8414..fa9694b 100644
--- a/resources/views/modules/form/index-adaptasi-thankyou.blade.php
+++ b/resources/views/modules/form/index-adaptasi-thankyou.blade.php
@@ -46,10 +46,10 @@
             </div>
 
             <div class="d-flex justify-content-center gap-3">
-                <a href="{{ route('formAdaptasi.downloadPDF', $km->id) }}" class="btn btn-success px-4">
+                <a href="{{ route('modules.formAdaptasi.downloadPDF', $km->id) }}" class="btn btn-success px-4">
                     DOWNLOAD BUKTI
                 </a>
-                <a href="{{ route('dashboardAdaptasi.index') }}" class="btn btn-secondary px-4" style="margin-left: 10px;">
+                <a href="{{ route('modules.dashboard.adaptasi.index') }}" class="btn btn-secondary px-4" style="margin-left: 10px;">
                     Kembali ke Dashboard
                 </a>
             </div>
diff --git a/resources/views/modules/form/index-adaptasi.blade.php b/resources/views/modules/form/index-adaptasi.blade.php
index 724d0f9..3988077 100644
--- a/resources/views/modules/form/index-adaptasi.blade.php
+++ b/resources/views/modules/form/index-adaptasi.blade.php
@@ -294,7 +294,7 @@
         </div>
     </form>
 @endsection
-@push('styles')
+@section('css')
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
     <link href="https://cdn.jsdelivr.net/npm/@ttskch/select2-bootstrap4-theme@1.5.2/dist/select2-bootstrap4.min.css" rel="stylesheet" />
 @endsection
diff --git a/resources/views/modules/form/index-kehutanan.blade.php b/resources/views/modules/form/index-kehutanan.blade.php
index 72f3ce0..cf9602f 100644
--- a/resources/views/modules/form/index-kehutanan.blade.php
+++ b/resources/views/modules/form/index-kehutanan.blade.php
@@ -169,7 +169,7 @@
     @endif
 @endsection
 
-@push('styles')
+@section('css')
     <style>
         .wide-input {
             min-width: 80px;
@@ -207,7 +207,7 @@
                 e.preventDefault();
                 var formData = new FormData(this);
                 $.ajax({
-                    url: '{{ route('form.metadata.store') }}',
+                    url: '{{ route('modules.form.metadata.store') }}',
                     type: 'POST',
                     data: formData,
                     processData: false,
@@ -276,7 +276,7 @@
                 scrollX: true,
                 searchDelay: 1000,
                 ajax: {
-                    url: '{{ route('form.aktivitasUser', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
+                    url: '{{ route('modules.form.aktivitasUser', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
                     type: 'GET',
                     dataSrc: 'data'
                 },
@@ -312,7 +312,7 @@
             $('#metadataContent').hide();
             $('#isLoadMetadata').show();
             $.ajax({
-                url: '{{ route('form.metadata.index', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
+                url: '{{ route('modules.form.metadata.index', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
                 type: 'GET',
                 success: function(data) {
                     $('#metadataContent').html(data);
@@ -339,7 +339,7 @@
             }).then((result) => {
                 if (result.isConfirmed) {
                     $.ajax({
-                        url: '{{ route('form.metadata.destroy', ':id') }}'.replace(':id', metadataId),
+                        url: '{{ route('modules.form.metadata.destroy', ':id') }}'.replace(':id', metadataId),
                         type: 'POST',
                         data: {
                             _token: '{{ csrf_token() }}',
diff --git a/resources/views/modules/form/index-mitigasi-edit.blade.php b/resources/views/modules/form/index-mitigasi-edit.blade.php
index 684f8e9..a1eb31b 100644
--- a/resources/views/modules/form/index-mitigasi-edit.blade.php
+++ b/resources/views/modules/form/index-mitigasi-edit.blade.php
@@ -673,7 +673,7 @@
     </form>
 @endsection
 
-@push('styles')
+@section('css')
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" /> 
     <link rel="stylesheet" href="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.css"/>   
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
diff --git a/resources/views/modules/form/index-mitigasi-thankyou.blade.php b/resources/views/modules/form/index-mitigasi-thankyou.blade.php
index 732f4c8..7fa918c 100644
--- a/resources/views/modules/form/index-mitigasi-thankyou.blade.php
+++ b/resources/views/modules/form/index-mitigasi-thankyou.blade.php
@@ -61,10 +61,10 @@
             </div>
 
             <div class="d-flex justify-content-center gap-3">
-                <a href="{{ route('formMitigasi.downloadPDF', $km->id) }}" class="btn btn-success px-4">
+                <a href="{{ route('modules.formMitigasi.downloadPDF', $km->id) }}" class="btn btn-success px-4">
                     DOWNLOAD BUKTI
                 </a>
-                <a href="{{ route('dashboardMitigasi.index') }}" class="btn btn-secondary px-4" style="margin-left: 10px;">
+                <a href="{{ route('modules.dashboard.mitigasi.index') }}" class="btn btn-secondary px-4" style="margin-left: 10px;">
                     Kembali ke Dashboard
                 </a>
             </div>
diff --git a/resources/views/modules/form/index-mitigasi-view.blade.php b/resources/views/modules/form/index-mitigasi-view.blade.php
index c1aa05b..a69ab43 100644
--- a/resources/views/modules/form/index-mitigasi-view.blade.php
+++ b/resources/views/modules/form/index-mitigasi-view.blade.php
@@ -272,7 +272,7 @@
   </div>
 @endsection
 
-@push('styles')
+@section('css')
   {{-- Leaflet CSS --}}
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"/>
 @endsection
diff --git a/resources/views/modules/form/index-mitigasi.blade.php b/resources/views/modules/form/index-mitigasi.blade.php
index 2944430..e11ef50 100644
--- a/resources/views/modules/form/index-mitigasi.blade.php
+++ b/resources/views/modules/form/index-mitigasi.blade.php
@@ -671,7 +671,7 @@
     </form>
 @endsection
 
-@push('styles')
+@section('css')
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" /> 
     <link rel="stylesheet" href="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.css"/>   
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php
index 9e6c0a9..e711d34 100644
--- a/resources/views/modules/form/index.blade.php
+++ b/resources/views/modules/form/index.blade.php
@@ -21,10 +21,10 @@
             'instansi' => $instansi,
         ];
 
-        $routeImport = route('form.import', $param);
-        $routeExport = route('form.export', $param);
-        $routeExportTemplate = route('form.export', array_merge($param, ['isTemplate' => true]));
-        $routeApproval = route('form.approval', $param);
+        $routeImport = route('modules.form.import', $param);
+        $routeExport = route('modules.form.export', $param);
+        $routeExportTemplate = route('modules.form.export', array_merge($param, ['isTemplate' => true]));
+        $routeApproval = route('modules.form.approval', $param);
 
         $internal = $internal ?? null;
         $limitInternal = ($internal !== null) && !$agencies->isNotEmpty();
@@ -35,28 +35,17 @@
             <h5 class="mb-0 font-weight-bold">{{ $form->name }}</h5>
         </div>
         <div class="card-body">
-            @if ($errors->has('error'))
-                <div class="alert alert-danger">
-                    {{ $errors->first('error') }}
-                </div>
-            @endif
 
-            @if (session('success'))
-                <div class="alert alert-success">
-                    {{ session('success') }}
-                </div>
-            @endif
-
-            @include('form.action')
-            @include('form.table')
-            {{-- @include('form.copy') --}}
+            @include('modules.form.action')
+            @include('modules.form.table')
+            {{-- @include('modules.form.copy') --}}
         </div>
     </div>
-    @include('form.import')
+    @include('modules.form.import')
     @if ($instansi !== 'all')
-        @include('form.aktivitas-user')
-        @include('form.metadata.index')
+        @include('modules.form.aktivitas-user')
+        @include('modules.form.metadata.index')
     @endif
 @endsection
 
-@include('form.scripts')
+@include('modules.form.scripts')
diff --git a/resources/views/modules/form/lock.blade.php b/resources/views/modules/form/lock.blade.php
index 8fff2c4..01be0e2 100644
--- a/resources/views/modules/form/lock.blade.php
+++ b/resources/views/modules/form/lock.blade.php
@@ -1,7 +1,7 @@
 @if ($isLocked)
     <!-- Unlock Form -->
     <form id="unlock-form"
-        action="{{ route('form.unlock', ['sector' => $form->sector, 'code' => $form->code, 'id' => $activityForm->id ?? '#']) }}"
+        action="{{ route('modules.form.unlock', ['sector' => $form->sector, 'code' => $form->code, 'id' => $activityForm->id ?? '#']) }}"
         method="POST" class="d-inline">
         @csrf
         <button type="button" class="btn btn-warning mb-2 mb-md-0" {{ !$activityForm ? 'disabled' : '' }}
@@ -12,7 +12,7 @@
 @else
     <!-- Lock Form -->
     <form id="lock-form"
-        action="{{ route('form.lock', ['sector' => $form->sector, 'code' => $form->code, 'id' => $activityForm->id ?? '#']) }}"
+        action="{{ route('modules.form.lock', ['sector' => $form->sector, 'code' => $form->code, 'id' => $activityForm->id ?? '#']) }}"
         method="POST" class="d-inline">
         @csrf
         <button type="button" class="btn btn-danger mb-2 mb-md-0" {{ !$activityForm ? 'disabled' : '' }}
diff --git a/resources/views/modules/form/metadata/index.blade.php b/resources/views/modules/form/metadata/index.blade.php
index a584433..d89ae7a 100644
--- a/resources/views/modules/form/metadata/index.blade.php
+++ b/resources/views/modules/form/metadata/index.blade.php
@@ -13,9 +13,7 @@
                             class="text-danger">{{ $activityForm->updated_at ?? '' }}</span>
                     </label>
                 </div>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
+                
             </div>
             <div class="modal-body">
                 <div class="row">
@@ -102,7 +100,7 @@
     </div>
 </div>
 
-@push('styles')
+@section('css')
     <style>
         /* Global styles */
         /* #metadataModal .form-group {
diff --git a/resources/views/modules/form/scripts.blade.php b/resources/views/modules/form/scripts.blade.php
index e4f1ed3..9cfbcdc 100644
--- a/resources/views/modules/form/scripts.blade.php
+++ b/resources/views/modules/form/scripts.blade.php
@@ -29,7 +29,7 @@
                 e.preventDefault();
                 var formData = new FormData(this);
                 $.ajax({
-                    url: '{{ route('form.metadata.store') }}',
+                    url: '{{ route('modules.form.metadata.store') }}',
                     type: 'POST',
                     data: formData,
                     processData: false,
@@ -127,7 +127,7 @@
             $('#metadataContent').hide();
             $('#isLoadMetadata').show();
             $.ajax({
-                url: '{{ route('form.metadata.index', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
+                url: '{{ route('modules.form.metadata.index', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
                 type: 'GET',
                 success: function(data) {
                     $('#metadataContent').html(data);
@@ -158,7 +158,7 @@
                 scrollX: true,
                 searchDelay: 1000,
                 ajax: {
-                    url: '{{ route('form.aktivitasUser', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
+                    url: '{{ route('modules.form.aktivitasUser', ['form_id' => $instansi === 'all' ? 0 : $activityForm->id ?? 0]) }}',
                     type: 'GET',
                     dataSrc: 'data'
                 },
@@ -198,7 +198,7 @@
             }).then((result) => {
                 if (result.isConfirmed) {
                     $.ajax({
-                        url: '{{ route('form.metadata.destroy', ':id') }}'.replace(':id', metadataId),
+                        url: '{{ route('modules.form.metadata.destroy', ':id') }}'.replace(':id', metadataId),
                         type: 'POST',
                         data: {
                             _token: '{{ csrf_token() }}',
diff --git a/resources/views/modules/form/table.blade.php b/resources/views/modules/form/table.blade.php
index 8f2aabf..b11f7bf 100644
--- a/resources/views/modules/form/table.blade.php
+++ b/resources/views/modules/form/table.blade.php
@@ -1,9 +1,9 @@
-<form action="{{ route('form.save', ['sector' => $form->sector, 'code' => $form->code]) }}" method="POST">
+<form action="{{ route('modules.form.save', ['sector' => $form->sector, 'code' => $form->code]) }}" method="POST">
     @csrf
     <input type="hidden" name="inventoryYear" value="{{ $inventoryYear }}">
     <input type="hidden" name="instansi" value="{{ $instansi }}">
-    <div class="table-responsive" style="overflow-x: auto;">
-        <table class="table table-bordered table-detail" style="min-width: 1095px;">
+    <div class="table-responsive mt-3" style="overflow-x: auto;">
+        <table class="table table-bordered table-detail">
             <thead class="bg-header text-white">
                 <tr>
                     <th style="width: 50px;">No.</th>
diff --git a/routes/modules/energi.php b/routes/modules/energi.php
deleted file mode 100644
index c77f554..0000000
--- a/routes/modules/energi.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-use App\Http\Controllers\Energi\BahanBakarListrikController;
-use App\Http\Controllers\Energi\EmisiBatuBaraController;
-use App\Http\Controllers\Energi\EmisiMigasController;
-use App\Http\Controllers\Energi\EnergiLainnyaController;
-use App\Http\Controllers\Energi\IndustriManufakturController;
-use App\Http\Controllers\Energi\KomersialController;
-use App\Http\Controllers\Energi\ListrikPlnController;
-use App\Http\Controllers\Energi\PembangkitListrikController;
-use App\Http\Controllers\Energi\PenyulinganController;
-use App\Http\Controllers\Energi\RumahTanggaController;
-use App\Http\Controllers\Energi\TransmisiDistribusiController;
-use App\Http\Controllers\Energi\TransportasiController;
-use App\Http\Controllers\Energi\PenggunaanListrikController;
-
-Route::name('energi.')->prefix('energi')->group(function () {
-    Route::name('bahan-bakar-listrik.')->prefix('bahan-bakar-listrik')->group(function () {
-        Route::resource('/',BahanBakarListrikController::class);
-    });
-    Route::name('emisi-batu-bara.')->prefix('emisi-batu-bara')->group(function () {
-        Route::resource('/',EmisiBatuBaraController::class);
-    });
-    Route::name('emisi-migas.')->prefix('emisi-migas')->group(function () {
-        Route::resource('/',EmisiMigasController::class);
-    });
-    Route::name('lainnya.')->prefix('lainnya')->group(function () {
-        Route::resource('/',EnergiLainnyaController::class);
-    });
-
-    Route::name('industri-manufaktur.')->prefix('industri-manufaktur')->group(function(){
-        Route::resource('/',IndustriManufakturController::class);
-    });
-    Route::name('komersial.')->prefix('komersial')->group(function(){
-        Route::resource('/',KomersialController::class);
-    });
-    Route::name('listrik-pln.')->prefix('listrik-pln')->group(function(){
-        Route::resource('/',ListrikPlnController::class);
-    });
-    Route::name('pembangkit-listrik.')->prefix('pembangkit-listrik')->group(function(){
-        Route::resource('/',PembangkitListrikController::class);
-    });
-    Route::name('penyulingan.')->prefix('penyulingan')->group(function(){
-        Route::resource('/',PenyulinganController::class);
-    });
-    Route::name('rumah-tangga.')->prefix('rumah-tangga')->group(function(){
-        Route::resource('/',RumahTanggaController::class);
-    });
-    Route::name('transmisi-distribusi.')->prefix('transmisi-distribusi')->group(function(){
-        Route::resource('/',TransmisiDistribusiController::class);
-    });
-    Route::name('transportasi.')->prefix('transportasi')->group(function(){
-        Route::resource('/',TransportasiController::class);
-    });
-    Route::name('penggunaan-listrik.')->prefix('penggunaan-listrik')->group(function(){
-        Route::resource('/',PenggunaanListrikController::class);
-    });
-    
-});
\ No newline at end of file
diff --git a/routes/modules/ippu.php b/routes/modules/ippu.php
deleted file mode 100644
index a3d16b5..0000000
--- a/routes/modules/ippu.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use App\Http\Controllers\IPPU\KarbonatKacaController;
-use App\Http\Controllers\IPPU\KarbonatKeramikController;
-use App\Http\Controllers\IPPU\KarbonatLainnyaController;
-use App\Http\Controllers\IPPU\KarbonatMakananController;
-use App\Http\Controllers\IPPU\KarbonatPulpController;
-use App\Http\Controllers\IPPU\PelumasParafinController;
-use App\Http\Controllers\IPPU\PenggunaAcController;
-use App\Http\Controllers\IPPU\ProduksiController;
-
-Route::name('ippu.')->prefix('ippu')->group(function () {
-    Route::name('karbonat-kaca.')->prefix('karbonat-kaca')->group(function () { 
-        Route::resource('/',KarbonatKacaController::class);
-    });
-    Route::name('karbonat-keramik.')->prefix('karbonat-keramik')->group(function () { 
-        Route::resource('/',KarbonatKeramikController::class);
-    });
-    Route::name('karbonat-lainnya.')->prefix('karbonat-lainnya')->group(function () { 
-        Route::resource('/',KarbonatLainnyaController::class);
-    });
-    Route::name('karbonat-makanan-minuman.')->prefix('karbonat-makanan-minuman')->group(function () { 
-        Route::resource('/',KarbonatMakananController::class);
-    });
-    Route::name('karbonat-pulp.')->prefix('karbonat-pulp')->group(function () { 
-        Route::resource('/',KarbonatPulpController::class);
-    });
-    Route::name('pelumas-parafin.')->prefix('pelumas-parafin')->group(function () { 
-        Route::resource('/',PelumasParafinController::class);
-    });
-    Route::name('penggunaan-ac.')->prefix('penggunaan-ac')->group(function () { 
-        Route::resource('/',PenggunaAcController::class);
-    });
-    Route::name('produksi.')->prefix('produksi')->group(function () { 
-        Route::resource('/',ProduksiController::class);
-    });
-});
\ No newline at end of file
diff --git a/routes/modules/kalkulasi.php b/routes/modules/kalkulasi.php
deleted file mode 100644
index 3d77e10..0000000
--- a/routes/modules/kalkulasi.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use App\Http\Controllers\Kalkulasi\CRFController;
-use App\Http\Controllers\Kalkulasi\GCOMController;
-use App\Http\Controllers\Kalkulasi\GPCController;
-use App\Http\Controllers\Kalkulasi\HitungProdusenController;
-use App\Http\Controllers\Kalkulasi\KalkulasiEmisiController;
-use App\Http\Controllers\Kalkulasi\KunciAktifitasController;
-use App\Http\Controllers\Kalkulasi\SalinAktifitasController;
-use App\Http\Controllers\Kalkulasi\WorksheetController;
\ No newline at end of file
diff --git a/routes/modules/limbah.php b/routes/modules/limbah.php
deleted file mode 100644
index b82bd99..0000000
--- a/routes/modules/limbah.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use App\Http\Controllers\Limbah\DistribusiSampahDomestikController;
-use App\Http\Controllers\Limbah\KependudukanController;
-use App\Http\Controllers\Limbah\KomposisiSampahDomestikController;
-use App\Http\Controllers\Limbah\LimbahCairIndustriController;
-use App\Http\Controllers\Limbah\SaranaAirLimbahDomestikController;
-use App\Http\Controllers\Limbah\TimbulanSampahController;
\ No newline at end of file
diff --git a/routes/modules/modules.php b/routes/modules/modules.php
index d79381d..03f91d7 100644
--- a/routes/modules/modules.php
+++ b/routes/modules/modules.php
@@ -55,63 +55,6 @@ use App\Http\Controllers\Tool\CopyActivityController;
 use App\Http\Controllers\Tool\LockActivityController;
 use App\Http\Controllers\Tool\ProdusenCalculateController;
 
-// use App\Http\Controllers\Pengaturan\ARController;
-// use App\Http\Controllers\Pengaturan\GHGController;
-// use App\Http\Controllers\Pengaturan\GWPController;
-// use App\Http\Controllers\Pengaturan\KategoriController;
-// use App\Http\Controllers\Pengaturan\UnitController;
-// use App\Http\Controllers\Pengaturan\UnitKonversiController;
-// use App\Http\Controllers\Pengaturan\SumberDataEFController;
-// use App\Http\Controllers\Pengaturan\EFController;
-// use App\Http\Controllers\Pengaturan\UploadAktifitasController;
-// use App\Http\Controllers\Pengaturan\PengumumanController;
-// use App\Http\Controllers\Kalkulasi\CRFController;
-// use App\Http\Controllers\Kalkulasi\GCOMController;
-// use App\Http\Controllers\Kalkulasi\GPCController;
-// use App\Http\Controllers\Kalkulasi\HitungProdusenController;
-// use App\Http\Controllers\Kalkulasi\KalkulasiEmisiController;
-// use App\Http\Controllers\Kalkulasi\KunciAktifitasController;
-// use App\Http\Controllers\Kalkulasi\SalinAktifitasController;
-// use App\Http\Controllers\Kalkulasi\WorksheetController;
-// use App\Http\Controllers\Limbah\DistribusiSampahDomestikController;
-// use App\Http\Controllers\Limbah\KependudukanController;
-// use App\Http\Controllers\Limbah\KomposisiSampahDomestikController;
-// use App\Http\Controllers\Limbah\LimbahCairIndustriController;
-// use App\Http\Controllers\Limbah\SaranaAirLimbahDomestikController;
-// use App\Http\Controllers\Limbah\TimbulanSampahController;
-// use App\Http\Controllers\IPPU\KarbonatKacaController;
-// use App\Http\Controllers\IPPU\KarbonatKeramikController;
-// use App\Http\Controllers\IPPU\KarbonatLainnyaController;
-// use App\Http\Controllers\IPPU\KarbonatMakananController;
-// use App\Http\Controllers\IPPU\KarbonatPulpController;
-// use App\Http\Controllers\IPPU\PelumasParafinController;
-// use App\Http\Controllers\IPPU\PenggunaAcController;
-// use App\Http\Controllers\IPPU\ProduksiController;
-// use App\Http\Controllers\Energi\BahanBakarListrikController;
-// use App\Http\Controllers\Energi\EmisiBatuBaraController;
-// use App\Http\Controllers\Energi\EmisiMigasController;
-// use App\Http\Controllers\Energi\EnergiLainnyaController;
-// use App\Http\Controllers\Energi\IndustriManufakturController;
-// use App\Http\Controllers\Energi\KomersialController;
-// use App\Http\Controllers\Energi\ListrikPlnController;
-// use App\Http\Controllers\Energi\PembangkitListrikController;
-// use App\Http\Controllers\Energi\PenggunaanListrikController;
-// use App\Http\Controllers\Energi\PenyulinganController;
-// use App\Http\Controllers\Energi\RumahTanggaController;
-// use App\Http\Controllers\Energi\TransmisiDistribusiController;
-// use App\Http\Controllers\Energi\TransportasiController;
-// use App\Http\Controllers\Pertanian\HortikulturaController;
-// use App\Http\Controllers\Pertanian\KehilanganKayuController;
-// use App\Http\Controllers\Pertanian\KonsumsiPupukController;
-// use App\Http\Controllers\Pertanian\KotoranTernakController;
-// use App\Http\Controllers\Pertanian\LahanPemukimanController;
-// use App\Http\Controllers\Pertanian\PengairanSawahController;
-// use App\Http\Controllers\Pertanian\PopulasiTernakController;
-// use App\Http\Controllers\Pertanian\SawahController;
-// use App\Http\Controllers\Pertanian\SistemAirController;
-// use App\Http\Controllers\Pertanian\TanamanPanganController;
-// use App\Http\Controllers\Pertanian\TransisiController;
-
 Route::get('dashboard',[HomeController::class,'index'])->name('index');
 
 Route::name('dashboard.')->prefix('dashboard')->group(function () {
@@ -332,373 +275,4 @@ Route::name('management.')->prefix('management')->group(function () {
         Route::post('copy', [FormController::class, 'copyData'])->name('form.copy');
 
         Route::post('{inventoryYear}/{instansi?}', [FormController::class, 'approvalKonsolidasi'])->name('form.approval');
-    });
-
-// Route::name('energi.')->prefix('energi')->group(function () {
-
-//     Route::name('bahan-bakar-listrik.')->prefix('bahan-bakar-listrik')->group(function () {
-//         Route::resource('/',BahanBakarListrikController::class);
-//         Route::get('grid',[BahanBakarListrikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[BahanBakarListrikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[BahanBakarListrikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('emisi-batu-bara.')->prefix('emisi-batu-bara')->group(function () {
-//         Route::resource('/',EmisiBatuBaraController::class);
-//         Route::get('grid',[EmisiBatuBaraController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[EmisiBatuBaraController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[EmisiBatuBaraController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('emisi-migas.')->prefix('emisi-migas')->group(function () {
-//         Route::resource('/',EmisiMigasController::class);
-//         Route::get('grid',[EmisiMigasController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[EmisiMigasController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[EmisiMigasController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('energi-lainnya.')->prefix('energi-lainnya')->group(function () {
-//         Route::resource('/',EnergiLainnyaController::class);
-//         Route::get('grid',[EnergiLainnyaController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[EnergiLainnyaController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[EnergiLainnyaController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('industri-manufaktur.')->prefix('industri-manufaktur')->group(function () {
-//         Route::resource('/',IndustriManufakturController::class);
-//         Route::get('grid',[IndustriManufakturController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[IndustriManufakturController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[IndustriManufakturController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('komersial.')->prefix('komersial')->group(function () {
-//         Route::resource('/',KomersialController::class);
-//         Route::get('grid',[KomersialController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KomersialController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KomersialController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('listrik-pln.')->prefix('listrik-pln')->group(function () {
-//         Route::resource('/',ListrikPlnController::class);
-//         Route::get('grid',[ListrikPlnController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[ListrikPlnController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[ListrikPlnController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('pembangkit-listrik.')->prefix('pembangkit-listrik')->group(function () {
-//         Route::resource('/',PembangkitListrikController::class);
-//         Route::get('grid',[PembangkitListrikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PembangkitListrikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PembangkitListrikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('pengunaan-listrik.')->prefix('pengunaan-listrik')->group(function () {
-//         Route::resource('/',PenggunaanListrikController::class);
-//         Route::get('grid',[PenggunaanListrikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PenggunaanListrikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PenggunaanListrikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('penyulingan.')->prefix('penyulingan')->group(function () {
-//         Route::resource('/',PenyulinganController::class);
-//         Route::get('grid',[PenyulinganController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PenyulinganController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PenyulinganController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('rumah-tangga.')->prefix('rumah-tangga')->group(function () {
-//         Route::resource('/',RumahTanggaController::class);
-//         Route::get('grid',[RumahTanggaController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[RumahTanggaController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[RumahTanggaController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('transmisi-distribusi.')->prefix('transmisi-distribusi')->group(function () {
-//         Route::resource('/',TransmisiDistribusiController::class);
-//         Route::get('grid',[TransmisiDistribusiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[TransmisiDistribusiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[TransmisiDistribusiController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('transportasi.')->prefix('transportasi')->group(function () {
-//         Route::resource('/',TransportasiController::class);
-//         Route::get('grid',[TransportasiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[TransportasiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[TransportasiController::class,'delete'])->name('delete'); 
-//     });
-// });
-
-// Route::name('ippu.')->prefix('ippu')->group(function () {
-
-//     Route::name('karbonat-kaca.')->prefix('karbonat-kaca')->group(function () {
-//         Route::resource('/',KarbonatKacaController::class);
-//         Route::get('grid',[KarbonatKacaController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KarbonatKacaController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KarbonatKacaController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('karbonat-keramik.')->prefix('karbonat-keramik')->group(function () {
-//         Route::resource('/',KarbonatKeramikController::class);
-//         Route::get('grid',[KarbonatKeramikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KarbonatKeramikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KarbonatKeramikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('karbonat-lainnya.')->prefix('karbonat-lainnya')->group(function () {
-//         Route::resource('/',KarbonatLainnyaController::class);
-//         Route::get('grid',[KarbonatLainnyaController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KarbonatLainnyaController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KarbonatLainnyaController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('karbonat-makanan-minuman.')->prefix('karbonat-makanan-minuman')->group(function () {
-//         Route::resource('/',KarbonatMakananController::class);
-//         Route::get('grid',[KarbonatMakananController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KarbonatMakananController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KarbonatMakananController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('karbonat-pulp.')->prefix('karbonat-pulp')->group(function () {
-//         Route::resource('/',KarbonatPulpController::class);
-//         Route::get('grid',[KarbonatPulpController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KarbonatPulpController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KarbonatPulpController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('pelumas-parafin.')->prefix('pelumas-parafin')->group(function () {
-//         Route::resource('/',PelumasParafinController::class);
-//         Route::get('grid',[PelumasParafinController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PelumasParafinController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PelumasParafinController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('pengguaan-ac.')->prefix('pengguaan-ac')->group(function () {
-//         Route::resource('/',PenggunaAcController::class);
-//         Route::get('grid',[PenggunaAcController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PenggunaAcController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PenggunaAcController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('produksi.')->prefix('produksi')->group(function () {
-//         Route::resource('/',ProduksiController::class);
-//         Route::get('grid',[ProduksiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[ProduksiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[ProduksiController::class,'delete'])->name('delete'); 
-//     });
-// });
-
-// Route::name('pertanian.')->prefix('pertanian')->group(function () {
-
-//     Route::name('hortikultura.')->prefix('hortikultura')->group(function () {
-//         Route::resource('/',HortikulturaController::class);
-//         Route::get('grid',[HortikulturaController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[HortikulturaController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[HortikulturaController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('kehilangan-kayu.')->prefix('kehilangan-kayu')->group(function () {
-//         Route::resource('/',KehilanganKayuController::class);
-//         Route::get('grid',[KehilanganKayuController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KehilanganKayuController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KehilanganKayuController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('konsumsi-pupuk.')->prefix('konsumsi-pupuk')->group(function () {
-//         Route::resource('/',KonsumsiPupukController::class);
-//         Route::get('grid',[KonsumsiPupukController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KonsumsiPupukController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KonsumsiPupukController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('kotoran-ternak.')->prefix('kotoran-ternak')->group(function () {
-//         Route::resource('/',KotoranTernakController::class);
-//         Route::get('grid',[KotoranTernakController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KotoranTernakController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KotoranTernakController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('lahan-pemukiman.')->prefix('lahan-pemukiman')->group(function () {
-//         Route::resource('/',LahanPemukimanController::class);
-//         Route::get('grid',[LahanPemukimanController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[LahanPemukimanController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[LahanPemukimanController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('pengairan-sawah.')->prefix('pengairan-sawah')->group(function () {
-//         Route::resource('/',PengairanSawahController::class);
-//         Route::get('grid',[PengairanSawahController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PengairanSawahController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PengairanSawahController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('populasi-ternak.')->prefix('populasi-ternak')->group(function () {
-//         Route::resource('/',PopulasiTernakController::class);
-//         Route::get('grid',[PopulasiTernakController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PopulasiTernakController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PopulasiTernakController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('sawah.')->prefix('sawah')->group(function () {
-//         Route::resource('/',SawahController::class);
-//         Route::get('grid',[SawahController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[SawahController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[SawahController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('sistem-air.')->prefix('sistem-air')->group(function () {
-//         Route::resource('/',SistemAirController::class);
-//         Route::get('grid',[SistemAirController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[SistemAirController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[SistemAirController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('tanaman-pangan.')->prefix('tanaman-pangan')->group(function () {
-//         Route::resource('/',TanamanPanganController::class);
-//         Route::get('grid',[TanamanPanganController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[TanamanPanganController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[TanamanPanganController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('transisi.')->prefix('transisi')->group(function () {
-//         Route::resource('/',TransisiController::class);
-//         Route::get('grid',[TransisiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[TransisiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[TransisiController::class,'delete'])->name('delete'); 
-//     });
-// });
-
-// Route::name('limbah.')->prefix('limbah')->group(function () {
-
-//     Route::name('distribusi-sampah-domestik.')->prefix('distribusi-sampah-domestik')->group(function () {
-//         Route::resource('/',DistribusiSampahDomestikController::class);
-//         Route::get('grid',[DistribusiSampahDomestikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[DistribusiSampahDomestikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[DistribusiSampahDomestikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('kependudukan.')->prefix('kependudukan')->group(function () {
-//         Route::resource('/',KependudukanController::class);
-//         Route::get('grid',[KependudukanController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KependudukanController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KependudukanController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('komposisi-sampah-domestik.')->prefix('komposisi-sampah-domestik')->group(function () {
-//         Route::resource('/',KomposisiSampahDomestikController::class);
-//         Route::get('grid',[KomposisiSampahDomestikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KomposisiSampahDomestikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KomposisiSampahDomestikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('limbah-cair-industri.')->prefix('limbah-cair-industri')->group(function () {
-//         Route::resource('/',LimbahCairIndustriController::class);
-//         Route::get('grid',[LimbahCairIndustriController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[LimbahCairIndustriController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[LimbahCairIndustriController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('sarana-air-limbah-domestik.')->prefix('sarana-air-limbah-domestik')->group(function () {
-//         Route::resource('/',SaranaAirLimbahDomestikController::class);
-//         Route::get('grid',[SaranaAirLimbahDomestikController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[SaranaAirLimbahDomestikController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[SaranaAirLimbahDomestikController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('timbulan-sampah.')->prefix('timbulan-sampah')->group(function () {
-//         Route::resource('/',TimbulanSampahController::class);
-//         Route::get('grid',[TimbulanSampahController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[TimbulanSampahController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[TimbulanSampahController::class,'delete'])->name('delete'); 
-//     });
-// });
-
-// Route::name('kalkulasi.')->prefix('kalkulasi')->group(function () {
-
-//     Route::name('crf.')->prefix('crf')->group(function () {
-//         Route::resource('/',CRFController::class);
-//         Route::get('grid',[CRFController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[CRFController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[CRFController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('gcom.')->prefix('gcom')->group(function () {
-//         Route::resource('/',GCOMController::class);
-//         Route::get('grid',[GCOMController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[GCOMController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[GCOMController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('gpc.')->prefix('gpc')->group(function () {
-//         Route::resource('/',GPCController::class);
-//         Route::get('grid',[GPCController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[GPCController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[GPCController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('hitung-produsen.')->prefix('hitung-produsen')->group(function () {
-//         Route::resource('/',HitungProdusenController::class);
-//         Route::get('grid',[HitungProdusenController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[HitungProdusenController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[HitungProdusenController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('kalkulasi-emisi.')->prefix('kalkulasi-emisi')->group(function () {
-//         Route::resource('/',KalkulasiEmisiController::class);
-//         Route::get('grid',[KalkulasiEmisiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KalkulasiEmisiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KalkulasiEmisiController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('kunci-aktivitas.')->prefix('kunci-aktivitas')->group(function () {
-//         Route::resource('/',KunciAktifitasController::class);
-//         Route::get('grid',[KunciAktifitasController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KunciAktifitasController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KunciAktifitasController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('salin-aktivitas.')->prefix('salin-aktivitas')->group(function () {
-//         Route::resource('/',SalinAktifitasController::class);
-//         Route::get('grid',[SalinAktifitasController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[SalinAktifitasController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[SalinAktifitasController::class,'delete'])->name('delete'); 
-//     });
-//     Route::name('worksheet.')->prefix('worksheet')->group(function () {
-//         Route::resource('/',WorksheetController::class);
-//         Route::get('grid',[WorksheetController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[WorksheetController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[WorksheetController::class,'delete'])->name('delete'); 
-//     });
-// });
-
-// Route::name('pengaturan.')->prefix('pengaturan')->group(function () {
-
-//     Route::name('pengumuman.')->prefix('pengumuman')->group(function () {
-//         Route::resource('/',PengumumanController::class);
-//         Route::get('grid',[PengumumanController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[PengumumanController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[PengumumanController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('upload-aktifitas.')->prefix('upload-aktifitas')->group(function () {
-//         Route::resource('/',UploadAktifitasController::class);
-//         Route::get('grid',[UploadAktifitasController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[UploadAktifitasController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[UploadAktifitasController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('ef.')->prefix('ef')->group(function () {
-//         Route::resource('/',EFController::class);
-//         Route::get('grid',[EFController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[EFController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[EFController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('sumberdata-ef.')->prefix('sumberdata-ef')->group(function () {
-//         Route::resource('/',SumberDataEFController::class);
-//         Route::get('grid',[SumberDataEFController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[SumberDataEFController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[SumberDataEFController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('unit-conversion.')->prefix('unit-conversion')->group(function () {
-//         Route::resource('/',UnitKonversiController::class);
-//         Route::get('grid',[UnitKonversiController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[UnitKonversiController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[UnitKonversiController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('unit.')->prefix('unit')->group(function () {
-//         Route::resource('/',UnitController::class);
-//         Route::get('grid',[UnitController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[UnitController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[UnitController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('kategori.')->prefix('kategori')->group(function () {
-//         Route::resource('/',KategoriController::class);
-//         Route::get('grid',[KategoriController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[KategoriController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[KategoriController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('ar.')->prefix('ar')->group(function () {
-//         Route::resource('/',ARController::class);
-//         Route::get('grid',[ARController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[ARController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[ARController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('ghg.')->prefix('ghg')->group(function () {
-//         Route::resource('/',GHGController::class);
-//         Route::get('grid',[GHGController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[GHGController::class,'update'])->name('update');
-//         Route::get('delete/{id?}',[GHGController::class,'delete'])->name('delete');
-//     });
-
-//     Route::name('gwp.')->prefix('gwp')->group(function () {
-//         Route::resource('/',GWPController::class);
-//         Route::get('grid',[GWPController::class,'grid'])->name('grid');
-//         Route::get('update/{id?}',[GWPController::class,'update'])->name('update');
-//     });
-// });
-
+    });
\ No newline at end of file
diff --git a/routes/modules/pengaturan.php b/routes/modules/pengaturan.php
deleted file mode 100644
index a57b433..0000000
--- a/routes/modules/pengaturan.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use App\Http\Controllers\Pengaturan\ARController;
-use App\Http\Controllers\Pengaturan\EFController;
-use App\Http\Controllers\Pengaturan\GWPController;
-use App\Http\Controllers\Pengaturan\PengumumanController;
-use App\Http\Controllers\Pengaturan\SumberDataEFController;
-use App\Http\Controllers\Pengaturan\UnitController;
-use App\Http\Controllers\Pengaturan\UnitKonversiController;
-use App\Http\Controllers\Pengaturan\UploadAktifitasController;
\ No newline at end of file
diff --git a/routes/modules/pertanian.php b/routes/modules/pertanian.php
deleted file mode 100644
index f08d7cd..0000000
--- a/routes/modules/pertanian.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use App\Http\Controllers\Pertanian\HortikulturaController;
-use App\Http\Controllers\Pertanian\KehilanganKayuController;
-use App\Http\Controllers\Pertanian\KonsumsiPupukController;
-use App\Http\Controllers\Pertanian\KotoranTernakController;
-use App\Http\Controllers\Pertanian\LahanPemukimanController;
-use App\Http\Controllers\Pertanian\PengairanSawahController;
-use App\Http\Controllers\Pertanian\PopulasiTernakController;
-use App\Http\Controllers\Pertanian\SawahController;
-use App\Http\Controllers\Pertanian\SistemAirController;
-use App\Http\Controllers\Pertanian\TanamanPanganController;
-use App\Http\Controllers\Pertanian\TransisiController;
\ No newline at end of file