Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop'HEADv3.0master | Tharre | 2018-06-20 | 100 | -2383/+4332 |
|\ | |||||
| * | Bump version to 3.0develop | Tharre | 2018-06-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of ↵ | Felix Kehrer | 2018-06-20 | 1 | -67/+67 |
| |\ | | | | | | | | | | https://reset.inso.tuwien.ac.at/redmine/proj_ss18_sepm_qse_13/ss18_sepm_qse_13 into develop | ||||
| | * | Merge remote-tracking branch 'origin/develop' into develop | Martin Weick | 2018-06-20 | 2 | -1/+4 |
| | |\ | |||||
| | * | | edit Testdata #28864 | Martin Weick | 2018-06-20 | 1 | -67/+67 |
| | | | | |||||
| * | | | Handle validation errors differently from other Exceptions #28864 | Felix Kehrer | 2018-06-20 | 1 | -4/+13 |
| | |/ | |/| | |||||
| * | | Speed up user interface by only updating operation list when changes could ↵ | Felix Kehrer | 2018-06-20 | 2 | -1/+4 |
| |/ | | | | | | | happen #28864 | ||||
| * | Show validation error message (as changed during Jour Fixe) | Felix Kehrer | 2018-06-20 | 1 | -3/+2 |
| | | |||||
| * | Replace English road & employee names with Austrian ones [#28864] | Dominic Rogetzer | 2018-06-19 | 1 | -278/+278 |
| | | |||||
| * | Set default registration start- & end time [#25963] | Dominic Rogetzer | 2018-06-19 | 1 | -13/+24 |
| | | |||||
| * | Fixup the contextmenu handling for remove #25963 | Tharre | 2018-06-19 | 2 | -34/+9 |
| | | |||||
| * | Added search to archive window [#25963] | Viktoria Pundy | 2018-06-19 | 2 | -4/+80 |
| | | | | | | | | With search, the user can look for a specific archived operation. The search considers operation-code, location, date and name of the cars | ||||
| * | Implement and remove registrations #25963 | Tharre | 2018-06-19 | 3 | -9/+45 |
| | | |||||
| * | Display registrations in archive which are in timeframe only [#25963] | Dominic Rogetzer | 2018-06-19 | 3 | -15/+36 |
| | | | | | | | | E.g. one group of people registers to from 10-12. If the group of people is registered on a car which is sent to the operation within the time it is listed in archive. Otherwise, they are not shown. This restriction is necessary as otherwise, all employees that have been registered to this vehicle would be listed, regardless of the time of their registration | ||||
| * | Fix operationDaoTests due to commit 824e8cb [#25963] | Dominic Rogetzer | 2018-06-19 | 2 | -6/+6 |
| | | |||||
| * | Set status of vehicles to 'ZUM_BERUFUNGSORT' when creating op [#25963] | Dominic Rogetzer | 2018-06-19 | 1 | -1/+8 |
| | | |||||
| * | Fix names of vehicles in test-data [#25963] | Dominic Rogetzer | 2018-06-19 | 6 | -17/+19 |
| | | | | | | | | The name of a vehicle is always "<type>-<vehicleId>" | ||||
| * | Add missing RegistrationDatabaseDao [#25963] | Dominic Rogetzer | 2018-06-19 | 1 | -3/+5 |
| | | |||||
| * | Fix versioning problem where wrong cars showed up in op-detail [#25963] | Dominic Rogetzer | 2018-06-19 | 3 | -9/+12 |
| | | |||||
| * | Change versioning in Operation and Registration [#25963] | Dominic Rogetzer | 2018-06-19 | 4 | -13/+33 |
| | | |||||
| * | Change versioning in RegistrationDatabaseDAO [#25963] | Dominic Rogetzer | 2018-06-19 | 2 | -35/+79 |
| | | |||||
| * | Fixup OperationDao to convert version | Tharre | 2018-06-19 | 1 | -24/+24 |
| | | |||||
| * | Only update when window becomes visible again, greatly speeding up opening ↵ | Felix Kehrer | 2018-06-19 | 1 | -1/+1 |
| | | | | | | | | time of all windows #28864 | ||||
| * | Comment out unnecessary reset #28864 | Felix Kehrer | 2018-06-19 | 1 | -1/+1 |
| | | |||||
| * | Comment out unnecessary reset #28864 | Felix Kehrer | 2018-06-18 | 1 | -1/+1 |
| | | |||||
| * | Only call reset when needed, and then only once instead of twice #28864 | Felix Kehrer | 2018-06-18 | 1 | -2/+1 |
| | | |||||
| * | RequestVehicles GUI list seperation #25953 | Tharre | 2018-06-18 | 2 | -5/+30 |
| | | |||||
| * | Sort imports after rename | Tharre | 2018-06-18 | 35 | -82/+82 |
| | | |||||
| * | Reuse images in EmployeeListItemController [#25963] | Dominic Rogetzer | 2018-06-18 | 1 | -7/+9 |
| | | |||||
| * | Rename 'einsatzverwaltung' to 'missioncontrol' + remove TODO [#25963] | Dominic Rogetzer | 2018-06-18 | 64 | -243/+241 |
| | | |||||
| * | edit Testdata #28617 | Martin Weick | 2018-06-18 | 2 | -10/+10 |
| | | |||||
| * | Fix list. | Andreas Weninger | 2018-06-18 | 1 | -1/+1 |
| | | |||||
| * | Add PopulateDB for testing | Tharre | 2018-06-18 | 1 | -0/+20 |
| | | |||||
| * | UI Changes to match UI Document. Coloring, Scrolling. | Andreas Weninger | 2018-06-18 | 3 | -137/+58 |
| | | |||||
| * | create Testdata #28617 | Martin Weick | 2018-06-18 | 1 | -0/+792 |
| | | |||||
| * | Small adjustment for size of active Operation list [#25963] | Viktoria Pundy | 2018-06-18 | 1 | -1/+1 |
| | | |||||
| * | Fixed a bug where window of active operation would not close [#27300] | Viktoria Pundy | 2018-06-18 | 1 | -0/+2 |
| | | |||||
| * | Add requestVehicle button OperationDetails #24981 | Tharre | 2018-06-18 | 7 | -6/+53 |
| | | |||||
| * | Remove unused code [#25963] | Dominic Rogetzer | 2018-06-17 | 2 | -7/+0 |
| | | |||||
| * | Fix merged code to use showService..() instead | Tharre | 2018-06-17 | 1 | -6/+1 |
| | | |||||
| * | Fix employee&vehicle-dao-tests to use correct alert headers [#25963] | Dominic Rogetzer | 2018-06-17 | 3 | -10/+16 |
| | | |||||
| * | Use specific helper methods for alerts in CreateNewEmployeeCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -15/+8 |
| | | |||||
| * | Use specific helper methods for alerts in CreateOperationCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -22/+18 |
| | | |||||
| * | Use helper methods for alerts in DetailArchiveOperationCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -11/+4 |
| | | |||||
| * | Use helper methods for showing alerts in CreateCarController [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -29/+14 |
| | | |||||
| * | Use helper methods for showing alerts in RegistrationWindowCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -31/+12 |
| | | |||||
| * | Use specific helper methods for alerts in OperationDetailsCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -21/+12 |
| | | |||||
| * | Add showSuccessAlertAndWait method in Helper [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -0/+5 |
| | | |||||
| * | Use helper method to display errors in ArchiveOperationCtrl [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -16/+6 |
| | | |||||
| * | Create methods for displaying validation- and service errors [#25963] | Dominic Rogetzer | 2018-06-17 | 1 | -0/+11 |
| | |