shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report edit and fields input name and edit fields fixed

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-01-20 10:34:10 +03:00
parent 569f6c314f
commit 34cf1c368d
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
resources/views/common/reports/edit.blade.php
View File

@ -19,23 +19,42 @@
<div class="row"> <div class="row">
{{ Form::textGroup('name', trans('general.name'), 'font') }} {{ Form::textGroup('name', trans('general.name'), 'font') }}
{{ Form::selectGroup('class', trans_choice('general.types', 1), 'bars', $classes, $report->class, ['required' => 'required', 'change' => 'onChangeClass']) }} {{ Form::textGroup('class_disabled', trans_choice('general.types', 1), 'bars', ['required' => 'required', 'disabled' => 'disabled'], $classes[$report->class]) }}
{{ Form::hidden('class', $report->class) }}
{{ Form::textareaGroup('description', trans('general.description'), null, null, ['rows' => '3', 'required' => 'required']) }} {{ Form::textareaGroup('description', trans('general.description'), null, null, ['rows' => '3', 'required' => 'required']) }}
{{ Form::hidden('report', 'invalid', ['data-field' => 'settings']) }}
@foreach($class->getFields() as $field) @foreach($class->getFields() as $field)
@php $type = $field['type']; @endphp @php $type = $field['type']; @endphp
@if (($type == 'textGroup') || ($type == 'emailGroup') || ($type == 'passwordGroup')) @if (($type == 'textGroup') || ($type == 'emailGroup') || ($type == 'passwordGroup'))
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], $field['icon'], $field['attributes']) }} {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([
'data-field' => 'settings'
],
$field['attributes'])
) }}
@elseif ($type == 'textareaGroup') @elseif ($type == 'textareaGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title']) }} {{ Form::$type($field['name'], $field['title']) }}
@elseif ($type == 'selectGroup') @elseif ($type == 'selectGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, $field['attributes']) }} {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, array_merge([
'data-field' => 'settings'
],
$field['attributes'])
) }}
@elseif ($type == 'radioGroup') @elseif ($type == 'radioGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : 1, $field['enable'], $field['disable'], $field['attributes']) }} {{ Form::$type($field['name'], $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : 1, $field['enable'], $field['disable'], array_merge([
'data-field' => 'settings'
],
$field['attributes'])
) }}
@elseif ($type == 'checkboxGroup') @elseif ($type == 'checkboxGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], $field['items'], $report->settings->{$field['name']}, $field['id'], $field['attributes']) }} {{ Form::$type($field['name'], $field['title'], $field['items'], $report->settings->{$field['name']}, $field['id'], array_merge([
'data-field' => 'settings'
],
$field['attributes'])
) }}
@endif @endif
@endforeach @endforeach
</div> </div>
@ -51,9 +70,5 @@
@endsection @endsection
@push('scripts_start') @push('scripts_start')
<script type="text/javascript">
var class = '';
</script>
<script src="{{ asset('public/js/common/reports.js?v=' . version('short')) }}"></script> <script src="{{ asset('public/js/common/reports.js?v=' . version('short')) }}"></script>
@endpush @endpush

8
resources/views/partials/reports/fields.blade.php
View File

@ -2,13 +2,13 @@
@php $type = $field['type']; @endphp @php $type = $field['type']; @endphp
@if (($type == 'textGroup') || ($type == 'emailGroup') || ($type == 'passwordGroup')) @if (($type == 'textGroup') || ($type == 'emailGroup') || ($type == 'passwordGroup'))
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], $field['icon'], array_merge([ {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], ],
$field['attributes']) $field['attributes'])
) }} ) }}
@elseif ($type == 'textareaGroup') @elseif ($type == 'textareaGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title']) }} {{ Form::$type($field['name'], $field['title']) }}
@elseif ($type == 'selectGroup') @elseif ($type == 'selectGroup')
{{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $field['selected'], array_merge([ {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $field['selected'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
@ -16,13 +16,13 @@
$field['attributes']) $field['attributes'])
) }} ) }}
@elseif ($type == 'radioGroup') @elseif ($type == 'radioGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], 1, $field['enable'], $field['disable'], array_merge([ {{ Form::$type($field['name'], $field['title'], 1, $field['enable'], $field['disable'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], ],
$field['attributes']) $field['attributes'])
) }} ) }}
@elseif ($type == 'checkboxGroup') @elseif ($type == 'checkboxGroup')
{{ Form::$type('settings[' . $field['name'] . ']', $field['title'], $field['items'], $field['value'], $field['id'], array_merge([ {{ Form::$type($field['name'], $field['title'], $field['items'], $field['value'], $field['id'], array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], ],
$field['attributes']) $field['attributes'])