v1.5.24 Added archive function
This commit is contained in:
parent
f865213763
commit
ad3a1e7570
|
@ -82,6 +82,7 @@ class EventController extends Controller
|
||||||
$events = Event::query()->get();
|
$events = Event::query()->get();
|
||||||
|
|
||||||
if($request->newsoption == true){
|
if($request->newsoption == true){
|
||||||
|
$events = Event::query()->get();
|
||||||
$news = new News();
|
$news = new News();
|
||||||
|
|
||||||
$news->name = "Ny aktivitet";
|
$news->name = "Ny aktivitet";
|
||||||
|
@ -90,6 +91,7 @@ class EventController extends Controller
|
||||||
$news->type_id = '3';
|
$news->type_id = '3';
|
||||||
$news->content = $event->description;
|
$news->content = $event->description;
|
||||||
$news->resource_id = $event->resource_id;
|
$news->resource_id = $event->resource_id;
|
||||||
|
$news->news_expiration_date = $events[0]->date;
|
||||||
|
|
||||||
NewsController::storeAndGet($news);
|
NewsController::storeAndGet($news);
|
||||||
}
|
}
|
||||||
|
@ -190,6 +192,7 @@ class EventController extends Controller
|
||||||
$news->type_id = '3';
|
$news->type_id = '3';
|
||||||
$news->resource_id = $event->resource_id;
|
$news->resource_id = $event->resource_id;
|
||||||
$news->content = "<p>" . $this->closetags(substr($event->description, 0, 300));
|
$news->content = "<p>" . $this->closetags(substr($event->description, 0, 300));
|
||||||
|
$news->news_expiration_date = $event->date;
|
||||||
|
|
||||||
NewsController::storeAndGet($news);
|
NewsController::storeAndGet($news);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,12 @@ class MultipleEventsController extends Controller
|
||||||
{
|
{
|
||||||
$multiEvents = 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();
|
$multiEvents = 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();
|
||||||
|
|
||||||
|
/*
|
||||||
|
$multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
|
||||||
|
->groupBy('multiple_events_parent_id')->orderBy('multiple_events.date', 'desc')
|
||||||
|
->selectRaw('multiple_events_parent.*, max(date) as date')
|
||||||
|
->get();
|
||||||
|
*/
|
||||||
return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
|
return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,7 +98,11 @@ class MultipleEventsController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
//creates a new Event model with the given parameter
|
//creates a new Event model with the given parameter
|
||||||
$event = new MultipleEventsParent($requestBody);
|
$multiEventsGetEndDate = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
|
||||||
|
->groupBy('multiple_events_parent_id')
|
||||||
|
->orderBy('multiple_events.date', 'desc')
|
||||||
|
->selectRaw('multiple_events_parent.*, max(date) as date')
|
||||||
|
->get();
|
||||||
|
|
||||||
$multiEvents = MultipleEventsParent::query()->get();
|
$multiEvents = MultipleEventsParent::query()->get();
|
||||||
if($request->newsoption == true){
|
if($request->newsoption == true){
|
||||||
|
@ -103,6 +113,7 @@ class MultipleEventsController extends Controller
|
||||||
$news->type_id = '5';
|
$news->type_id = '5';
|
||||||
$news->content = "Den ugentlige aktivitets plan for uge ".$request->week." er her!";
|
$news->content = "Den ugentlige aktivitets plan for uge ".$request->week." er her!";
|
||||||
$news->resource_id = $request->resource_id;
|
$news->resource_id = $request->resource_id;
|
||||||
|
$news->news_expiration_date = $multiEventsGetEndDate[0]->date;
|
||||||
NewsController::storeAndGet($news);
|
NewsController::storeAndGet($news);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,6 +208,13 @@ class MultipleEventsController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$multiEventsGetEndDate = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')
|
||||||
|
->groupBy('multiple_events_parent_id')
|
||||||
|
->orderBy('multiple_events.date', 'desc')
|
||||||
|
->selectRaw('multiple_events_parent.*, max(date) as date')
|
||||||
|
->get();
|
||||||
|
|
||||||
if ($request->newsoption == true) {
|
if ($request->newsoption == true) {
|
||||||
$news = new News();
|
$news = new News();
|
||||||
$news->name = "Opdateret ugentlig aktivitet";
|
$news->name = "Opdateret ugentlig aktivitet";
|
||||||
|
@ -205,6 +223,7 @@ class MultipleEventsController extends Controller
|
||||||
$news->type_id = '5';
|
$news->type_id = '5';
|
||||||
$news->content = "Den ugentlige aktivitets plan for uge " . $request->week . " er opdateret!";
|
$news->content = "Den ugentlige aktivitets plan for uge " . $request->week . " er opdateret!";
|
||||||
$news->resource_id = $request->resource_id;
|
$news->resource_id = $request->resource_id;
|
||||||
|
$news->news_expiration_date = $multiEventsGetEndDate[0]->date;
|
||||||
|
|
||||||
NewsController::storeAndGet($news);
|
NewsController::storeAndGet($news);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,8 +33,12 @@ class NewsController extends Controller
|
||||||
*/
|
*/
|
||||||
public function index(Request $request)
|
public function index(Request $request)
|
||||||
{
|
{
|
||||||
$news = News::query()->orderBy('id', 'desc')->get();
|
//Edit is fuck cuz of my inner join, has to get fixed at som point
|
||||||
|
$news = News::query()
|
||||||
|
->join("news_types", "news.type_id", "=", "news_types.id")
|
||||||
|
->orderBy('id', 'desc')
|
||||||
|
->select('news.*', 'news_types.type')
|
||||||
|
->get();
|
||||||
return Response::detect("news.index", [ "news" => $news ]);
|
return Response::detect("news.index", [ "news" => $news ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,11 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach($events as $event)
|
@foreach($events as $event)
|
||||||
<tr id="row_{{ $event->id }}">
|
<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>{{ $event->accountable }}</td>
|
||||||
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</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>
|
<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">
|
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id2">
|
||||||
<thead>
|
<thead>
|
||||||
<th>Uge</th>
|
<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/eye.svg') }}" alt="Show"></th>
|
||||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||||
@if(auth()->user()->can('event.edit'))
|
@if(auth()->user()->can('event.edit'))
|
||||||
|
@ -80,9 +85,15 @@
|
||||||
@endif
|
@endif
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<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 }}">
|
<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 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 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>
|
<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")
|
@extends("admin.layout.header")
|
||||||
|
|
||||||
@section("title")
|
@section("title")
|
||||||
Ugentligt aktivitet - Vis
|
Ugentligt aktivitet - Opret
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section("path")
|
@section("path")
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
@extends("admin.layout.header")
|
@extends("admin.layout.header")
|
||||||
|
|
||||||
@section("title")
|
@section("title")
|
||||||
Rediger ugentligt aktivitet - Vis
|
Ugentligt aktivitet - Rediger
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section("path")
|
@section("path")
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
<table class="tbl letterSpaceTable fixOverflow" id="table_id">
|
<table class="tbl letterSpaceTable fixOverflow" id="table_id">
|
||||||
<thead>
|
<thead>
|
||||||
<th>Navn</th>
|
<th>Navn</th>
|
||||||
|
<th>Nyheds type</th>
|
||||||
<th>Udløbsdato</th>
|
<th>Udløbsdato</th>
|
||||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/preview.svg') }}" alt="preview"></th>
|
||||||
@if(auth()->user()->can('news.edit'))
|
@if(auth()->user()->can('news.edit'))
|
||||||
|
@ -36,6 +37,7 @@
|
||||||
@foreach($news as $new)
|
@foreach($news as $new)
|
||||||
<tr id="row_{{ $new->id }}">
|
<tr id="row_{{ $new->id }}">
|
||||||
<td>{{$new->subname}}</td>
|
<td>{{$new->subname}}</td>
|
||||||
|
<td>{{$new->type}}</td>
|
||||||
@if($new->news_expiration_date !== null)
|
@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>
|
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($new->news_expiration_date))->format('d/m/Y \k\l\. H:i') }}</td>
|
||||||
@else
|
@else
|
||||||
|
@ -111,7 +113,7 @@
|
||||||
$(document).ready( function () {
|
$(document).ready( function () {
|
||||||
$('#table_id').DataTable({
|
$('#table_id').DataTable({
|
||||||
columnDefs: [
|
columnDefs: [
|
||||||
{ orderable: false, targets: [-1, -2, -3] }
|
{ orderable: false, targets: [-1, -2, -3, -4] }
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -88,8 +88,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@else
|
|
||||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@else
|
@else
|
||||||
|
|
|
@ -128,6 +128,7 @@
|
||||||
@foreach($news as $new)
|
@foreach($news as $new)
|
||||||
<!--Code to list events-->
|
<!--Code to list events-->
|
||||||
@if($new->type == 'News')<!--Code that prints news-->
|
@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="card">
|
||||||
<div class="img"><img src="{{URL::asset('/images/icons/news.svg')}}" alt="News:"></div>
|
<div class="img"><img src="{{URL::asset('/images/icons/news.svg')}}" alt="News:"></div>
|
||||||
<div class="title">
|
<div class="title">
|
||||||
|
@ -160,7 +161,9 @@
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
@elseif($new->type == 'Activity')<!--Code that prints events-->
|
@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="card">
|
||||||
<div class="img"><a href="{{ route('events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter:"></a></div>
|
<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 }}
|
<div class="title">{{ $new->subname }}
|
||||||
|
@ -197,7 +200,9 @@
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
@elseif($new->type == 'Guide')<!--Code that prints guides-->
|
@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="card">
|
||||||
<div class="img"><a href="{{ route('guides.index') }}"><img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Vejledninger:"></a></div>
|
<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 }}
|
<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 --}}
|
@endif {{-- Else if it's a menu or news, then don't show a button at bottom --}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
<!---->
|
<!---->
|
||||||
@elseif($new->type == 'MultipleEvent')
|
@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="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 }}
|
<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>
|
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -236,10 +243,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@endforeach
|
@endforeach
|
||||||
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
|
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
|
||||||
<p class="text-center">{{__('msg.ingennyheder')}}</p>
|
<p class="text-center">{{__('msg.ingennyheder')}}</p>
|
||||||
|
|
Loading…
Reference in New Issue