Merge remote-tracking branch 'origin/master'

skolehjem/resources/js/app.js

@@ -7,7 +7,7 @@
 require('./bootstrap');
 
 //Dependencies
-require("moment");
+const moment = require("moment");
 
 require('./date');
 
@@ -23,7 +23,7 @@ import { toggleMenu } from './navmenu/menu';
 
 // window.Vue = require('vue');
 
-//import { generateCalendar } from "./calendar/calendar";
+import { generateCalendar } from "./calendar/calendar";
 
 // createCalendar();
 //
@@ -53,8 +53,23 @@ import { toggleMenu } from './navmenu/menu';
 //     el: '#app',
 // });
 
-//generateCalendar();
+let weekOffset = 0;
 
-document.getElementById("toggle").onclick = function () {
-    toggleMenu('menu');
-};
+if(document.getElementById("calendar")) {
+    generateCalendar();
+
+    document.getElementById("week-previous").onclick = function () {
+        weekOffset--;
+        generateCalendar(weekOffset);
+    }
+
+    document.getElementById("week-next").onclick = function () {
+        weekOffset++;
+        generateCalendar(weekOffset);
+    }
+}
+
+if(document.getElementById("toggle"))
+    document.getElementById("toggle").onclick = function () {
+        toggleMenu('menu');
+    };

skolehjem/resources/js/calendar/calendar.js

@@ -22,229 +22,167 @@
 
 const moment = require("moment");
 
-const calendar = document.getElementById("calendar");
-const title = document.getElementById("month");
-
-const days = [
-    "Mandag",
-    "Tirsdag",
-    "Onsdag",
-    "Torsdag",
-    "Fredag",
-    "Lørdag",
-    "Søndag"
-];
-//
-// const months = [
-//     "January",
-//     "February",
-//     "March",
-//     "April",
-//     "May",
-//     "June",
-//     "July",
-//     "August",
-//     "September",
-//     "October",
-//     "November",
-//     "December",
-// ]
-
-// const month = document.getElementById("month");
-//
-// const year = 2020;
-//
-// let currentMonth = 0;
-//
-// let firstDay = (new Date(year, month)).getDay();
-//
-// function createCalendar() {
-//
-//     calendar.innerHTML = "";
-//
-//     // HEADER
-//     let header = document.createElement("div");
-//     header.classList.add("calendar-table__header", "calendar-table__row");
-//
-//     days.forEach((value) =>{
-//         let head = document.createElement("div");
-//         head.classList.add("calendar-table__col");
-//
-//         head.innerText = value;
-//
-//         header.appendChild(head);
-//     });
-//
-//     calendar.appendChild(header);
-//
-//
-//     // BODY
-//
-//     let date = new Date(Date.now());
-//
-//     months.forEach((value, index) => {
-//         if(index === date.getMonth()) {
-//
-//         }
-//     });
-//
-//
-// // <div class="calendar-table__col">
-// //         <div class="calendar-table__item">
-// //         <span>2</span>
-// //         </div>
-// //         </div>
-//
-//     // let intDay = 1;
-//     // for(let columns = 0; columns < 5; columns++)
-//     // {
-//     //     let row = document.createElement("div");
-//     //     row.classList.add("calendar-table__row");
-//     //
-//     //     for (let i = 0; i < 7; i++)
-//     //     {
-//     //         let day = document.createElement("div");
-//     //         day.classList.add("calendar-table__col", "calendar-table__item");
-//     //         day.innerText = intDay;
-//     //         // let
-//     //
-//     //         row.appendChild(day);
-//     //
-//     //         intDay++;
-//     //     }
-//     //     calendar.appendChild(row);
-//     // }
-//     drawMonth(6);
-// }
-//
-// function drawMonth(monthId) {
-//
-//
-//     let dateObject = new Date()
-//
-//     let date = 1;
-//     for(let columns = 0; columns < 6; columns++)
-//     {
-//         let row = document.createElement("div");
-//         row.classList.add("calendar-table__row");
-//
-//         for (let i = 0; i < 7; i++)
-//         {
-//             if(columns === 0 && i < firstDay) {
-//                 let day = document.createElement("div");
-//                 day.classList.add("calendar-table__col", "calendar-table__item");
-//                 // day.innerText = date;
-//
-//                 row.appendChild(day);
-//             }
-//             else if(date > countDays(year, 6)) {
-//                 break;
-//             }
-//
-//             else {
-//                 let day = document.createElement("div");
-//                 day.classList.add("calendar-table__col", "calendar-table__item");
-//                 day.innerText = date;
-//
-//                 row.appendChild(day);
-//                 date++;
-//             }
-//
-//             // let day = document.createElement("div");
-//             // day.classList.add("calendar-table__col", "calendar-table__item");
-//             // day.innerText = date;
-//             // // let
-//             //
-//             // row.appendChild(day);
-//             //
-//             // date++;
-//         }
-//         calendar.appendChild(row);
-//     }
-// }
-//
-// function nextMonth() {
-//     currentMonth++;
-//
-//     if(currentMonth > 11)
-//         currentMonth = 0;
-//
-//     months.forEach((value, index) => {
-//         if(index === currentMonth)
-//             month.innerText = value;
-//     });
-//
-//     drawMonth(currentMonth);
-// }
-//
-// function previousMonth() {
-//     currentMonth--;
-//
-//     if(currentMonth < 0)
-//         currentMonth = 11;
-//
-//     months.forEach((value, index) => {
-//         if(index === currentMonth)
-//             month.innerText = value;
-//     });
-//
-//     drawMonth(currentMonth);
-// }
-//
-//
-// function countDays(year, month) {
-//     return 32 - new Date(year, month, 32).getDate();
-// }
-//
-// // Monday
-// // Tuesday
-// // Wednesday
-// // Thursday
-// // Friday
-// // Saturday
-// // Sunday
-// //
-// // mon tue wed thu fri sat sun
-//
-//
-// module.exports = {
-//     createCalendar,
-//     countDays,
-//     nextMonth,
-//     previousMonth,
-//     calendar,
-//     days,
-//     months,
-//     currentMonth,
-//     month,
-// };
+// const calendar = document.getElementById("calendar");
+// const title = document.getElementById("month");
 
 
 
-calendar.innerHTML = "";
-//
-// cal.forEach(value => {
-//     let elem = document.createElement("div");
-//     elem.innerText = value;
-//     console.log(value);
-//     calendar.appendChild(elem);
-// });
-//
-// title.innerText = moment().format("DD/MM/YYYY");
+// calendar.innerHTML = "";
 
-function generateCalendar() {
-    const startWeek = moment().startOf("month").week();
-    const endWeek = moment().endOf("month").week();
+function generateCalendar(weekOffset = 0) {
+    const week = (moment().week() + weekOffset);
 
-    let cal = [];
-    for (let week = startWeek; week < endWeek; week++) {
-        cal.push({
-            week : week,
-            days : Array(7).fill(0).map((n, i) => moment().week(week).startOf("week").clone().add(n + i, "day"))
-        });
+    document.getElementById("title").innerText = week;
+
+    let weekDays = Array.apply(null, Array(7)).map((value, index) => {
+        return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd");
+    });
+    // weekDays.push(weekDays.shift());
+
+    // console.log(week);
+    // console.log(weekDays);
+
+    const calendar = document.getElementById("calendar");
+
+    let header = document.createElement("div");
+    header.classList.add("calendar-table__header", "calendar-table__row");
+
+    let calendarBody = document.createElement("div");
+    calendarBody.classList.add("calendar-table__body");
+
+    let calendarRow = document.createElement("div");
+    calendarRow.classList.add("calendar-table__row")
+
+    weekDays.forEach(function (weekDay) {
+        let headerDay = document.createElement("div");
+        headerDay.classList.add("calendar-table__col");
+
+        headerDay.innerText = weekDay;
+
+        header.appendChild(headerDay);
+
+
+        let date = moment().locale("da").day(weekDay).week(week);
+
+        // onDateSelect(date);
+
+        let dayHolder = document.createElement("div");
+        dayHolder.classList.add("calendar-table__col");
+
+        let day = document.createElement("div");
+        day.classList.add("calendar-table__item");
+        day.innerText = date.date();
+
+        dayHolder.appendChild(day);
+
+        dayHolder.onclick = function() {
+            onDateSelect(date);
+        }
+
+        calendarRow.appendChild(dayHolder);
+    });
+
+    calendarBody.appendChild(calendarRow);
+
+    calendar.innerHTML = "";
+
+    calendar.appendChild(header);
+    calendar.appendChild(calendarBody);
+}
+
+function onDateSelect(date) {
+    let events;
+    let machinez;
+
+    let container = document.getElementById("event-container");
+
+
+    if(document.getElementById("washing-machines") != undefined)
+        machinez = document.getElementById("washing-machines");
+    else {
+        let span = document.createElement("span");
+        span.classList.add("events__title");
+        span.innerText = "Maskiner";
+
+        let select = document.createElement("select");
+        select.classList.add("events__title");
+        select.id = "washing-machines";
+
+        container.appendChild(span);
+        container.appendChild(select);
+
+        machinez = document.getElementById("washing-machines");
+    }
+    if(document.getElementById("events") != undefined)
+        events = document.getElementById("events");
+    else {
+        let span = document.createElement("span");
+        span.classList.add("events__title");
+        span.innerText = "Tider";
+
+        let select = document.createElement("select");
+        select.classList.add("events__title");
+        select.id = "events";
+
+        container.appendChild(span);
+        container.appendChild(select);
+
+        events = document.getElementById("events");
+    }
+
+    // events.innerHTML = "";
+
+    const machines = [
+        "Maskine 1",
+        "Maskine 2"
+    ]
+
+    for (let i = 0; i < machines.length; i++) {
+        let option = document.createElement("option");
+        option.text = machines[i];
+
+        machinez.appendChild(option);
     }
 
 
+    for (let hour = 8; hour <= 20; hour++) {
+
+        let option = document.createElement("option");
+        option.text = prependZero(hour);
+
+        events.appendChild(option);
+
+        // let item = document.createElement("li");
+        // item.classList.add("events__item");
+        //
+        // let itemData = document.createElement("div");
+        //
+        // let head = document.createElement("span");
+        // head.classList.add("events__name");
+        // head.innerText = "Vaskemaskine Tid";
+        //
+        // let dat = document.createElement("span");
+        // dat.classList.add("events__date");
+        // dat.innerText = "Klokken " + prependZero(hour);
+        //
+        // itemData.appendChild(head);
+        // itemData.appendChild(dat);
+        // item.appendChild(itemData);
+        //
+        // let button = document.createElement("span");
+        // button.classList.add("events__tag");
+        // button.innerText = "Book";
+        //
+        // item.appendChild(button);
+        //
+        // events.appendChild(item);
+    }
+}
+
+function prependZero(value) {
+    if(value < 10)
+        return "0" + value;
+    return value;
 }
 
 module.exports = {

skolehjem/resources/sass/webapp/_default.scss

@@ -285,11 +285,11 @@ $primary-color: $blue;
             color: $gray;
             font-size: $sm-font-size;
             font-weight: $font-weight--bold;
-            padding: 12px 3px;
+            padding: 6px 3px;
             text-align: center;
             text-transform: uppercase;
             width: 40px;
-            height: 38px;
+            height: 18px;
 
             @include mq(360) {
                 width: 46px;
@@ -309,7 +309,7 @@ $primary-color: $blue;
 
             @include mq(360) {
                 width: 46px;
-                height: 48px;
+                height: 24px;
             }
 
             @include mq(410) {

skolehjem/resources/views/admin/external-links/create.blade.php

@@ -14,7 +14,7 @@
     <form method="post" action="{{ route("external-links.store") }}">
         @csrf
         <label for="title">Titel:</label>
-        <input type="text" name="title" id="title" required>
+        <input type="text" name="name" id="title" required>
         <label for="link">Linket:</label>
         <input type="text" name="link" id="link" required>
         <input type="submit" class="btn btn-dark text-white" value="Opret">

skolehjem/resources/views/admin/external-links/edit.blade.php

@@ -6,12 +6,12 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('external-links.edit') }}" class="text-white">Rediger Link</a> /
+    <a href="../external-links/edit.blade.php" class="text-white">Rediger Link</a> /
 @endsection
 
 @section("content")
     <h1>Rediger Link:</h1>
-    <form method="post" action="">
+    <form method="post" action="{{ route("external-links.update", ['name' => $link->name]) }}">
         @csrf
         <label for="title">Titel:</label>
         <input type="text" name="title" id="title" required>

skolehjem/resources/views/admin/external-links/store.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.create') }}" class="text-white">Opret External Link</a> /
+@endsection
+
+@section("content")
+    Link blev (ikke) oprettet.
+@endsection

skolehjem/resources/views/admin/external-links/update.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    link - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.index') }}" class="text-white">External link</a> /
+@endsection
+
+@section("content")
+    Din link blev (ikke) redigeret.
+@endsection

skolehjem/resources/views/admin/menuplans/create.blade.php

@@ -13,20 +13,20 @@
     <h1>Opret Menuplan:</h1>
     <form action="{{ action('MenuPlanController@store') }}" method="post">
         @csrf
-        <label for="mandag">Mandag:</label>
-        <input type="text" name="mandag" id="mandag" required>
-        <label for="tirsdag">Tirsdag:</label>
-        <input type="text" name="tirsdag" id="tirsdag" required>
-        <label for="onsdag">Onsdag:</label>
-        <input type="text" name="onsdag" id="onsdag" required>
-        <label for="torsdag">Torsdag:</label>
-        <input type="text" name="torsdag" id="torsdag" required>
-        <label for="fredag">Fredag:</label>
-        <input type="text" name="fredag" id="fredag" required>
-        <label for="lørdag">Lørdag:</label>
-        <input type="text" name="lørdag" id="lørdag" required>
-        <label for="søndag">Søndag:</label>
-        <input type="text" name="søndag" id="søndag" required>
+        <label for="monday">Mandag:</label>
+        <input type="text" name="monday" id="monday" required>
+        <label for="tuesday">Tirsdag:</label>
+        <input type="text" name="tuesday" id="tuesday" required>
+        <label for="wednesday">Onsdag:</label>
+        <input type="text" name="wednesday" id="wednesday" required>
+        <label for="thursday">Torsdag:</label>
+        <input type="text" name="thursday" id="thursday" required>
+        <label for="friday">Fredag:</label>
+        <input type="text" name="friday" id="friday" required>
+        <label for="saturday">Lørdag:</label>
+        <input type="text" name="saturday" id="saturday" required>
+        <label for="sunday">Søndag:</label>
+        <input type="text" name="sunday" id="sunday" required>
 
         <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
     </form>

skolehjem/resources/views/admin/menuplans/edit.blade.php

@@ -6,12 +6,13 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> /
+    <a class="text-white">Rediger Menuplan</a> /
 @endsection
 
 @section("content")
     <h1>Rediger Menuplan:</h1>
-    <form method="post" action="">
+    <form method="post" action="{{ route("menu-plans.store") }}">
+        @csrf
         <label for="mandag">Mandag:</label>
         <input type="text" name="mandag" id="mandag" value="{Mandag}" required>
         <label for="tirsdag">Tirsdag:</label>

skolehjem/resources/views/admin/menuplans/index.blade.php

@@ -24,15 +24,15 @@
         </tr>
         @foreach($menuPlans as $menuplan)
         <tr>
-            <th>{Mandag}</th>
-            <th>{Tirsdag}</th>
-            <th>{Onsdag}</th>
-            <th>{Torsdag}</th>
-            <th>{Fredag}</th>
-            <th>{Lørdag}</th>
-            <th>{Søndag}</th>
-                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+            <td>{{$menuplan->monday}}</td>
+            <td>{{$menuplan->tuesday}}</td>
+            <td>{{$menuplan->wednesday}}</td>
+            <td>{{$menuplan->thursday}}</td>
+            <td>{{$menuplan->friday}}</td>
+            <td>{{$menuplan->saturday}}</td>
+            <td>{{$menuplan->sunday}}</td>
+            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
         </tr>
         @endforeach
     </table>

skolehjem/resources/views/admin/menuplans/show.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('menu-plans.show') }}" class="text-white">Vis Menuplan</a> /
+    <a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/app/bookings/index.blade.php

@@ -10,11 +10,11 @@
         <div class="col w-100 mt-auto">
             <div class="calendar-container">
                 <div class="calendar-container__header">
-                    <button id="month-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
+                    <button id="week-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
                         <i class="icon ion-ios-arrow-back"></i>
                     </button>
                     <h2 id="month" class="calendar-container__title">{Måned} {År}</h2>
-                    <button id="month-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
+                    <button id="week-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
                         <i class="icon ion-ios-arrow-forward"></i>
                     </button>
                 </div>
@@ -223,22 +223,22 @@
             </div>
             <div class="events-container">
                 <span class="events__title">Tider</span>
-                <ul class="events__list">
-                    <li class="events__item">
-                        <div class="events__item--left">
-                            <span class="events__name">Vaskemaskine Tid</span>
-                            <span class="events__date">{Dato}</span>
-                        </div>
-                        <span class="events__tag">Book</span>
-                    </li>
-                    <li class="events__item">
-                        <div class="events__item--left">
-                            <span class="events__name">Vaskemaskine Tid</span>
-                            <span class="events__date">{Dato}</span>
-                        </div>
-                        <span class="events__tag">Book</span>
-                    </li>
-                </ul>
+                <select id="events" class="events__list">
+{{--                    <li class="events__item">--}}
+{{--                        <div class="events__item--left">--}}
+{{--                            <span class="events__name">Vaskemaskine Tid</span>--}}
+{{--                            <span class="events__date">{Dato}</span>--}}
+{{--                        </div>--}}
+{{--                        <span class="events__tag">Book</span>--}}
+{{--                    </li>--}}
+{{--                    <li class="events__item">--}}
+{{--                        <div class="events__item--left">--}}
+{{--                            <span class="events__name">Vaskemaskine Tid</span>--}}
+{{--                            <span class="events__date">{Dato}</span>--}}
+{{--                        </div>--}}
+{{--                        <span class="events__tag">Book</span>--}}
+{{--                    </li>--}}
+                </select>
             </div>
         </div>
     </main>

skolehjem/resources/views/app/layout/base.blade.php

@@ -16,27 +16,27 @@
     </button>
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
-    <a href="menu-plans">
+    <a href="{{ route("menu-plans.index") }}">
         <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
         Menuplan
     </a>
-    <a href="events">
+    <a href="{{ route("events.index") }}">
         <img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
         Aktiviteter
     </a>
-    <a href="washing-reservations">
+    <a href="{{ route("washing-reservations.index") }}">
         <img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
         Reservationer
     </a>
-    <a href="">
+    <a href="#">
         <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
         Galleri
     </a>
-    <a href="">
+    <a href="#">
         <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
         Kontoret
     </a>
-    <a href="">
+    <a href="#">
         <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
         Vagttelefon
     </a>

skolehjem/resources/views/app/washing-reservations/index.blade.php

@@ -0,0 +1,58 @@
+@extends("app.layout.base")
+@extends("app.layout.header")
+@section("title")
+    Booking Liste
+@endsection
+
+@section("content")
+    <main>
+        <h1 class="text-center sde-blue mb-0">Booking Liste</h1>
+        <div class="col w-100 mt-auto">
+            <div class="calendar-container">
+                <div class="calendar-container__header">
+                    <button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
+                        <i class="icon ion-ios-arrow-back"></i>
+                    </button>
+                    <h2 id="title" class="calendar-container__title">{Måned} {År}</h2>
+                    <button id="week-next" class="calendar-container__btn fas fa-arrow-right" title="Next">
+                        <i class="icon ion-ios-arrow-forward"></i>
+                    </button>
+                </div>
+                <div class="calendar-container__body">
+                    <div id="calendar" class="calendar-table">
+                        <div class="calendar-table__body">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="event-container" class="events-container">
+
+                <p>
+                    Maskiner skal dynamisk opdateres alt efter om det er en fra bygning E eller en af de andre bygninger der vil vaske, da bygning E har egen vaskekælder!
+                </p>
+{{--                <span class="events__title">Maskiner</span>--}}
+{{--                <select id="washing-machines" class="events__list">--}}
+
+{{--                </select>--}}
+
+{{--                <span class="events__title">Tider</span>--}}
+{{--                <select id="events" class="events__list">--}}
+                    {{--                    <li class="events__item">--}}
+                    {{--                        <div class="events__item--left">--}}
+                    {{--                            <span class="events__name">Vaskemaskine Tid</span>--}}
+                    {{--                            <span class="events__date">{Dato}</span>--}}
+                    {{--                        </div>--}}
+                    {{--                        <span class="events__tag">Book</span>--}}
+                    {{--                    </li>--}}
+                    {{--                    <li class="events__item">--}}
+                    {{--                        <div class="events__item--left">--}}
+                    {{--                            <span class="events__name">Vaskemaskine Tid</span>--}}
+                    {{--                            <span class="events__date">{Dato}</span>--}}
+                    {{--                        </div>--}}
+                    {{--                        <span class="events__tag">Book</span>--}}
+                    {{--                    </li>--}}
+                </select>
+            </div>
+        </div>
+    </main>
+@endsection