Marco/Feuerwehr-eppingen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Korrektur

Browse Source 
- Fehler beim Erstellen von Tags behoben
- Deaktivierte Fahrzeuge werden im Formular für Einsätze nicht mehr angezeigt
This commit is contained in:
Marco Glietsch 2024-01-03 21:39:20 +01:00
parent d1db3b1d7b
commit 337da780bb
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/ExtendedController.php
View File

@ -1709,8 +1709,12 @@ class ExtendedController extends Controller
->select(DB::raw('YEAR(`datetime`) as year')) ->select(DB::raw('YEAR(`datetime`) as year'))
->where('type', $this->modelType) ->where('type', $this->modelType)
->orderBy('datetime', 'DESC') ->orderBy('datetime', 'DESC')
->groupBy(DB::raw('YEAR(`datetime`)')) ->groupBy(DB::raw('YEAR(`datetime`)'));
->get(); if(key_exists('limit', $options))
{
$years = $years->limit($options['limit']);
}
$years = $years->get();
$filter['label'] = $options['label']; $filter['label'] = $options['label'];
$filter['name'] = $options['name']; $filter['name'] = $options['name'];

4
app/Http/Controllers/OperationController.php
View File

@ -75,6 +75,10 @@ class OperationController extends PostController
'column' => 'type', 'column' => 'type',
'value' => 'fahrzeug', 'value' => 'fahrzeug',
], ],
[
'column' => 'published',
'value' => '1,'
]
], ],
] ]
], ],

3
app/Http/Controllers/ServiceController.php
View File

@ -168,7 +168,8 @@ class ServiceController extends PostController
'year' => [ 'year' => [
'type' => 'select', 'type' => 'select',
'label' => __('general.year'), 'label' => __('general.year'),
'name' => strtolower(__('general.year')) 'name' => strtolower(__('general.year')),
'limit' => 5,
], ],
] ]
]; ];

24
resources/views/inc/admin/crudModal.blade.php
View File

@ -107,17 +107,19 @@
{{ Form::open(array('id' => 'formPublish')) }} {{ Form::open(array('id' => 'formPublish')) }}
{{ Form::checkbox('publish_website', 'true', ($model->published == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_website')) }} {{ Form::checkbox('publish_website', 'true', ($model->published == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_website')) }}
{{ Form::label('publish_website', 'Internetseite') }}<br> {{ Form::label('publish_website', 'Internetseite') }}<br>
@if($model->hasGetMutator('HasPublications')) @if($model->isPost)
@if($model->hasPublications) @if($model->hasGetMutator('HasPublications'))
@if($model->type != 'dienst') @if($model->hasPublications)
{{ Form::checkbox('publish_facebook', 'true', ($model->publication('facebook')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_facebook', ($model->publication('facebook')->isPublished() ? 'disabled' : ''))) }} @if($model->type != 'dienst')
{{ Form::label('publish_facebook', 'Facebook '.($model->publication('facebook')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('facebook')->date_to_publish).')')) }}<br> {{ Form::checkbox('publish_facebook', 'true', ($model->publication('facebook')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_facebook', ($model->publication('facebook')->isPublished() ? 'disabled' : ''))) }}
{{ Form::checkbox('publish_twitter', 'true', ($model->publication('twitter')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_twitter', ($model->publication('twitter')->isPublished() ? 'disabled' : ''))) }} {{ Form::label('publish_facebook', 'Facebook '.($model->publication('facebook')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('facebook')->date_to_publish).')')) }}<br>
{{ Form::label('publish_twitter', 'Twitter '.($model->publication('twitter')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('twitter')->date_to_publish).')')) }}<br> {{ Form::checkbox('publish_twitter', 'true', ($model->publication('twitter')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_twitter', ($model->publication('twitter')->isPublished() ? 'disabled' : ''))) }}
@endif {{ Form::label('publish_twitter', 'Twitter '.($model->publication('twitter')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('twitter')->date_to_publish).')')) }}<br>
{{ Form::checkbox('publish_stadtanzeiger', 'true', ($model->publication('stadtanzeiger')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_stadtanzeiger', ($model->publication('stadtanzeiger')->isPublished() ? 'disabled' : ''))) }} @endif
{{ Form::label('publish_stadtanzeiger', 'Stadtanzeiger '.($model->publication('stadtanzeiger')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('stadtanzeiger')->date_to_publish).')')) }}<br> {{ Form::checkbox('publish_stadtanzeiger', 'true', ($model->publication('stadtanzeiger')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_stadtanzeiger', ($model->publication('stadtanzeiger')->isPublished() ? 'disabled' : ''))) }}
@endif {{ Form::label('publish_stadtanzeiger', 'Stadtanzeiger '.($model->publication('stadtanzeiger')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('stadtanzeiger')->date_to_publish).')')) }}<br>
@endif
@endif
@endif @endif
{{ Form::close() }} {{ Form::close() }}
</div> </div>