From 502aa4d797da26b2af5bf75f9f11dcb7d2027907 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Thu, 15 Jan 2026 09:45:56 +0700 Subject: [PATCH] update --- .../Controllers/Activity/FormController.php | 9 + resources/views/layouts/master.blade.php | 1 + resources/views/modules/form/action.blade.php | 20 ++- resources/views/modules/form/form.blade.php | 160 ++++++++++++++++++ resources/views/modules/form/index.blade.php | 1 + .../views/modules/form/scripts.blade.php | 26 ++- resources/views/modules/form/table.blade.php | 21 ++- routes/modules/modules.php | 1 + 8 files changed, 223 insertions(+), 16 deletions(-) create mode 100644 resources/views/modules/form/form.blade.php diff --git a/app/Http/Controllers/Activity/FormController.php b/app/Http/Controllers/Activity/FormController.php index ca321ca..5b4f57f 100644 --- a/app/Http/Controllers/Activity/FormController.php +++ b/app/Http/Controllers/Activity/FormController.php @@ -311,4 +311,13 @@ class FormController implements HasMiddleware return redirect()->back()->withErrors(['error' => 'Persetujuan Data Produsen gagal diproses. Mohon dicoba kembali.' . $e->getMessage()]); } } + + public function create($sector, $code) { + + $inventoryYear = date('Y'); + $instansi = null; + + $data = $this->data($sector, $code, $inventoryYear, $instansi); + return view('modules.form.form', $data); + } } diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 1fa5515..c4337a2 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -30,6 +30,7 @@ {{-- --}} @yield('css') diff --git a/resources/views/modules/form/action.blade.php b/resources/views/modules/form/action.blade.php index ce1aeb1..f6a24bb 100644 --- a/resources/views/modules/form/action.blade.php +++ b/resources/views/modules/form/action.blade.php @@ -2,15 +2,17 @@
-
+ {{--
-
+
--}}
-
- +
+
+ +
+ + +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ @foreach ($formDetails as $detail) + @php + $unitCode = $detail->unit_code; + $unitCategory = $unitsMap[$unitCode]->category ?? null; + @endphp +
+ {{ $detail->activity ? $detail->activity->name : 'N/A' }} + @if ($unitCategory) +
+ +
+ +
+
+ + @else + {{ $unitCode }} + @endif +
+ @endforeach + +
+ +
+
+
+
+ +
+
+
+
+ +@section('css') + +@endsection diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php index e711d34..7c8b0c8 100644 --- a/resources/views/modules/form/index.blade.php +++ b/resources/views/modules/form/index.blade.php @@ -42,6 +42,7 @@ @include('modules.form.import') + @include('modules.form.form') @if ($instansi !== 'all') @include('modules.form.aktivitas-user') @include('modules.form.metadata.index') diff --git a/resources/views/modules/form/scripts.blade.php b/resources/views/modules/form/scripts.blade.php index 9cfbcdc..00e13b6 100644 --- a/resources/views/modules/form/scripts.blade.php +++ b/resources/views/modules/form/scripts.blade.php @@ -117,12 +117,10 @@ .catch(error => console.error('Error converting value:', error)); } } - function showMetadataModal() { $('#metadataModal').modal('show'); fetchMetadata(); } - function fetchMetadata() { $('#metadataContent').hide(); $('#isLoadMetadata').show(); @@ -141,6 +139,30 @@ }); } + + function showCreateModal() { + $('#formModal').modal('show'); + fetchFormdata(); + } + + function fetchFormdata() { + $('#formContent').hide(); + $('#isLoadForm').show(); + $.ajax({ + url: '{{ route('modules.form.create', ['sector' => $form->sector, 'code' => $form->code]) }}', + type: 'GET', + success: function(data) { + $('#formContent').html(data); + $('#formContent').show(); + $('#isLoadForm').hide(); + }, + error: function(xhr, status, error) { + console.error(error); + $('#isLoadForm').hide(); + } + }); + } + function showActivityUserModal() { $('#userActivityModal').modal('show'); fetchUserActivity(); diff --git a/resources/views/modules/form/table.blade.php b/resources/views/modules/form/table.blade.php index 02b3b1f..d838cda 100644 --- a/resources/views/modules/form/table.blade.php +++ b/resources/views/modules/form/table.blade.php @@ -15,9 +15,9 @@ @endphp {{ $detail->activity ? $detail->activity->name : 'N/A' }} -

+ @if ($unitCategory) - + --}} @else {{ $unitCode }} @endif @@ -54,11 +54,16 @@ : ''; @endphp - +
+ +
+ {{ $detail->unit_code }} +
+
{{-- --}} diff --git a/routes/modules/modules.php b/routes/modules/modules.php index a5978e2..4795f14 100644 --- a/routes/modules/modules.php +++ b/routes/modules/modules.php @@ -171,6 +171,7 @@ Route::name('management.')->prefix('management')->group(function () { Route::post('ef/add_ef_source', [EfController::class, 'storeEfSource'])->name('pengaturan.ef.addEfSource'); // Additional Function for Dynamic Form Routing + Route::get('form/create/{sector}/{code}', [FormController::class, 'create'])->name('form.create'); Route::resource('form/metadata', FormMetadataController::class)->only('index', 'store', 'destroy')->names('form.metadata'); Route::get('form/aktivitas_user', [FormController::class, 'getUserActivities'])->name('form.aktivitasUser');