fix /timetable/create

Author: burdoto

src/main/java/de/kaleidox/workbench/controller/TimetableController.java

@@ -1,16 +1,19 @@
 package de.kaleidox.workbench.controller;
 
+import de.kaleidox.workbench.model.jpa.representant.Customer;
 import de.kaleidox.workbench.model.jpa.timetable.TimetableEntry;
 import de.kaleidox.workbench.repo.CustomerRepository;
 import de.kaleidox.workbench.repo.TimetableEntryRepository;
 import de.kaleidox.workbench.repo.UserRepository;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -67,4 +70,20 @@ public String index(
     public String create() {
         return "timetable/create_entry";
     }
+
+    @GetMapping("/{customerName}/{departmentName}/{startTime}")
+    public String view(
+            Model model, @PathVariable @Param("customerName") String customerName,
+            @PathVariable @Param("departmentName") String departmentName,
+            @PathVariable @Param("startTime") LocalDateTime startTime
+    ) {
+        var cKey     = new Customer.CompositeKey(customerName, departmentName);
+        var customer = customers.findById(cKey).orElseThrow();
+
+        var eKey  = new TimetableEntry.CompositeKey(customer, startTime);
+        var entry = entries.findById(eKey).orElseThrow();
+
+        model.addAttribute("entry", entry);
+        return "timetable/view_entry";
+    }
 }

src/main/java/de/kaleidox/workbench/model/jpa/timetable/TimetableEntry.java

@@ -37,6 +37,11 @@ public class TimetableEntry {
     @ElementCollection  Collection<Interruption> interruptions  = new ArrayList<>();
     @ElementCollection  Collection<Assignment>   assignments    = new ArrayList<>();
 
+    @JsonIgnore
+    public String getViewUrlPath() {
+        return "";
+    }
+
     @JsonIgnore
     public String getDayText() {
         return startTime.format(DATE_FORMATTER);

src/main/resources/static/favicon.ico

@@ -20,13 +20,13 @@ function init() {
 }
 
 function populateCustomerNames() {
-    populateSelection($('#input-customerName')[0], '/api/customers/names')
+    populateSelection($('#input-customerName')[0], `${window.location.origin}/api/customers/names`)
 }
 
 function populateDepartmentNames() {
     let customer = $('#input-customerName')[0].value
     if (customer === undefined || customer === '') return
-    populateSelection($('#input-departmentName')[0], '/api/customers/' + customer + '/departments')
+    populateSelection($('#input-departmentName')[0], `${window.location.origin}/api/customers/${customer}/departments`)
 }
 
 async function populateSelection(selectTag, optionsUrl) {
@@ -51,11 +51,27 @@ function toLocalISOString(date) {
 }
 
 function submitCreateEntry() {
-    var data = $('form').serializeArray()
+    let data = {
+        'customerInfo': {
+            'name': $('#input-customerName')[0].value,
+            'department': $('#input-departmentName')[0].value
+        },
+        'startTime': $('#input-startTime')[0].value,
+        'endTime': $('#input-endTime')[0].value,
+        'notes': $('#input-notes')[0].value
+    }
 
-    fetch({
-        method: 'POST', url: 'api/timetableEntries/create', headers: {
+    fetch(`${window.location.origin}/api/timetableEntries/create`, {
+        method: 'POST',
+        headers: {
             'Content-Type': 'application/json'
-        }, body: JSON.stringify(data)
+        },
+        body: JSON.stringify(data)
+    }).then(response => {
+        if (Math.floor(response.status / 100) === 2) {
+            window.location.href = `${window.location.origin}/timetable/${data.customerInfo.name}/${data.customerInfo.department}/${data.startTime}`
+            return
+        }
+        response.text().then(alert)
     })
 }

src/main/resources/static/timetable.js

@@ -4,7 +4,7 @@
 <script th:src="@{/static/timetable.js}" type="text/javascript"></script>
 <body onload="init()">
 <div class="ui-menubar" th:insert="~{/layout/menubar}"></div>
-<form class="ui-panel-1">
+<div class="ui-panel-1">
     <div class="ui-panel-2">
         <label for="input-customerName">Kunde</label> & <label for="input-departmentName">Abteilung</label>
         <br/>
@@ -29,7 +29,7 @@
         <textarea cols="80" id="input-notes" name="notes" rows="5"></textarea>
     </div>
     <input onclick="submitCreateEntry()" type="submit">
-</form>
+</div>
 <div class="ui-footer" th:insert="~{/layout/footer}"></div>
 </body>
 </html>

src/main/resources/templates/timetable/create_entry.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:insert="~{/layout/head}"></head>
+<script th:src="@{/static/timetable.js}" type="text/javascript"></script>
+<body onload="init()">
+<div class="ui-menubar" th:insert="~{/layout/menubar}"></div>
+<form class="ui-panel-1">
+    <div class="ui-panel-2">
+        <label for="input-customerName">Kunde</label> & <label for="input-departmentName">Abteilung</label>
+        <br/>
+        <select class="ui-select-big" id="input-customerName" name="customerName" onchange="populateDepartmentNames()" required size="8">
+            <option>- wird geladen -</option>
+        </select>
+        <select class="ui-select-big" id="input-departmentName" name="departmentName" required size="8">
+            <option>- bitte Kunde wählen -</option>
+        </select>
+    </div>
+    <div class="ui-panel-2">
+        <label for="input-startTime">Anfang</label>
+        <input class="input-datetime" id="input-startTime" name="startTime" required type="datetime-local" value="now">
+    </div>
+    <div class="ui-panel-2">
+        <label for="input-endTime">Ende</label>
+        <input class="input-datetime" id="input-endTime" name="endTime" required type="datetime-local" value="now">
+    </div>
+    <div class="ui-panel-2">
+        <label for="input-notes">Beschreibung</label>
+        <br/>
+        <textarea cols="80" id="input-notes" name="notes" rows="5"></textarea>
+    </div>
+    <input onclick="submitCreateEntry()" type="submit">
+</form>
+<div class="ui-footer" th:insert="~{/layout/footer}"></div>
+</body>
+</html>