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 @@
-
- {{--
- @include('form.lock') -
--}} - {{--
- -
--}} -
- @include('form.approve') -
-
- -
-
- -
- -
- -
-
-
-
+
- - {{-- @if ($agencies->isNotEmpty()) --}} -
+
+
+
@@ -64,7 +31,31 @@
- {{-- @endif --}} +
+
+ @include('modules.form.approve') +
+
+ +
+
+ +
+ +
+ +
+
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 @@