v1.5.23 added when a multi or just a event is achieve remove it from index pages
This commit is contained in:
parent
322dbaf31e
commit
3908a6b00c
|
|
@ -35,7 +35,6 @@ class EventController extends Controller
|
|||
public function index(Request $request)
|
||||
{
|
||||
$events = Event::query()->orderBY('date' , 'asc')->get();
|
||||
|
||||
//returns the function with events index page and a parameter of events.
|
||||
//also Response::detect checks screen size to determine if user is on a computer or mobile.
|
||||
return Response::detect("events.index", [ "events" => $events]);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\MultipleEvents;
|
||||
use App\MultipleEventsParent;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
|
@ -35,7 +36,8 @@ class MultipleEventsController extends Controller
|
|||
*/
|
||||
public function index()
|
||||
{
|
||||
$multiEvents = MultipleEventsParent::query()->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]);
|
||||
}
|
||||
|
||||
|
|
@ -116,7 +118,7 @@ class MultipleEventsController extends Controller
|
|||
*/
|
||||
public function show($id)
|
||||
{
|
||||
$multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->get();
|
||||
$multiEvents = MultipleEvents::where('multiple_events.multiple_events_parent_id', '=', $id)->orderBy('date')->get();
|
||||
$multiEventParent = MultipleEventsParent::find($id);
|
||||
|
||||
return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]);
|
||||
|
|
@ -266,14 +268,6 @@ class MultipleEventsController extends Controller
|
|||
|
||||
public function genPDF($Id){
|
||||
$multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("multiple_events_parent.id", "=", $Id)->orderBy('multiple_events.date', 'asc')->get();
|
||||
$var = 149;
|
||||
|
||||
|
||||
/*$multiEvent->name = substr($multiEvent->name, 0, $var);
|
||||
$multiEvent->accountable = substr($multiEvent->accountable, 0, $var);
|
||||
$multiEvent->description = substr($multiEvent->description, 0, $var);
|
||||
$multiEvent->date = substr($multiEvent->date, 0, $var);
|
||||
*/
|
||||
$pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]);
|
||||
|
||||
$pdf->setPaper('A4', 'landscape');
|
||||
|
|
|
|||
|
|
@ -32,10 +32,11 @@ class PushNews extends Notification
|
|||
{
|
||||
return (new WebPushMessage)
|
||||
->title('Ny Nyhed')
|
||||
->icon('/images/icons/appIcon.png')
|
||||
->body('Der er en ny nyhed i ekapp\'en')
|
||||
->badge('/images/icons/appIcon.png')
|
||||
->action('Se nyheder', route('root.index'));
|
||||
->icon('/images/icons/appIcon.svg')
|
||||
->body('Der er kommet en ny nyhed i ekapp\'en')
|
||||
->badge('/images/icons/appIcon.svg')
|
||||
->vibrate([100, 200, 100, 200, 300])
|
||||
->action('Klik her for at se nyheder', route('root.index'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class CreateMultipleEventsParent extends Migration
|
|||
{
|
||||
Schema::create('multiple_events_parent', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->string('week');
|
||||
$table->integer('week');
|
||||
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
|
||||
$table->timestamps();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@
|
|||
<!--If there is a images to the event do this: Start-->
|
||||
@if(!$events->isEmpty())
|
||||
@foreach($events as $event)
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($event->date)))
|
||||
<div class="card">
|
||||
@if($event->resource_id !== null)
|
||||
<div class="header">
|
||||
|
|
@ -94,6 +95,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
||||
@endif
|
||||
@endforeach
|
||||
@else
|
||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<link rel="apple-touch-icon" type="images/svg" sizes="152x152" href="/images/icons/img152x152.svg">
|
||||
<link rel="apple-touch-icon" type="images/svg" sizes="167x167" href="/images/icons/img152x152.svg">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/browserFavIcon.svg">
|
||||
<link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/img72x72.svg">
|
||||
<link rel="shortcut icon" type="images/svg" sizes="96x96" href="/images/icons/img96x96.svg">
|
||||
<link rel="shortcut icon" type="images/svg" sizes="128x128" href="/images/icons/img128x128.svg">
|
||||
|
|
|
|||
|
|
@ -71,8 +71,9 @@
|
|||
<!--Alert box, display when a event is delete: end -->
|
||||
|
||||
<!--If there is a images to the event do this: Start-->
|
||||
@if(!$multiEvents->isEmpty())
|
||||
@if(!empty($multiEvents))
|
||||
@foreach($multiEvents as $multiEvent)
|
||||
@if(\Carbon\Carbon::now() < date("Y-m-d H:i", strtotime($multiEvent->date)))
|
||||
<div class="card">
|
||||
@if($multiEvent->resource_id !== null)
|
||||
<div class="header">
|
||||
|
|
@ -87,6 +88,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
||||
@endif
|
||||
@endforeach
|
||||
@else
|
||||
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue