diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index 5aff84d..c1e4e2e 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -157,7 +157,7 @@ class SyncController extends Controller */ public function getFormularies() { - return FormularyResource::collection(Formulary::all()); + return FormularyResource::collection(Formulary::query()->orderBy('order')->get()); } /** diff --git a/resources/views/bo/pages/formularies/form.blade.php b/resources/views/bo/pages/formularies/form.blade.php index 83fa247..7341b52 100644 --- a/resources/views/bo/pages/formularies/form.blade.php +++ b/resources/views/bo/pages/formularies/form.blade.php @@ -1,38 +1,39 @@
{{-- SELECT INPUT COMPONENT --}}
+ {{-- FIXME: OLD VALUES not PASSED --}} @php - if(old('type') || old('name') || old('placeholder') || old('details') || old('is_visible') || old('required')) { - $oldModel = []; - $oldModel["type"] = intval(old('type')); - $oldModel["name"] = old('name'); - $oldModel["placeholder"] = old('placeholder'); - $oldModel["details"] = old('details'); - $oldModel["is_visible"] = old('is_visible'); - $oldModel["required"] = old('required'); - } - $data = [ - 'id' => 'FormulariesSelectInput', - 'inputType' => \App\Enums\Formularies\InputTypeEnum::toArray(), - 'inputStatus' => \App\Enums\Formularies\InputStatusEnum::toArray(), - 'model' => $oldModel ?? $formularyModel ?? null, - 'errors' => $errors->getBag('default')->getMessages() ?? [] - ]; + if (old('type') || old('name') || old('placeholder') || old('details') || old('is_visible') || old('required')) { + $oldModel = []; + $oldModel['type'] = intval(old('type')); + $oldModel['name'] = old('name'); + $oldModel['placeholder'] = old('placeholder'); + $oldModel['details'] = old('details'); + $oldModel['is_visible'] = old('is_visible'); + $oldModel['required'] = old('required'); + } + $data = [ + 'id' => 'FormulariesSelectInput', + 'inputType' => \App\Enums\Formularies\InputTypeEnum::toArray(), + 'inputStatus' => \App\Enums\Formularies\InputStatusEnum::toArray(), + 'model' => $oldModel ?? ($formularyModel ?? null), + 'errors' => $errors->getBag('default')->getMessages() ?? [], + ]; @endphp
@push('scripts') - + submitClone.addEventListener('click', (event) => { + event.preventDefault(); + submit.click(''); + }) + }); + @endpush