diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index 5809a408f..2dbee43ed 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -37,6 +37,13 @@ ) }} @elseif ($type == 'textareaGroup') {{ Form::$type($field['name'], $field['title']) }} + @elseif ($type == 'dateGroup') + {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([ + 'data-field' => 'settings', + ], + $field['attributes']), + isset($class->model->settings->{$field['name']}) ? $class->model->settings->{$field['name']}: null + ) }} @elseif ($type == 'selectGroup') {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, array_merge([ 'data-field' => 'settings' diff --git a/resources/views/partials/reports/fields.blade.php b/resources/views/partials/reports/fields.blade.php index 440793ec7..7a47a5ea0 100644 --- a/resources/views/partials/reports/fields.blade.php +++ b/resources/views/partials/reports/fields.blade.php @@ -9,6 +9,12 @@ ) }} @elseif ($type == 'textareaGroup') {{ Form::$type($field['name'], $field['title']) }} + @elseif ($type == 'dateGroup') + {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([ + 'model' => 'form.settings'.'.'.$field['name'] + ], + $field['attributes']) + ) }} @elseif ($type == 'selectGroup') {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $field['selected'], array_merge([ 'data-field' => 'settings'