From 909f03cb9a7ac629e5622ccf66d44c688636c2a4 Mon Sep 17 00:00:00 2001 From: Irwan Cahyono Date: Wed, 19 Aug 2026 00:00:14 +0700 Subject: [PATCH] update project --- config/app.php | 2 + resources/views/auth/login.blade.php | 27 +- resources/views/layout/header.blade.php | 2 +- resources/views/layout/main.blade.php | 6 + .../views/layout/sidebar_monev.blade.php | 283 ++++++++++++++++++ resources/views/layout/sidebar_pro.blade.php | 159 ++++++++++ .../framework/view-aktivitas.blade.php | 40 ++- .../program/framework/view-tujuan.blade.php | 76 +++-- .../views/program/framework/view.blade.php | 18 +- 9 files changed, 568 insertions(+), 45 deletions(-) create mode 100644 resources/views/layout/sidebar_monev.blade.php create mode 100644 resources/views/layout/sidebar_pro.blade.php diff --git a/config/app.php b/config/app.php index 0392ab3..cf226be 100644 --- a/config/app.php +++ b/config/app.php @@ -124,4 +124,6 @@ return [ ], 'force_https' => env('FORCE_HTTPS', false), + + 'desc' => env('APP_DESC', 'Laravel'), ]; diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 27468cb..7f2e66d 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,6 +5,7 @@
+ @if(config('app.name') == 'AgroMonev') AgroMonev + @elseif(config('app.name') == 'AgroPro') + + AgroPro + @endif
-

Selamat datang di AgroMonev!

+

Selamat datang di {{ config('app.name') }}!

Silakan masuk ke akun Anda

@if ($errors->any())
diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index b0f3656..23c0f75 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -15,7 +15,7 @@ name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - AgroMonev | {{ $title ?? 'Database Petani' }} + {{ config('app.name') }} | {{ $title ?? config('app.desc') }} diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index 25c5a1e..a436578 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -4,7 +4,13 @@
+ @if(config('app.name') == 'AgroMonev') + @include('layout.sidebar_monev') + @elseif(config('app.name') == 'AgroPro') + @include('layout.sidebar_pro') + @else @include('layout.sidebar') + @endif diff --git a/resources/views/layout/sidebar_monev.blade.php b/resources/views/layout/sidebar_monev.blade.php new file mode 100644 index 0000000..1f72d3d --- /dev/null +++ b/resources/views/layout/sidebar_monev.blade.php @@ -0,0 +1,283 @@ + + +
+ + + + +
diff --git a/resources/views/layout/sidebar_pro.blade.php b/resources/views/layout/sidebar_pro.blade.php new file mode 100644 index 0000000..a9a3d93 --- /dev/null +++ b/resources/views/layout/sidebar_pro.blade.php @@ -0,0 +1,159 @@ + + +
+ + + + +
diff --git a/resources/views/program/framework/view-aktivitas.blade.php b/resources/views/program/framework/view-aktivitas.blade.php index b8a952d..c5faea7 100644 --- a/resources/views/program/framework/view-aktivitas.blade.php +++ b/resources/views/program/framework/view-aktivitas.blade.php @@ -1,12 +1,21 @@ @forelse($tujuan->aktivitas as $aktivitas) + @php + $aktivitasRowspan = max($aktivitas->target->count(), 1); + + $firstAktivitasRow = true; + @endphp @forelse($aktivitas->target as $targetAktivitas) - {{ $transformasi->kode }} {{ $transformasi->nama }} (ID: {{ $transformasi->id }}) - {{ $aktivitas->kode }} {{ $aktivitas->nama }} (ID: {{ $aktivitas->id }}) - {{ $aktivitas->deskripsi }} - {{ $aktivitas->indikator }} - {{ $targetAktivitas->variabel }} (ID: {{ $targetAktivitas->id }}, Tipe: {{ $targetAktivitas->tipe }}, Realiasasi: {{ $targetAktivitas->tipe_realisasi }}) - + @if($firstAktivitasRow) + {{ $aktivitas->kode }} {{ $aktivitas->nama }} + {{ $aktivitas->deskripsi }} + {{ $aktivitas->indikator }} + @php + $firstAktivitasRow = false; + @endphp + @endif + {{ $targetAktivitas->variabel }} + @if($targetAktivitas->tipe === 'integer') {{ $targetAktivitas->target_integer }} @elseif($targetAktivitas->tipe === 'float') @@ -15,7 +24,7 @@ {{ $targetAktivitas->target_boolean ? 'Ya' : 'Tidak' }} @endif - + @if($targetAktivitas->tipe === 'integer') {{ $targetAktivitas->baseline_integer }} @elseif($targetAktivitas->tipe === 'float') @@ -24,7 +33,7 @@ {{ $targetAktivitas->baseline_boolean ? 'Ya' : 'Tidak' }} @endif - +