Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into change_operation_status_fix | Viktoria Pundy | 2018-05-22 | 15 | -133/+407 |
|\ | | | | | | | | | | | # Conflicts: # src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java # src/main/resources/fxml/CreateOperationController.fxml | ||||
| * | Add and configure ScrollPane for employee list [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -2/+7 |
| | | |||||
| * | Delete default icons in fxml and set them in code [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -16/+3 |
| | | |||||
| * | Add stub-icons (need to be replaced by real icons) [#25949] | Dominic Rogetzer | 2018-05-22 | 4 | -0/+0 |
| | | |||||
| * | Modify CreateNewEmployeeController to be able to edit employee [#25950] | Dominic Rogetzer | 2018-05-22 | 1 | -3/+2 |
| | | |||||
| * | Embed header and flowpane in VBox for relative positioning [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -5/+13 |
| | | |||||
| * | Fix default image paths for employeeListItem [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -3/+3 |
| | | |||||
| * | Add fxml listEmployees (main view of employees) [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -0/+28 |
| | | |||||
| * | Create fxml employeeListItem [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -0/+69 |
| | | |||||
| * | Adjust width of filterEmployeesControl [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -2/+3 |
| | | |||||
| * | Create fxml file for employee-filter-control [#25949] | Dominic Rogetzer | 2018-05-22 | 1 | -0/+18 |
| | | |||||
| * | Fix conflicts and reimplement Operation.list() | Tharre | 2018-05-22 | 1 | -3/+1 |
| | | |||||
| * | Added Scrollpane for operations in archive view [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -1/+5 |
| | | |||||
| * | Added Scrollpane for vehicles in detail view [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -1/+6 |
| | | |||||
| * | Small Changes [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -2/+2 |
| | | |||||
| * | Renamed ArchivOperation to ArchiveOperation [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -1/+1 |
| | | |||||
| * | Vehicles are now shown in detail view [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -4/+5 |
| | | |||||
| * | Added Details for Archive Operation [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -0/+49 |
| | | | | | | | | Added fxml-file for details of one operation as well as methods to fill in data and show Data in UI | ||||
| * | Fixed a bug where children of flow pane would not be shown [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -9/+3 |
| | | |||||
| * | Changed archiv to standalone window [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -5/+11 |
| | | | | | | | | Changed methods in order to make ArchivOperation a window independent of createOperation, buttons are not yet visible | ||||
| * | Started adding elements, implemented first methods for archivOperation [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -1/+6 |
| | | |||||
| * | Included ArchivOperation into CreateOperation [#24990] | Viktoria Pundy | 2018-05-22 | 2 | -2/+3 |
| | | |||||
| * | Added elements for archive page [#24990] | Viktoria Pundy | 2018-05-22 | 1 | -0/+6 |
| | | |||||
| * | Implement cancel Button in CreateCarController #25948 | Martin Weick | 2018-05-22 | 1 | -1/+1 |
| | | |||||
| * | #[25947]Change UI for Vehicle Update | Martin Weick | 2018-05-22 | 1 | -1/+2 |
| | | |||||
| * | Fix regression caused by commit:3f84016 | Tharre | 2018-05-22 | 1 | -2/+2 |
| | | | | | | | | | | | | Enums have ordering is important, commit:3f84016 changed ordering of the Vehicle.Status enum, but failed to also change that in the database schema. | ||||
| * | Add logback.xml | Tharre | 2018-05-21 | 1 | -0/+23 |
| | | |||||
| * | [#25957] Improved css-File. (Comments, structure, less redundancy) | Andreas Weninger | 2018-05-21 | 3 | -17/+51 |
| | | |||||
| * | [#25958] Further revert changes from wrong aproach. | Andreas Weninger | 2018-05-21 | 1 | -1/+0 |
| | | |||||
| * | [#25958] Deleteing wrong aproach. | Andreas Weninger | 2018-05-21 | 1 | -21/+0 |
| | | |||||
| * | [#25958] Reformating. | Andreas Weninger | 2018-05-21 | 1 | -1/+1 |
| | | |||||
| * | [#25958] Implementing Context Menu as JavaFX Context Menu. | Andreas Weninger | 2018-05-21 | 1 | -7/+0 |
| | | |||||
| * | Status menu FXML & Controller | Andreas Weninger | 2018-05-21 | 3 | -5/+35 |
| | | |||||
| * | StatusMenu | Andreas Weninger | 2018-05-21 | 1 | -0/+9 |
| | | |||||
| * | Reworking MainWindow UI. | Andreas Weninger | 2018-05-21 | 2 | -97/+58 |
| | | |||||
| * | UI Changes Main Window | Andreas Weninger | 2018-05-21 | 2 | -70/+97 |
| | | |||||
| * | [#25958] Apply code formatting. Context Menu Label now bold and black while ↵ | Andreas Weninger | 2018-05-21 | 1 | -2/+19 |
| | | | | | | | | highlighted. Annotate stuff. | ||||
| * | Updated Visuals in MainWindow. | Andreas Weninger | 2018-05-21 | 2 | -9/+25 |
| | | |||||
| * | Reworking MainWindow UI. | Andreas Weninger | 2018-05-21 | 3 | -97/+86 |
| | | |||||
| * | UI Changes Main Window | Andreas Weninger | 2018-05-21 | 3 | -106/+124 |
| | | |||||
| * | Fix DBUnit's enums and revert database changes | Tharre | 2018-05-12 | 1 | -13/+7 |
| | | |||||
* | | Added methods and files | Viktoria Pundy | 2018-05-22 | 2 | -0/+104 |
|/ | |||||
* | Reformat. | Andreas Weninger | 2018-05-08 | 1 | -45/+45 |
| | | | | Implemented find maximum education in VehiclePaneController; relies on EducationLevel.Compare. | ||||
* | VehiclePane FXML | Andreas Weninger | 2018-05-08 | 6 | -11/+67 |
| | |||||
* | Empty skeleton for VehiclePane. | Andreas Weninger | 2018-05-08 | 1 | -0/+14 |
| | |||||
* | Change header-background-color and add drop-shadows to main elements | Dominic Rogetzer | 2018-05-07 | 1 | -6/+6 |
| | |||||
* | Changed test behaviour to leave "clean" database for other tests | Felix Kehrer | 2018-05-07 | 1 | -0/+5 |
| | |||||
* | Changed enums (and similar fields) to match enum names of Java | Felix Kehrer | 2018-05-07 | 2 | -8/+10 |
| | |||||
* | Merge branch 'main_controller' into review_fahrzeug_anmelden | Felix Kehrer | 2018-05-07 | 1 | -6/+7 |
|\ | |||||
| * | Change CreateOperationController.fxml labels to hyperlinks with onAction | Dominic Rogetzer | 2018-05-07 | 1 | -6/+7 |
| | |