| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Included fxml-Files | Viktoria Pundy | 2018-05-26 | 10 | -20/+94 |
| | | | | | Included fxml-Files "ArchiveOperation", "createCar", "listEmployees" and "RegistrationWindow" in "CreateOperationController". Therefore these windows are not standalone windows anymore but part of the main window. Additionally, methods were added to their respective controllers in order to show and hide the windows | ||||
| * | Change position of 'Archiv'-link in fxml [#25963] | Dominic Rogetzer | 2018-05-24 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into develop | Andreas Weninger | 2018-05-24 | 19 | -73/+79 |
| |\ | |||||
| | * | Fix IllegalArgumentException with opCode #25963 | Tharre | 2018-05-24 | 1 | -1/+2 |
| | | | | | | | | | RE-021E4 causes IllegalArgumentException | ||||
| | * | Use try-with-res. in EmployeeDatabaseDAO #25963 | Tharre | 2018-05-24 | 1 | -38/+43 |
| | | | |||||
| | * | Change package structure/naming #25963 | Tharre | 2018-05-24 | 18 | -34/+34 |
| | | | |||||
| * | | Hotfix: Default text for VehiclePanes-Qualification is now - | Andreas Weninger | 2018-05-24 | 1 | -1/+1 |
| |/ | |||||
| * | Hotfix: After setting status an update is performed. | Andreas Weninger | 2018-05-24 | 1 | -3/+9 |
| | | |||||
| * | Fix compare exception with rankVehicle #25963 | Tharre | 2018-05-24 | 1 | -14/+18 |
| | | |||||
| * | Fix id validation in OperationService #25963 | Tharre | 2018-05-24 | 2 | -4/+3 |
| | | |||||
| * | Fix NPE when choseVehicle is null | Martin Weick | 2018-05-24 | 1 | -18/+21 |
| | | |||||
| * | Add onOperationCodeChanged method + format in fxml | Martin Weick | 2018-05-24 | 1 | -9/+19 |
| | | |||||
| * | Set severity inside OperationService.add() #25963 | Tharre | 2018-05-24 | 4 | -13/+15 |
| | | | | | | This avoids duplicate parsing in the UI or adding a getSeverityFromOpcode() method to the interface. | ||||
| * | Use rankVehicles() in ui instead of list #25963 | Tharre | 2018-05-24 | 1 | -4/+20 |
| | | |||||
| * | Implement rankVehicles from Andi #25963 | Tharre | 2018-05-24 | 1 | -2/+65 |
| | | |||||
| * | Change OperationService rankVehicle() #25963 | Tharre | 2018-05-24 | 2 | -5/+5 |
| | | | | | | Taken an opCode instead of a operationId, since we need the ranking before the operation is created. | ||||
| * | Fix VehicleServiceImpl von empty to !empty Id #25963 | Martin Weick | 2018-05-24 | 1 | -1/+1 |
| | | |||||
| * | Hotfix: Correctly apply styles. | Andreas Weninger | 2018-05-24 | 1 | -2/+7 |
| | | |||||
| * | Fix conflict with OperationDAOTest #25963 | Tharre | 2018-05-24 | 1 | -2/+7 |
| | | |||||
| * | Fix vehicleTestData, vehicleTestUpdateExpectedData (id swap) [#25963] | Dominic Rogetzer | 2018-05-24 | 2 | -13/+13 |
| | | | | | Changes relate to 'side-fix' addressed in f43bb72 | ||||
| * | Add missing constructor parameters in VehiclePersistenceTest [#25963] | Dominic Rogetzer | 2018-05-24 | 1 | -2/+12 |
| | | | | | Additional parameters for VehicleDatabaseDao were added in previous commit f43bb72 | ||||
| * | Add missing constructor parameters in RegistrationDAOTest [#25963] | Dominic Rogetzer | 2018-05-24 | 1 | -1/+5 |
| | | | | | Additional parameters were added in 19419f8 | ||||
| * | Fix vehicle-dao [#25963] | Dominic Rogetzer | 2018-05-24 | 1 | -5/+9 |
| | | | | | | 1) set registrations in vehicleFromRS 2) side-fix: change 'version' to 'id' in update method as they were previously swapped. Same fix was done today in add method, but not in update | ||||
| * | Prepare vehicle-dao fix by adding RegistrationDatabaseDAO.list [#25963] | Dominic Rogetzer | 2018-05-24 | 1 | -1/+42 |
| | | |||||
| * | Fix and cleanup Operation dao+service #25963 | Tharre | 2018-05-24 | 9 | -1013/+272 |
| | | |||||
| * | Fix DBUnit warnings | Tharre | 2018-05-24 | 1 | -0/+7 |
| | | |||||
| * | Fields in create-operation mechanism are cleared after successful creation ↵ | Viktoria Pundy | 2018-05-23 | 1 | -2/+6 |
| | | | | | [#25963] | ||||
| * | Adjusted methods in Controllers [#25963] | Viktoria Pundy | 2018-05-23 | 8 | -93/+86 |
| | | | | | Changed modifier for FXML-annotated methods and variables from public to private, added implementation of services/controllers through constructors (dependency injection), changed fxmlloader to spring-fxmlloader for archive window | ||||
| * | JF: Change SQL-string to final [#27241] | Dominic Rogetzer | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | JF: Move VehiclePersistenceTest to correct package [#27241] | Dominic Rogetzer | 2018-05-23 | 1 | -3/+1 |
| | | |||||
| * | JF: Remove duplicate code by extracting validation-method [#27241] | Dominic Rogetzer | 2018-05-23 | 1 | -45/+13 |
| | | |||||
| * | Fix insert bug in RegistrationDAO.add() | Tharre | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | Work around H2 bug in operation.list() | Tharre | 2018-05-23 | 2 | -3/+22 |
| | | |||||
| * | Revert "Fix problem where listing operations would throw exception, ↵ | Tharre | 2018-05-23 | 2 | -13/+7 |
| | | | | | | | downgrading h2 to 1.4.196 because of bug in .197 #24993" This reverts commit d13cee465d399895668a88edc34a30a4d0a380c5. | ||||
| * | Fix VehicleVersion Id #25963 | Martin Weick | 2018-05-23 | 1 | -10/+16 |
| | | |||||
| * | Fix employees being added twice instead of removed #25963 | Felix Kehrer | 2018-05-23 | 1 | -2/+7 |
| | | |||||
| * | Fixed an error which would duplicate vehicles [#24981] | Viktoria Pundy | 2018-05-23 | 1 | -27/+0 |
| | | |||||
| * | Fix problem where listing operations would throw exception, downgrading h2 ↵ | Felix Kehrer | 2018-05-23 | 2 | -7/+13 |
| | | | | | to 1.4.196 because of bug in .197 #24993 | ||||
| * | fixing registration Employee list #25874 | Martin Weick | 2018-05-22 | 1 | -0/+6 |
| | | |||||
| * | Show only registered vehicles in main window [#25874] | Dominic Rogetzer | 2018-05-22 | 1 | -1/+3 |
| | | |||||
| * | Replace assert statements by if-null early-returns [#25874] | Dominic Rogetzer | 2018-05-22 | 1 | -2/+8 |
| | | |||||
| * | Fixed some errors, added listener for mouse input on active-operation list | Viktoria Pundy | 2018-05-22 | 4 | -16/+51 |
| | | |||||
| * | Merge branch 'develop' into change_operation_status_fix | Viktoria Pundy | 2018-05-22 | 73 | -880/+3009 |
| |\ | | | | | | | | | | | # Conflicts: # src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java # src/main/resources/fxml/CreateOperationController.fxml | ||||
| | * | Remove id-columns at comparison [#25874] | Dominic Rogetzer | 2018-05-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | Cannot ensure that next autogenerated id is X, because DBUnit just refreshes the DB, which is deleting the entries but not resetting sequences | ||||
| | * | Remove tearDownOperation from EmployeePersistenceTest + format [#25950] | Dominic Rogetzer | 2018-05-22 | 1 | -7/+0 |
| | | | | | | | | | | | tearDownOperation method not needed anymore, as with the new version of JdbcTestCase, teardown automatically clears database | ||||
| | * | Implement service tests for employeeUpdate [#25950] | Dominic Rogetzer | 2018-05-22 | 1 | -8/+20 |
| | | | |||||
| | * | Access jdbcConnectionManager via getter [#25963] | Dominic Rogetzer | 2018-05-22 | 1 | -1/+1 |
| | | | |||||
| | * | Refactor EmployeeServiceTest to use a single builder [#25963] | Dominic Rogetzer | 2018-05-22 | 1 | -23/+12 |
| | | | |||||
| | * | Implement tests for updating a valid and non-existing employee [#25949] | Dominic Rogetzer | 2018-05-22 | 2 | -2/+78 |
| | | | |||||
| | * | Refactor testAddValidEmployeeJoin to use helper methods [#25963] | Dominic Rogetzer | 2018-05-22 | 1 | -8/+6 |
| | | | |||||
 |
index : sepm-groupproject | |
| [no description] | Tharre |
| aboutsummaryrefslogtreecommitdiffstats |