diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index aa91e37..13c58fa 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -6,6 +6,7 @@ use App\MultipleEvents; use App\MultipleEventsParent; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Barryvdh\DomPDF\Facade as PDF; //Not in use yet use App\Event; use App\News; @@ -124,14 +125,13 @@ class MultipleEventsController extends Controller } /** - * Show the form for editing the specified resource. + * Show the form for editing the specified resource.- * - * @param \App\MultipleEvents $multipleeventsController - * @return \Illuminate\Http\Response + * @param int $id + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function edit(MultipleeventsController $id) + public function edit($id) { - dd("asd"); $multiEvent = MultipleEvents::find($id); return Response::detect("multiple-events.edit", ["multiEvent" => $multiEvent]); } @@ -211,8 +211,7 @@ class MultipleEventsController extends Controller public function genPDF($Id){ - dd("Ka"); - $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("id", "=", $Id)->first(); + $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("multiple_events_parent.id", "=", $Id)->first(); $var = 149; $multiEvent->name = substr($multiEvent->name, 0, $var); diff --git a/skolehjem/composer.json b/skolehjem/composer.json index e9adf16..02c8da8 100644 --- a/skolehjem/composer.json +++ b/skolehjem/composer.json @@ -9,7 +9,7 @@ "license": "MIT", "require": { "php": "^8.0.3", - "barryvdh/laravel-dompdf": "^0.8.6", + "barryvdh/laravel-dompdf": "^0.9.0", "fideloper/proxy": "^4.2", "fruitcake/laravel-cors": "^1.0", "guzzlehttp/guzzle": "^6.3", diff --git a/skolehjem/composer.lock b/skolehjem/composer.lock index 9413476..f580e15 100644 --- a/skolehjem/composer.lock +++ b/skolehjem/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "703ec434f4f309565e794ee1f115b118", + "content-hash": "5c5e11e3ee756fd468ab123fa2a62904", "packages": [ { "name": "asm89/stack-cors", @@ -64,27 +64,27 @@ }, { "name": "barryvdh/laravel-dompdf", - "version": "v0.8.7", + "version": "v0.9.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d" + "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d", - "reference": "30310e0a675462bf2aa9d448c8dcbf57fbcc517d", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b", + "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b", "shasum": "" }, "require": { - "dompdf/dompdf": "^0.8", + "dompdf/dompdf": "^1", "illuminate/support": "^5.5|^6|^7|^8", - "php": ">=7" + "php": "^7.1 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.8-dev" + "dev-master": "0.9-dev" }, "laravel": { "providers": [ @@ -118,7 +118,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-dompdf/issues", - "source": "https://github.com/barryvdh/laravel-dompdf/tree/master" + "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.9.0" }, "funding": [ { @@ -126,7 +126,7 @@ "type": "github" } ], - "time": "2020-09-07T11:50:18+00:00" + "time": "2020-12-27T12:05:53+00:00" }, { "name": "brick/math", @@ -361,33 +361,35 @@ }, { "name": "dompdf/dompdf", - "version": "v0.8.3", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2" + "reference": "8768448244967a46d6e67b891d30878e0e15d25c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/75f13c700009be21a1965dc2c5b68a8708c22ba2", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c", + "reference": "8768448244967a46d6e67b891d30878e0e15d25c", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "phenx/php-font-lib": "0.5.*", - "phenx/php-svg-lib": "0.3.*", - "php": ">=5.4.0" + "phenx/php-font-lib": "^0.5.2", + "phenx/php-svg-lib": "^0.3.3", + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.5|^6.5", - "squizlabs/php_codesniffer": "2.*" + "mockery/mockery": "^1.3", + "phpunit/phpunit": "^7.5 || ^8 || ^9", + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-gd": "Needed to process images", "ext-gmagick": "Improves image processing performance", - "ext-imagick": "Improves image processing performance" + "ext-imagick": "Improves image processing performance", + "ext-zlib": "Needed for pdf stream compression" }, "type": "library", "extra": { @@ -425,9 +427,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/master" + "source": "https://github.com/dompdf/dompdf/tree/v1.0.2" }, - "time": "2018-12-14T02:40:31+00:00" + "time": "2021-01-08T14:18:52+00:00" }, { "name": "dragonmantank/cron-expression", @@ -900,16 +902,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" + "reference": "dc960a912984efb74d0a90222870c72c87f10c91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91", "shasum": "" }, "require": { @@ -969,9 +971,9 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.1" + "source": "https://github.com/guzzle/psr7/tree/1.8.2" }, - "time": "2021-03-21T16:25:00+00:00" + "time": "2021-04-26T09:17:50+00:00" }, { "name": "jaybizzle/crawler-detect", @@ -6292,16 +6294,16 @@ }, { "name": "filp/whoops", - "version": "2.12.0", + "version": "2.12.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "d501fd2658d55491a2295ff600ae5978eaad7403" + "reference": "c13c0be93cff50f88bbd70827d993026821914dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403", - "reference": "d501fd2658d55491a2295ff600ae5978eaad7403", + "url": "https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd", + "reference": "c13c0be93cff50f88bbd70827d993026821914dd", "shasum": "" }, "require": { @@ -6351,7 +6353,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.12.0" + "source": "https://github.com/filp/whoops/tree/2.12.1" }, "funding": [ { @@ -6359,7 +6361,7 @@ "type": "github" } ], - "time": "2021-03-30T12:00:00+00:00" + "time": "2021-04-25T12:00:00+00:00" }, { "name": "fzaninotto/faker", diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 8de8da4..ea327a0 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -32,39 +32,39 @@ - - - - - - @if(auth()->user()->can('event.edit')) - - @endif - @if(auth()->user()->can('event.delete')) - - @endif + + + + + + @if(auth()->user()->can('event.edit')) + + @endif + @if(auth()->user()->can('event.delete')) + + @endif - @foreach($events as $event) - @if (date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date))) - - - - - - - @if(auth()->user()->can('event.edit')) - - @endif - @if(auth()->user()->can('event.delete')) - - @endif - - @endif - @endforeach + @foreach($events as $event) + @if (date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date))) + + + + + + + @if(auth()->user()->can('event.edit')) + + @endif + @if(auth()->user()->can('event.delete')) + + @endif + + @endif + @endforeach
Aktivitets NavnAktivitets AnsvarligAktivitets DatoShowpreviewUpdateDeleteAktivitets NavnAktivitets AnsvarligAktivitets DatoShowpreviewUpdateDelete
{{ $event->name }}{{ $event->accountable }}{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} $event ]) }}">Showpreview $event ]) }}">Update - @csrf - Delete -
{{ $event->name }}{{ $event->accountable }}{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} $event ]) }}">Showpreview $event ]) }}">Update + @csrf + Delete +
@@ -85,9 +85,9 @@ {{ $event->week}} preview - @if(auth()->user()->can('event.edit')) $event->id ]) }}" target="_blank">Print - $event->id ]) }}">Update + @if(auth()->user()->can('event.edit')) + id) }}">Update @endif @if(auth()->user()->can('event.delete')) @@ -246,23 +246,23 @@ cancelButtonText: 'Annuller' }).then((result) => { if (result.isConfirmed) { - $.ajax({ - type: "POST", - url: "events/"+id, - data:{'_token':token, _method: 'DELETE'}, - success: function () { - $('#table_id').DataTable().row($('#row_'+id)[0]).remove().draw(); + $.ajax({ + type: "POST", + url: "events/"+id, + data:{'_token':token, _method: 'DELETE'}, + success: function () { + $('#table_id').DataTable().row($('#row_'+id)[0]).remove().draw(); - Swal.fire( - 'Aktiviteten er slettet!', - '', - 'success' - ) - }, - error:function (data) { - console.log(data); - } - }); + Swal.fire( + 'Aktiviteten er slettet!', + '', + 'success' + ) + }, + error:function (data) { + console.log(data); + } + }); } }) } diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 5c36c0b..15d23db 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -28,7 +28,6 @@ Route::get("/account/edit", "UserController@accountedit")->name("users.accounted Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass"); Route::put("/account/update", "UserController@accountupdate")->name("users.accountupdate"); Route::get("/account/editpic", "UserController@accounteditpic")->name("users.accounteditpic"); -Route::get("/multiple-events/{multiEvent}/edit", "MultipleEventsController@edit")->name("multiple-events.edit"); Route::get("/events/signups/{event}", "EventController@signups")->name("events.signups"); Route::get("/multiple-events/signups/{multiple-event}", "MultipleEventsController@signups")->name("multiple-events.signups"); Route::get("/events/accountsignups", "EventController@accountsignups")->name("events.accountsignups"); @@ -64,7 +63,7 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode") //Convert to PDF Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id"); -Route::get("/pdf/{multiEvent}", "MultipleEventsController@genPDF")->name("multiPdf.genPDF")->hasParameter("Id"); +Route::get("/multipdf/{multiEvent}", "MultipleEventsController@genPDF")->name("multiPdf.genPDF")->hasParameter("Id"); //Preview Route::get("/newsPreview", "NewsController@previewPages")->name("news.preview");