sepm-groupproject - [no description]

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \|
\| *	Adjust EmployeePersistenceTest to use new JdbcTestCase [#25949]	Dominic Rogetzer	2018-05-22	1	-7/+11
\| \|
\| *	Add further DBUnit-Tests for employee.add [#25963]	Dominic Rogetzer	2018-05-22	1	-21/+67
\| \|
\| *	Add file containing expected data for testAddValidEmployeeJoin [#25963]	Dominic Rogetzer	2018-05-22	1	-0/+17
\| \|
\| *	Rename employee persistence test data xml [#25963]	Dominic Rogetzer	2018-05-22	1	-0/+0
\| \|
\| *	Add unit-test testAddValidEmployee [#25949]	Dominic Rogetzer	2018-05-22	2	-0/+82
\| \|
\| *	Open listEmployees.fxml in onEmployeeLinkClicked in main window [#25949]	Dominic Rogetzer	2018-05-22	1	-1/+1
\| \|
\| *	Add and configure ScrollPane for employee list [#25949]	Dominic Rogetzer	2018-05-22	1	-2/+7
\| \|
\| *	Implement EmployeeServiceImpl.update [#25950]	Dominic Rogetzer	2018-05-22	1	-1/+9
\| \|
\| *	Use savepoint and rollback at EmployeeDatabaseDao.add [#25950]	Dominic Rogetzer	2018-05-22	1	-1/+18
\| \|
\| *	Implement EmployeeDatabaseDao.update [#25950]	Dominic Rogetzer	2018-05-22	1	-3/+58
\| \|
\| *	Change scope to 'prototype' [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+2
\| \|
\| *	Change scope to 'prototype' [#25949]	Dominic Rogetzer	2018-05-22	2	-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 Rogetzer	2018-05-22	1	-1/+14
\| \|
\| *	Change callback to consumer for providing employee parameter [#25949]	Dominic Rogetzer	2018-05-22	1	-3/+10
\| \|
\| *	Delete default icons in fxml and set them in code [#25949]	Dominic Rogetzer	2018-05-22	2	-18/+11
\| \|
\| *	Add stub-icons (need to be replaced by real icons) [#25949]	Dominic Rogetzer	2018-05-22	4	-0/+0
\| \|
\| *	Make employee-search case insensitive [#25949]	Dominic Rogetzer	2018-05-22	1	-1/+3
\| \|
\| *	Fix: initialize employee in CreateNewEmployeeController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+8
\| \|
\| *	Implement click callbacks from CreateNewEmployeeController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+6
\| \|
\| *	Add button click callbacks [#25949]	Dominic Rogetzer	2018-05-22	1	-2/+18
\| \|
\| *	Implement openAddEmployee [#25950]	Dominic Rogetzer	2018-05-22	1	-1/+9
\| \|
\| *	Modify CreateNewEmployeeController to be able to edit employee [#25950]	Dominic Rogetzer	2018-05-22	2	-9/+54
\| \|
\| *	Embed header and flowpane in VBox for relative positioning [#25949]	Dominic Rogetzer	2018-05-22	1	-5/+13
\| \|
\| *	Implement ListEmployeesController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+88
\| \|
\| *	Fix image path in EmployeeListItemController [#25949]	Dominic Rogetzer	2018-05-22	1	-2/+2
\| \|
\| *	Fix default image paths for employeeListItem [#25949]	Dominic Rogetzer	2018-05-22	1	-3/+3
\| \|
\| *	Change FilterEmployeeController to use SpringFXMLLoader [#25949]	Dominic Rogetzer	2018-05-22	1	-8/+9
\| \|
\| *	Change EmployeeListItemController to use SpringFXMLLoader [#25949]	Dominic Rogetzer	2018-05-22	1	-11/+13
\| \|
\| *	Add fxml listEmployees (main view of employees) [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+28
\| \|
\| *	Add EmployeeListItemController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+66
\| \|
\| *	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
\| \|
\| *	Add factory method for FilterEmployeesController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+20
\| \|
\| *	Add callbacks for onAddEmployeeClicked, onFilterTextChanged [#25949]	Dominic Rogetzer	2018-05-22	1	-2/+18
\| \|
\| *	Create FilterEmployeesController [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+21
\| \|
\| *	Create fxml file for employee-filter-control [#25949]	Dominic Rogetzer	2018-05-22	1	-0/+18
\| \|
\| *	Remove OperationServiceComponentTest for now	Tharre	2018-05-22	1	-160/+0
\| \| \| \| \| \| \| \|	It causes way to many conflicts and is poorly designed.
\| *	Fix conflicts and reimplement Operation.list()	Tharre	2018-05-22	3	-49/+38
\| \|
\| *	Added Scrollpane for operations in archive view [#24990]	Viktoria Pundy	2018-05-22	3	-4/+8
\| \|
\| *	Added Scrollpane for vehicles in detail view [#24990]	Viktoria Pundy	2018-05-22	2	-2/+7
\| \|
\| *	Resolved some warnings, deleted comments [#24990]	Viktoria Pundy	2018-05-22	4	-14/+8
\| \|
\| *	Small Changes [#24990]	Viktoria Pundy	2018-05-22	3	-24/+20
\| \|