vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.5.19a only bugs

This commit is contained in:
Neerholt 2021-04-29 09:16:08 +02:00
parent ddad00f0f8
commit 7d6f501986
8 changed files with 81 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
skolehjem/app/Http/Controllers/MultipleEventsController.php
View File

@ -129,9 +129,11 @@ class MultipleEventsController extends Controller
* @param \App\MultipleEvents $multipleeventsController
* @return \Illuminate\Http\Response
*/
public function edit(MultipleeventsController $multipleeventsController)
public function edit(MultipleeventsController $id)
{
//
dd("asd");
$multiEvent = MultipleEvents::find($id);
return Response::detect("multiple-events.edit", ["multiEvent" => $multiEvent]);
}
/**
@ -209,8 +211,8 @@ 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();
$var = 149;
$multiEvent->name = substr($multiEvent->name, 0, $var);
@ -219,7 +221,7 @@ class MultipleEventsController extends Controller
$multiEvent->date = substr($multiEvent->date, 0, $var);
$multiEvent->event_end = substr($multiEvent->event_end, 0, $var);
$pdf = PDF::loadView('pdf.multipleevent', ["multiEvent" => $multiEvent]);
$pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]);
$pdf->setPaper('A4', 'portrait');

4
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -86,8 +86,8 @@
<td>{{ $event->week}}</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>
@if(auth()->user()->can('event.edit'))
<td><a href="{{ route("multiPdf.genPDF", [ "multiEvent" => $event ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
<td><a href="#"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></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("multiple-events.edit", [ "multiEvent" => $event->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
@endif
@if(auth()->user()->can('event.delete'))
<td>

2
skolehjem/resources/views/admin/multiple-events/create.blade.php
View File

@ -6,7 +6,7 @@
@endsection
@section("path")
<a href="{{ route('events.create') }}" class="text-white">Opret ugentligt aktivitet</a> /
<a href="{{ route('multiple-events.create') }}" class="text-white">Opret ugentligt aktivitet</a> /
@endsection
@section("content")

123
skolehjem/resources/views/admin/multiple-events/edit.blade.php
View File

@ -2,11 +2,11 @@
@extends("admin.layout.header")
@section("title")
Aktivitet - Rediger
Rediger ugentligt aktivitet - Vis
@endsection
@section("path")
<a href="{{route("events.edit", ["event" => $event])}}" class="text-white">Rediger Aktivitet</a> /
<a href="{{ route('multiple-events.create') }}" class="text-white">Opret ugentligt aktivitet</a> /
@endsection
@section("content")
@ -18,64 +18,75 @@
border-color: black;
}
#editor {
margin-bottom: 1rem;
table {
font-family: arial, sans-serif;
border-collapse: collapse;
width: 100%;
}
td, th {
text-align: left;
padding: 8px;
}
</style>
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1>Rediger Aktivitet:</h1>
<form method="post" action="{{route("events.update", ["event" => $event])}}" enctype="multipart/form-data">
<h1 id="errormesseages" >Opret ugentligt aktivitet: [Vi er i uge <?php echo date('W'); ?>]</h1>
<form method="post" action="{{ route("multiple-events.store") }}" enctype="multipart/form-data">
<!--datetime-local-->
@csrf
@method("PUT")
<label for="name">Aktivitet Navn:</label>
<label hidden id="error" for="errormesseages">Dette Aktivitet navn findes allerede</label>
<input value="{{$event->name}}" type="text" name="name" id="name" required>
<label for="accountable">Aktivitet Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $event->description !!}</div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet Dato:</label>
<input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede (Forbliv tom hvis billede ikke skal ændres):</label>
<input id="fileuploade" type="file" name="resource" accept="image/*" value="{{$event->resource_id}}">
<input type="text" name="week" placeholder="Uge">
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label>
<input id="fileuploade" type="file" name="resource" accept="image/*">
<table>
<tr>
<th>Ugedag</th>
<th>Aktivitets navn</th>
<th>Aktivitets beskrivelse</th>
<th>Tovholder</th>
<th>Tidsrum (Start)</th>
</tr>
<tr>
<td>Mandag</td>
<td><input type="text" name="name[]" max="255" value="{{ $multiEvent->name[1] }}"></td>
<td><input type="text" name="description[]" max="255" value="{{ old("description.0") }}"></td>
<td><input type="text" name="accountable[]" value="{{ old("accountable.0") }}"></td>
<td><input type="datetime-local" name="date[]" value="{{ old("date.0") }}"></td>
</tr>
<tr>
<td>Tirsdag</td>
<td><input type="text" name="name[]" max="255" value="{{ old("name.1") }}"></td>
<td><input type="text" name="description[]" max="255" value="{{ old("description.1") }}"></td>
<td><input type="text" name="accountable[]" value="{{ old("accountable.1") }}"></td>
<td><input type="datetime-local" name="date[]" value="{{ old("date.1") }}"></td>
</tr>
<tr>
<td>Onsdag</td>
<td><input type="text" name="name[]" max="255" value="{{ old("name.2") }}"></td>
<td><input type="text" name="description[]" max="255" value="{{ old("description.2") }}"></td>
<td><input type="text" name="accountable[]" value="{{ old("accountable.2") }}"></td>
<td><input type="datetime-local" name="date[]" value="{{ old("date.2") }}"></td>
</tr>
<tr>
<td>Torsdag</td>
<td><input type="text" name="name[]" max="255" value="{{ old("name.3") }}"></td>
<td><input type="text" name="description[]" max="255" value="{{ old("description.3") }}"></td>
<td><input type="text" name="accountable[]" value="{{ old("accountable.3") }}"></td>
<td><input type="datetime-local" name="date[]" value="{{ old("date.3") }}"></td>
</tr>
</table>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<input id="isNews" class="toggle__input" type="checkbox" name="newsoption" onclick="change()">
<span class="toggle__label">
<span class="toggle__text">Opdater / Opret som nyhed?</span>
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {
modules: {
'toolbar': [
[ 'bold', 'italic', 'underline', 'strike' ],
[{ 'color': [] }],
[{ 'script': 'super' }, { 'script': 'sub' }],
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},
theme: 'snow'
});
</script>
<script>
var form = document.querySelector('form');
form.onsubmit = function() {
var myEditor = document.getElementById('editor');
var html = myEditor.children[0].innerHTML;
document.getElementById('hiddenArea').innerText = html;
}
</script>
<input id="disable" type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@endsection
@section("scripts")
<script>
@ -92,10 +103,9 @@
$value = $('#name').val();
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
url: '{{route('events.nameCheck')}}',
data: {'nameCheck':$value},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
@ -116,11 +126,10 @@
$('#name').on('keyup', function () {
$value = $(this).val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
url: '{{route('events.nameCheck')}}',
data: {'nameCheck':$value},
success:function (data) {
if(data){
$("#error").show(100);

4
skolehjem/resources/views/admin/multiple-events/index.blade.php
View File

@ -29,8 +29,8 @@
<td>{{ $event->week}}</td>
<td><a id="preview" onclick="modalEventContent({{$event->id}})" style="cursor: pointer"><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
@if(auth()->user()->can('event.edit'))
<td><a href="{{ route("multiPdf.genPDF", [ "multiEvent" => $event ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
<td><a href="#"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></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("multiple-events.edit", [ "multiEvent" => $event->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
@endif
@if(auth()->user()->can('event.delete'))
<td>

2
skolehjem/resources/views/app/news/index.blade.php
View File

@ -221,7 +221,7 @@
@elseif($new->type == 'MultipleEvent')
<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="title">Ugenlig 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>
</div>
@if($new->resource_id !== null)

3
skolehjem/resources/views/pdf/multipleevent.blade.php → skolehjem/resources/views/multipdf/multipleevent.blade.php
View File

@ -12,8 +12,7 @@
</style>
<body style="padding: 0; width: 100%; height: 100%;">
<div style="background-color: #00788A; width: 100%; padding: 1rem 1rem;">
<h1 style="color: white; text-align: center">Erhverskollegiet - Odense</h1>
<h1 style="font-size: 36px; text-align: center; color: white;">Menuplan, Uge {{$multiEvent->week}}</h1>
<h1 style="font-size: 36px; text-align: center; color: white;">Ugentligt aktivitet, Uge {{$multiEvent->week}}</h1>
</div>
<div style="text-align: center; margin: 0 16px;">
<h2 class="ql-align-center"><strong>name:</strong></h2>

3
skolehjem/routes/web.php
View File

@ -28,6 +28,7 @@ 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");
@ -63,7 +64,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}", "MultipleEventController@genPDF")->name("multiPdf.genPDF")->hasParameter("Id");
Route::get("/pdf/{multiEvent}", "MultipleEventsController@genPDF")->name("multiPdf.genPDF")->hasParameter("Id");
//Preview
Route::get("/newsPreview", "NewsController@previewPages")->name("news.preview");