Add indicators on elevator view

build_windows.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+
+echo Building binaries
+%M2%\mvn clean install

elevator-core/src/main/java/elevator/Building.java

@@ -75,6 +75,30 @@ public synchronized int[] waitingUsersByFloors() {
         return count;
     }
 
+    public synchronized Set<WaitingUser> waitingUsers() {
+        Set<WaitingUser> waitingUsers = new HashSet<WaitingUser>();
+
+        for (User user : users) {
+            if (user.waiting()) {
+                waitingUsers.add(new WaitingUser(user));
+            }
+        }
+
+        return waitingUsers;
+    }
+
+    public synchronized boolean[] getFloorButtonStatesInElevator() {
+        boolean[] states = new boolean[ElevatorEngine.HIGHER_FLOOR - ElevatorEngine.LOWER_FLOOR + 1];
+
+        for (User user : users) {
+            if (user.traveling()) {
+                states[user.getFloorToGo()] = true;
+            }
+        }
+
+        return states;
+    }
+
     public Door door() {
         return door;
     }
@@ -133,7 +157,7 @@ private synchronized Set<User> applyCommand(Command command) throws ElevatorIsBr
                 break;
             case OPEN:
                 door = OPEN;
-                doneUsers = new HashSet<>();
+                doneUsers = new HashSet<User>();
                 for (User user : users) {
                     user.elevatorIsOpen(floor);
                     if (user.done()) {

elevator-core/src/main/java/elevator/User.java

@@ -14,6 +14,7 @@ public class User {
 
     private final ElevatorEngine elevatorEngine;
     private final Integer initialFloor;
+    private final Direction initialDirection;
     private final Integer floorToGo;
     private Integer currentFloor;
     private Integer tickToGo;
@@ -43,6 +44,7 @@ public class User {
             floorToGo = max(randomFloor(), LOWER_FLOOR + 1);
         }
         currentFloor = initialFloor;
+        initialDirection = direction;
 
         elevatorEngine.call(initialFloor, direction);
     }
@@ -94,6 +96,10 @@ public Integer getInitialFloor() {
         return initialFloor;
     }
 
+    public Direction getInitialDirection() {
+        return initialDirection;
+    }
+
     public Integer getFloorToGo() {
         return floorToGo;
     }

elevator-core/src/main/java/elevator/WaitingUser.java

@@ -0,0 +1,25 @@
+package elevator;
+
+import elevator.Direction;
+import elevator.User;
+
+import java.io.Serializable;
+
+public class WaitingUser implements Serializable
+{
+    private final int floorNum;
+    private final Direction direction;
+
+    public WaitingUser(User user) {
+        this.floorNum = user.getInitialFloor();
+        this.direction = user.getInitialDirection();
+    }
+
+    public int getFloorNum(){
+        return floorNum;
+    }
+
+    public Direction getDesiredDirection(){
+        return direction;
+    }
+}

elevator-server/src/main/java/elevator/server/ElevatorGame.java

@@ -63,6 +63,14 @@ public int[] waitingUsersByFloors() {
         return building.waitingUsersByFloors();
     }
 
+    public Set<WaitingUser> waitingUsers() {
+        return building.waitingUsers();
+    }
+
+    public boolean[] getFloorButtonStatesInElevator() {
+        return building.getFloorButtonStatesInElevator();
+    }
+
     Boolean doorIsOpen() {
         return Door.OPEN.equals(building.door());
     }

elevator-server/src/main/java/elevator/server/PlayerInfo.java

@@ -1,6 +1,11 @@
 package elevator.server;
 
+import elevator.Direction;
+import elevator.WaitingUser;
+import elevator.engine.ElevatorEngine;
+
 import java.io.Serializable;
+import java.util.Set;
 
 public class PlayerInfo implements Serializable {
 
@@ -13,6 +18,9 @@ public class PlayerInfo implements Serializable {
     public final boolean doorIsOpen;
     public final String lastErrorMessage;
     public final String state;
+    public boolean[] upButtonStateByFloor;
+    public boolean[] downButtonStateByFloor;
+    public boolean[] floorButtonStatesInElevator;
 
     public PlayerInfo(ElevatorGame game, Player player) {
         email = player.email;
@@ -24,6 +32,21 @@ public PlayerInfo(ElevatorGame game, Player player) {
         doorIsOpen = game.doorIsOpen();
         lastErrorMessage = game.lastErrorMessage;
         state = game.state.toString();
+
+        initializeBuildingButtonStates(game.waitingUsers());
+        floorButtonStatesInElevator = game.getFloorButtonStatesInElevator();
+    }
+
+    private void initializeBuildingButtonStates(Set<WaitingUser> waitingUsers) {
+        int floorNb = ElevatorEngine.HIGHER_FLOOR - ElevatorEngine.LOWER_FLOOR + 1;
+        upButtonStateByFloor = new boolean[floorNb];
+        downButtonStateByFloor = new boolean[floorNb];
+
+        for (WaitingUser user : waitingUsers) {
+            boolean[] states = user.getDesiredDirection().equals(Direction.DOWN) ? downButtonStateByFloor : upButtonStateByFloor;
+
+            states[user.getFloorNum()] = true;
+        }
     }
 
 }

elevator-server/src/main/webapp/js/app.js

@@ -65,6 +65,43 @@ angular.module('elevatorApp', ['ngCookies', 'md5', 'ui-gravatar', 'elevatorApp.s
                             });
                             layer.add(peopleWaitingTheElevator);
 
+                            if(player.upButtonStateByFloor[numberOfFloors - i])
+                            {
+                                var upArrow = new Kinetic.Text({
+                                     x: 57,
+                                     y: y + 11,
+                                     text: "▲",
+                                     fontSize: 10,
+                                     fontFamily: 'Calibri',
+                                     fill: 'green'
+                                });
+                                layer.add(upArrow);
+                            }
+
+                            if(player.downButtonStateByFloor[numberOfFloors - i])
+                            {
+                                var downArrow = new Kinetic.Text({
+                                    x: 57,
+                                    y: y + 20,
+                                    text: "▼",
+                                    fontSize: 10,
+                                    fontFamily: 'Calibri',
+                                    fill: 'grey'
+                                });
+                                layer.add(downArrow);
+                            }
+
+                            if(player.floorButtonStatesInElevator[numberOfFloors - i])
+                            {
+                                var goIndicator = new Kinetic.Circle({
+                                        x: widthOfFloor - 6,
+                                        y: y + 6,
+                                        radius: 3,
+                                        fill: 'green',
+                                        strokeWidth: 0
+                                      });
+                                layer.add(goIndicator);
+                            }
                         }
 
                         var yElevator = heightOfRoof + ((numberOfFloors - player.elevatorAtFloor) * heightOfFloor);

elevator-server/src/main/webapp/js/elevator.js

@@ -9,7 +9,10 @@ function ElevatorCtrl($scope, $timeout, $http, ElevatorAuth) {
         peopleInTheElevator: 0,
         doorIsOpen: false,
         lastErrorMessage: null,
-        state: 'RESUME'
+        state: 'RESUME',
+        upButtonStateByFloor: new Array(),
+        downButtonStateByFloor: new Array(),
+        floorButtonStatesInElevator: new Array(),
     };
 
     $scope.loggedIn = ElevatorAuth.loggedIn;

run_windows.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+
+echo Run server
+%M2%\mvn --file elevator-server\pom.xml jetty:run