Admin table search controlls

client/src/main/java/com/kritsit/casetracker/client/CaseTrackerClient.java

@@ -44,7 +44,9 @@ public void start(Stage stage) throws Exception {
     private void launchUI(Staff user, Stage stage) throws IOException {
         IUserInterface ui = null;
         switch (user.getPermission()) {
-            case ADMIN: throw new UnsupportedOperationException("Not yet implemented");
+            case ADMIN: logger.debug("User admin. Opening administrator frame");
+                        ui = UserInterfaceFactory.getAdministratorFrame(); 
+                        break;
             case EDITOR: 
             case VIEWER:
                         logger.debug("User editor/viewer. Opening editor frame");

client/src/main/java/com/kritsit/casetracker/client/domain/factory/UserInterfaceFactory.java

@@ -1,5 +1,6 @@
 package com.kritsit.casetracker.client.domain.factory;
 
+import com.kritsit.casetracker.client.domain.ui.AdministratorFrame;
 import com.kritsit.casetracker.client.domain.ui.EditorFrame;
 import com.kritsit.casetracker.client.domain.ui.IUserInterface;
 
@@ -12,4 +13,8 @@ public class UserInterfaceFactory {
     public static IUserInterface getEditorFrame() {
         return new EditorFrame();
     }
+
+    public static IUserInterface getAdministratorFrame() {
+        return new AdministratorFrame();
+    }
 }

client/src/main/java/com/kritsit/casetracker/client/domain/services/Administrator.java

@@ -1,5 +1,6 @@
 package com.kritsit.casetracker.client.domain.services;
 
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -26,7 +27,6 @@ public Staff getUser() {
         return user;    
     }
 
-
     public InputToModelParseResult addUser(Map<String, Object> inputMap) {
         if (inputMap == null || inputMap.isEmpty()) {
             logger.debug("InputMap empty or null. Aborting");
@@ -45,6 +45,7 @@ public InputToModelParseResult addUser(Map<String, Object> inputMap) {
         for(Map.Entry<String, Object> entry : inputMap.entrySet()){
              if(entry.getKey().equals("firstname")) continue;
              if(entry.getKey().equals("position")) continue;
+             if(entry.getKey().equals("permission")&&entry.getValue() instanceof Permission) continue;
              IValidator validator = new StringValidator();
              if(validator.validate(entry.getValue())){
                  continue;
@@ -83,4 +84,9 @@ private Staff parseUser(Map<String, Object> inputMap){
         return staff;
     }
 
+
+    public List<Staff> getInspectors() {
+        return connection.getInspectors();
+    }
+
 }

client/src/main/java/com/kritsit/casetracker/client/domain/services/IAdministratorService.java

@@ -1,12 +1,14 @@
 package com.kritsit.casetracker.client.domain.services;
 
+import java.util.List;
 import java.util.Map;
 
 import com.kritsit.casetracker.shared.domain.model.Staff;
 
 public interface IAdministratorService {
 
     Staff getUser();
+    List<Staff> getInspectors();
     InputToModelParseResult addUser(Map<String, Object> inputMap);
 
 }

client/src/main/java/com/kritsit/casetracker/client/domain/ui/controller/AdministratorController.java

@@ -4,13 +4,15 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.kritsit.casetracker.client.domain.services.IAdministratorService;
 import com.kritsit.casetracker.client.domain.services.InputToModelParseResult;
 import com.kritsit.casetracker.shared.domain.model.Permission;
 import com.kritsit.casetracker.shared.domain.model.Staff;
 
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.Alert;
@@ -75,7 +77,7 @@ public void initialize(){
             alert.setContentText(result.getReason());
             alert.showAndWait();
             }
-            
+
             resetAddUserTab();
         });
 
@@ -102,7 +104,8 @@ private void initStaffTable(){
         departmentColumn.setCellValueFactory(new PropertyValueFactory<Staff, String>("Department"));
         positionColumn.setCellValueFactory(new PropertyValueFactory<Staff, String>("Position"));
 
-        staffTable.setItems(staffList);
+       populateTable();
+
     }
 
     private void resetAddUserTab(){
@@ -123,7 +126,33 @@ private void initPermissionCombobox(){
        ObservableList<String> permissions = 
                FXCollections.observableArrayList(Permission.ADMIN.toString(),
                Permission.EDITOR.toString(), Permission.VIEWER.toString());
-       permissionCombobox = new ComboBox<String>(permissions);
+       permissionCombobox.setItems(permissions);
+    }
+
+    public void populateTable(){
+        Platform.runLater(new Runnable() {
+
+            @Override
+            public void run() {
+                staffList = FXCollections.observableArrayList();
+                List<Staff> users = administratorService.getInspectors();
+                if(users!=null){
+                    for(Staff s : users){
+                        staffList.add(s);
+                    }
+
+                    staffTable.setItems(staffList);
+                }
+                else{
+                    Alert alert = new Alert(AlertType.ERROR);
+                    alert.setTitle("Error");
+                    alert.setHeaderText("Error downloading users list");
+                    alert.setContentText("Check logs for details");
+                    alert.showAndWait();
+                }
+
+            }
+        });
     }
 
     @FXML private TextField searchField;

client/src/main/resources/ui/fxml/AdministratorFrame.fxml

@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="850.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="850.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.kritsit.casetracker.client.domain.ui.controller.AdministratorController">
    <top>
       <MenuBar BorderPane.alignment="CENTER">
         <menus>

client/src/test/java/com/kritsit/casetracker/client/domain/services/AdministratorTest.java

@@ -154,6 +154,16 @@ public void testAddUser_allFieldsFilled() {
         assertTrue(result.isSuccessful());
         verify(connection).addUser(any());
     }
+
+    public void testGetInspectors() {
+        IConnectionService connection = mock(IConnectionService.class);
+        Staff user = mock(Staff.class);
+        IAdministratorService administrator = new Administrator(user, connection);
+
+        administrator.getInspectors(); 
+
+        verify(connection).getInspectors();
+    }
 
 
 }