aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update README.mdTharre2018-05-241-3/+10
|
* Change position of 'Archiv'-link in fxml [#25963]Dominic Rogetzer2018-05-241-1/+1
|
* Merge remote-tracking branch 'origin/develop' into developAndreas Weninger2018-05-2419-73/+79
|\
| * Fix IllegalArgumentException with opCode #25963Tharre2018-05-241-1/+2
| | | | | | | | RE-021E4 causes IllegalArgumentException
| * Use try-with-res. in EmployeeDatabaseDAO #25963Tharre2018-05-241-38/+43
| |
| * Change package structure/naming #25963Tharre2018-05-2418-34/+34
| |
* | Hotfix: Default text for VehiclePanes-Qualification is now -Andreas Weninger2018-05-241-1/+1
|/
* Hotfix: After setting status an update is performed.Andreas Weninger2018-05-241-3/+9
|
* Fix compare exception with rankVehicle #25963Tharre2018-05-241-14/+18
|
* Fix id validation in OperationService #25963Tharre2018-05-242-4/+3
|
* Fix NPE when choseVehicle is nullMartin Weick2018-05-241-18/+21
|
* Add onOperationCodeChanged method + format in fxmlMartin Weick2018-05-241-9/+19
|
* Set severity inside OperationService.add() #25963Tharre2018-05-244-13/+15
| | | | | This avoids duplicate parsing in the UI or adding a getSeverityFromOpcode() method to the interface.
* Use rankVehicles() in ui instead of list #25963Tharre2018-05-241-4/+20
|
* Implement rankVehicles from Andi #25963Tharre2018-05-241-2/+65
|
* Change OperationService rankVehicle() #25963Tharre2018-05-242-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 #25963Martin Weick2018-05-241-1/+1
|
* Hotfix: Correctly apply styles.Andreas Weninger2018-05-241-2/+7
|
* Fix conflict with OperationDAOTest #25963Tharre2018-05-241-2/+7
|
* Fix vehicleTestData, vehicleTestUpdateExpectedData (id swap) [#25963]Dominic Rogetzer2018-05-242-13/+13
| | | | Changes relate to 'side-fix' addressed in f43bb72
* Add missing constructor parameters in VehiclePersistenceTest [#25963]Dominic Rogetzer2018-05-241-2/+12
| | | | Additional parameters for VehicleDatabaseDao were added in previous commit f43bb72
* Add missing constructor parameters in RegistrationDAOTest [#25963]Dominic Rogetzer2018-05-241-1/+5
| | | | Additional parameters were added in 19419f8
* Fix vehicle-dao [#25963]Dominic Rogetzer2018-05-241-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 Rogetzer2018-05-241-1/+42
|
* Fix and cleanup Operation dao+service #25963Tharre2018-05-249-1013/+272
|
* Fix DBUnit warningsTharre2018-05-241-0/+7
|
* Fields in create-operation mechanism are cleared after successful creation ↵Viktoria Pundy2018-05-231-2/+6
| | | | [#25963]
* Adjusted methods in Controllers [#25963]Viktoria Pundy2018-05-238-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 Rogetzer2018-05-231-1/+1
|
* JF: Move VehiclePersistenceTest to correct package [#27241]Dominic Rogetzer2018-05-231-3/+1
|
* JF: Remove duplicate code by extracting validation-method [#27241]Dominic Rogetzer2018-05-231-45/+13
|
* Fix insert bug in RegistrationDAO.add()Tharre2018-05-231-1/+1
|
* Work around H2 bug in operation.list()Tharre2018-05-233-4/+23
|
* Revert "Fix problem where listing operations would throw exception, ↵Tharre2018-05-233-14/+8
| | | | | | downgrading h2 to 1.4.196 because of bug in .197 #24993" This reverts commit d13cee465d399895668a88edc34a30a4d0a380c5.
* Fix VehicleVersion Id #25963Martin Weick2018-05-231-10/+16
|
* Fix employees being added twice instead of removed #25963Felix Kehrer2018-05-231-2/+7
|
* Fixed an error which would duplicate vehicles [#24981]Viktoria Pundy2018-05-231-27/+0
|
* Fix problem where listing operations would throw exception, downgrading h2 ↵Felix Kehrer2018-05-233-8/+14
| | | | to 1.4.196 because of bug in .197 #24993
* fixing registration Employee list #25874Martin Weick2018-05-221-0/+6
|
* Show only registered vehicles in main window [#25874]Dominic Rogetzer2018-05-221-1/+3
|
* Replace assert statements by if-null early-returns [#25874]Dominic Rogetzer2018-05-221-2/+8
|
* Fixed some errors, added listener for mouse input on active-operation listViktoria Pundy2018-05-224-16/+51
|
* Merge branch 'develop' into change_operation_status_fixViktoria Pundy2018-05-2276-909/+3034
|\ | | | | | | | | | | # 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 Rogetzer2018-05-221-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 Rogetzer2018-05-221-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 Rogetzer2018-05-221-8/+20
| |
| * Access jdbcConnectionManager via getter [#25963]Dominic Rogetzer2018-05-221-1/+1
| |
| * Refactor EmployeeServiceTest to use a single builder [#25963]Dominic Rogetzer2018-05-221-23/+12
| |
| * Implement tests for updating a valid and non-existing employee [#25949]Dominic Rogetzer2018-05-222-2/+78
| |
| * Refactor testAddValidEmployeeJoin to use helper methods [#25963]Dominic Rogetzer2018-05-221-8/+6
| |