Testroute toegevoegd

src/main/java/puzzeltocht/controller/DashboardController.java

@@ -27,7 +27,7 @@ public class DashboardController {
 
         for (Event e : eventService.currentEvents()) {
             for (Team t : e.getTeams()) {
-                teams.add(new TeamDto(t.getName(), t.getCurrentLocation(), t.getCurrentMission()));
+                teams.add(new TeamDto(t));
             }
         }
         return teams;

src/main/java/puzzeltocht/controller/dto/TeamDto.java

@@ -1,17 +1,16 @@
 package puzzeltocht.controller.dto;
 
-import puzzeltocht.domain.Location;
-import puzzeltocht.domain.Mission;
+import puzzeltocht.domain.Team;
 
 public class TeamDto {
     private final String name;
     private final String mission;
     private final LocationDto location;
 
-    public TeamDto(String n, Location l, Mission m) {
-        this.name = n;
-        this.location = l == null ? null : new LocationDto(l);
-        this.mission = m == null ? null : m.getTitle();
+    public TeamDto(Team t) {
+        this.name = t.getName();
+        this.location = t.getCurrentLocation() == null ? null : new LocationDto(t.getCurrentLocation());
+        this.mission = t.getCurrentMission() == null ? null : t.getCurrentMission().getTitle();
     }
 
     public String getName() {

src/main/java/puzzeltocht/service/EventService.java

@@ -3,9 +3,15 @@ package puzzeltocht.service;
 import org.springframework.stereotype.Service;
 import puzzeltocht.controller.dto.TeamCreateDto;
 import puzzeltocht.controller.dto.TeamUpdateDto;
-import puzzeltocht.domain.*;
+import puzzeltocht.domain.Event;
+import puzzeltocht.domain.Mission;
+import puzzeltocht.domain.Route;
+import puzzeltocht.domain.Team;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
 
 @Service
 public class EventService {
@@ -16,9 +22,7 @@ public class EventService {
 
     public EventService(RouteService rs, TeamService ts) {
         this.teamService = ts;
-        createEvent("Summercamp MINI", "Korte route", rs.mockRoutes().get(0));
-        createEvent("Summercamp MAXI", "Lange route", rs.mockRoutes().get(1));
-        createEvent("Summercamp AR", "Augmented reality route", rs.mockRoutes().get(2));
+        createEvent("Miniroute Thuis", "Korte route gallerijk", rs.mockRouteThuis());
     }
 
     private void createEvent(String title, String description, Route r){

src/main/java/puzzeltocht/service/RouteService.java

@@ -11,7 +11,33 @@ import java.util.List;
 
 @Service
 public class RouteService {
-    public List<Route> mockRoutes() {
+
+    public Route mockRouteThuis() {
+        Route thuisRoute = new Route("Mini-route thuis");
+        Mission mVoordeur = new Mission(MissionType.START, "Naar het startpunt",
+                "Ga naar de gallerij, hier begint de tocht.");
+        mVoordeur.setTarget(new Location(53.21884, 6.55390));
+
+        Mission mUitgang = new Mission(MissionType.LOCATE, "Naar binnen?", "Loop richting het trappenhuis.");
+        mUitgang.setTarget(new Location(53.21888, 6.55365));
+
+        Mission mSchool = new Mission(MissionType.QUESTION, "Huisdier", "Hoe heet je favoriete nijlpaard?");
+        mSchool.setAnswer("Lalkens");
+
+        Mission mTerug = new Mission(MissionType.LOCATE, "Bijna klaar", "Loop terug naar de voordeur.");
+        mTerug.setTarget(new Location(53.21884, 6.55390));
+
+        Mission mFinish = new Mission(MissionType.FINISH, "Finish", "Dit is het einde van de puzzeltocht!");
+
+        thuisRoute.addMission(mVoordeur);
+        thuisRoute.addMission(mUitgang);
+        thuisRoute.addMission(mSchool);
+        thuisRoute.addMission(mTerug);
+        thuisRoute.addMission(mFinish);
+        return thuisRoute;
+    }
+
+    public List<Route> mockSummercampRoutes() {
         Route miniRoute = new Route("Summercamp demo mini");
         Mission mVoordeur = new Mission(MissionType.START, "Naar het startpunt",
                 "Ga door de voordeur naar buiten (dus niet bij de BBQ), hier begint de tocht.");

src/main/resources/static/dashboard/dashboard.js

@@ -10,7 +10,7 @@ class Dashboard {
     constructor() {
         this.markers = [];
         this.map = this.initMap();
-        setInterval(() => this.updateTeams(), 3000)
+        setInterval(() => this.updateTeams(), 10000)
         console.log("puzzeltocht dashboard initialised");
     }