v0.10.0d - Rolled back menuplan to old system layout and functionality

This commit is contained in:
2020-08-17 12:24:43 +02:00
parent 773655c294
commit 9db169aadb
7 changed files with 92 additions and 86 deletions
@@ -107,7 +107,7 @@
</div>
</div>
@else
<p style="padding: 0 4px">Der er ingen aktiviteter</p>
<p style="padding: 0 4px; text-align: center">Der er ingen aktiviteter</p>
@endif
</div>
@@ -148,13 +148,26 @@
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: lightseagreen;">Ugens Menuplan</th>
<th class="text-white text-center" style="background-color: lightseagreen;"></th> <!--Mabye need some fix :) -->
</tr>
</table>
@if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
{!! \App\MenuPlan::query()->where("week", "=", date('W'))->first()->menu !!}
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
<tr>
<td><label>Mandag </label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }}</td>
</tr>
<td><label>Tirsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }}</td>
</tr>
<td><label>Onsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }}</td>
</tr>
<td><label>Torsdag</label></td>
<td>{{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }}</td>
</tr>
@else
<p class="text-center">Der er ingen menuplan for denne uge</p>
@endif
</table>
</div>
@endsection
@@ -29,20 +29,14 @@
<label for="week">Uge nr.</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" placeholder="1" required>
<div id="editor">
<h2 class="ql-align-center"><strong>Mandag:</strong></h2>
<p class="ql-align-center">{Mandag}</p>
<p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>
<p class="ql-align-center">{Tirsdag}</p>
<p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>
<p class="ql-align-center">{Onsdag}</p>
<p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>
<p class="ql-align-center">{Torsdag}</p>
</div>
<textarea name="menu" class="d-none" id="hiddenArea"></textarea>
<label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required>
<label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required>
<label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required>
<label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required>
<label class="toggle">
<input class="toggle__input" id="isNews" type="checkbox" name="newsoption" onclick="change()">
<span class="toggle__label">
@@ -56,34 +50,6 @@
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret Menuplan">
</form>
<script src="https://cdn.quilljs.com/1.3.6/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' ],
[ '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>
@endsection
@section("scripts")
<script>
@@ -30,8 +30,14 @@
<label for="mandag">Uge:</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
<div id="editor">{!! $menuplan->menu !!}</div>
<textarea name="menu" class="d-none" id="hiddenArea"></textarea>
<label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required value="{{ $menuplan->monday }}">
<label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required value="{{ $menuplan->tuesday }}">
<label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required value="{{ $menuplan->wednesday }}">
<label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required value="{{ $menuplan->thursday }}">
<label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label">
@@ -40,34 +46,6 @@
</label>
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
</form>
<script src="https://cdn.quilljs.com/1.3.6/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' ],
[ '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>
@endsection
@section("scripts")
<script>
@@ -18,7 +18,17 @@
<span class="text-center text-white bold">{{ __('msg.ugestor') }}: {{$menuplan->week}}</span>
@endif
<div class="col w-100 mt-1">
{!! $menuplan->menu !!}
{!! '<h2 class="ql-align-center"><strong>Mandag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->monday.'</p><p class="ql-align-center"></p>'.
'<h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->tuesday.'</p><p class="ql-align-center"></p>'.
'<h2 class="ql-align-center"><strong>Onsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->wednesday.'</p><p class="ql-align-center"></p>'.
'<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
'<p class="ql-align-center">'.$menuplan->thursday.'</p>' !!}
</div>
@endif
@endforeach