v1.5.24 Added archive function
This commit is contained in:
@@ -47,7 +47,11 @@
|
||||
<tbody>
|
||||
@foreach($events as $event)
|
||||
<tr id="row_{{ $event->id }}">
|
||||
<td>{{ $event->name }}</td>
|
||||
@if(\Carbon\Carbon::now() > date("Y-m-d H:i:s", strtotime($event->date)))
|
||||
<td><strong style="color: #d15e5e">[Arkiveret]</strong> Ugentligt event for uge {{ $event->name}}</td>
|
||||
@else
|
||||
<td><strong style="color: #5ed174">[Aktiv]</strong> Ugentligt event for uge {{ $event->name}}</td>
|
||||
@endif
|
||||
<td>{{ $event->accountable }}</td>
|
||||
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
|
||||
<td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
|
||||
@@ -69,6 +73,7 @@
|
||||
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id2">
|
||||
<thead>
|
||||
<th>Uge</th>
|
||||
<th>Multiple events slut dato</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
@if(auth()->user()->can('event.edit'))
|
||||
@@ -80,9 +85,15 @@
|
||||
@endif
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event)
|
||||
@foreach(\App\MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events.multiple_events_parent_id', 'multiple_events_parent.id', 'multiple_events_parent.week', 'multiple_events_parent.resource_id', 'multiple_events_parent.created_at', 'multiple_events_parent.updated_at')->selectRaw('multiple_events_parent.*, max(date) as date')->get() as $event)
|
||||
<tr id="row2_{{ $event->id }}">
|
||||
<td>{{ $event->week}}</td>
|
||||
@if(\Carbon\Carbon::now() > date("Y-m-d H:i:s", strtotime($event->date)))
|
||||
<td><strong style="color: #d15e5e">[Arkiveret]</strong> Ugentligt event for uge {{ $event->week}}</td>
|
||||
@else
|
||||
<td><strong style="color: #5ed174">[Aktiv]</strong> Ugentligt event for uge {{ $event->week}}</td>
|
||||
@endif
|
||||
<td>{{date("Y-m-d H:i", strtotime($event->date))}}</td>
|
||||
<!---->
|
||||
<td><a href="{{ route("multiple-events.signups", ["multipleEvent" => $event->id]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
|
||||
<td><a id="preview" onclick="modalMultiEventContent({{$event->id}})" style="cursor: pointer"><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
<td><a href="{{ route("multiPdf.genPDF", [ "multiEvent" => $event->id ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Ugentligt aktivitet - Vis
|
||||
Ugentligt aktivitet - Opret
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Rediger ugentligt aktivitet - Vis
|
||||
Ugentligt aktivitet - Rediger
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<table class="tbl letterSpaceTable fixOverflow" id="table_id">
|
||||
<thead>
|
||||
<th>Navn</th>
|
||||
<th>Nyheds type</th>
|
||||
<th>Udløbsdato</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||
@if(auth()->user()->can('news.edit'))
|
||||
@@ -36,6 +37,7 @@
|
||||
@foreach($news as $new)
|
||||
<tr id="row_{{ $new->id }}">
|
||||
<td>{{$new->subname}}</td>
|
||||
<td>{{$new->type}}</td>
|
||||
@if($new->news_expiration_date !== null)
|
||||
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($new->news_expiration_date))->format('d/m/Y \k\l\. H:i') }}</td>
|
||||
@else
|
||||
@@ -111,7 +113,7 @@
|
||||
$(document).ready( function () {
|
||||
$('#table_id').DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1, -2, -3] }
|
||||
{ orderable: false, targets: [-1, -2, -3, -4] }
|
||||
]
|
||||
});
|
||||
});
|
||||
|
||||
@@ -88,8 +88,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
||||
@endif
|
||||
@endforeach
|
||||
@else
|
||||
|
||||
@@ -128,6 +128,7 @@
|
||||
@foreach($news as $new)
|
||||
<!--Code to list events-->
|
||||
@if($new->type == 'News')<!--Code that prints news-->
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($new->news_expiration_date)))
|
||||
<div class="card">
|
||||
<div class="img"><img src="{{URL::asset('/images/icons/news.svg')}}" alt="News:"></div>
|
||||
<div class="title">
|
||||
@@ -160,7 +161,9 @@
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@elseif($new->type == 'Activity')<!--Code that prints events-->
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($new->news_expiration_date)))
|
||||
<div class="card">
|
||||
<div class="img"><a href="{{ route('events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter:"></a></div>
|
||||
<div class="title">{{ $new->subname }}
|
||||
@@ -197,7 +200,9 @@
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
@elseif($new->type == 'Guide')<!--Code that prints guides-->
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($new->news_expiration_date)))
|
||||
<div class="card">
|
||||
<div class="img"><a href="{{ route('guides.index') }}"><img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Vejledninger:"></a></div>
|
||||
<div class="title">{{ $new->subname }}
|
||||
@@ -217,10 +222,12 @@
|
||||
@endif {{-- Else if it's a menu or news, then don't show a button at bottom --}}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<!---->
|
||||
@elseif($new->type == 'MultipleEvent')
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i:s", strtotime($new->news_expiration_date)))
|
||||
<div class="card">
|
||||
<div class="img"><a href="{{ route('multiple-events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="aktiviteter:"></a></div>
|
||||
<div class="img"><a href="{{ route('multiple-events.index') }}"><img src="{{URL::asset('/images/icons/calendar2.svg')}}" alt="aktiviteter:"></a></div>
|
||||
<div class="title">Ugentlig aktiviteter for uge {{ $new->subname }}
|
||||
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
|
||||
</div>
|
||||
@@ -236,10 +243,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
|
||||
|
||||
@endforeach
|
||||
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
|
||||
<p class="text-center">{{__('msg.ingennyheder')}}</p>
|
||||
|
||||
Reference in New Issue
Block a user