aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Change position of 'Archiv'-link in fxml [#25963]Dominic Rogetzer2018-05-241-1/+1
|
* Merge remote-tracking branch 'origin/develop' into developAndreas Weninger2018-05-2413-56/+62
|\
| * 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-2412-17/+17
| |
* | 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-241-2/+2
|
* 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-243-9/+12
| | | | | 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 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-244-435/+164
|
* 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: 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-231-3/+13
|
* Revert "Fix problem where listing operations would throw exception, ↵Tharre2018-05-232-13/+7
| | | | | | 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-232-7/+13
| | | | 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-2243-465/+1890
|\ | | | | | | | | | | # Conflicts: # src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java # src/main/resources/fxml/CreateOperationController.fxml
| * Open listEmployees.fxml in onEmployeeLinkClicked in main window [#25949]Dominic Rogetzer2018-05-221-1/+1
| |
| * Add and configure ScrollPane for employee list [#25949]Dominic Rogetzer2018-05-221-2/+7
| |
| * Implement EmployeeServiceImpl.update [#25950]Dominic Rogetzer2018-05-221-1/+9
| |
| * Use savepoint and rollback at EmployeeDatabaseDao.add [#25950]Dominic Rogetzer2018-05-221-1/+18
| |
| * Implement EmployeeDatabaseDao.update [#25950]Dominic Rogetzer2018-05-221-3/+58
| |
| * Change scope to 'prototype' [#25949]Dominic Rogetzer2018-05-221-0/+2
| |
| * Change scope to 'prototype' [#25949]Dominic Rogetzer2018-05-222-0/+4
| | | | | | | | | | | | | | | | | | | | This is done because both controllers can and should have multiple instances. The controllers are loaded using SpringFXMLLoader in order to provide constructor dependency injection for possible dependencies. Fxml files/controllers loaded this way need to be @Controller annotated. The default scope for a controller is singleton, which only allows one instantiation. 'Prototype' creates a new instance each time requested.
| * Make use of edit-callback to allow editing employees [#25950]Dominic Rogetzer2018-05-221-1/+14
| |
| * Change callback to consumer for providing employee parameter [#25949]Dominic Rogetzer2018-05-221-3/+10
| |
| * Delete default icons in fxml and set them in code [#25949]Dominic Rogetzer2018-05-222-18/+11
| |
| * Add stub-icons (need to be replaced by real icons) [#25949]Dominic Rogetzer2018-05-224-0/+0
| |
| * Make employee-search case insensitive [#25949]Dominic Rogetzer2018-05-221-1/+3
| |
| * Fix: initialize employee in CreateNewEmployeeController [#25949]Dominic Rogetzer2018-05-221-0/+8
| |
| * Implement click callbacks from CreateNewEmployeeController [#25949]Dominic Rogetzer2018-05-221-0/+6
| |