mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-06-28 12:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
363 commits 56 branches 0 tags 16 MiB
Commit graph

119 commits

Author SHA1 Message Date
Mathis Kral 580489d216 Remove CustomCatalogEntryDataInitializer 2024-01-26 16:04:33 +01:00
Theo Reichert c1e561821c Replace order id in template with order type 2024-01-19 23:36:24 +01:00
Erik Hohlfeld 5aefd4e05f Filter and distinguish products in orderCatalog 2024-01-19 19:00:51 +01:00
Simon Bruder 016d2f5715
Reorder setters/getters in InventoryMutateForm 
Some methods were not ordered before.
 2024-01-19 13:04:01 +01:00
Mathis Kral e6542dce7a Add missing order tests 2024-01-18 09:29:06 +01:00
Mathis Kral 8929868895 Fix checkout bug where items got deleted 
This works on #145.
Before this, if an item got removed out of the inventory by the
admin and the user tried to checkout, the application crashed.
 2024-01-18 09:29:06 +01:00
Denis Natusch de6b9cfd0f
Remove inner classes from UserForm 2024-01-17 14:39:25 +01:00
Denis Natusch 073600a92c
Remove unused imports 2024-01-17 12:17:30 +01:00
Mathis Kral fd76f700c9 Fix warning for deprecated constructor 2024-01-16 20:00:39 +01:00
Denis Natusch f808c2497d Remove employee if associated with order 2024-01-15 19:25:20 +01:00
Simon Bruder d0ac59de87
Fix typo in InventoryInitializer 2024-01-14 17:06:15 +01:00
Denis Natusch da19356496
Fix modify profile issue 
Closes: #141
 2024-01-14 15:07:29 +01:00
Theo Reichert ff8bbdca15
Resolve some intentionality issues 2024-01-12 15:25:18 +01:00
Theo Reichert d27c1958d7
Introduce new lines to reduce code smells 2024-01-12 15:25:18 +01:00
Mathis Kral 2ccc9fcdfb Update /allOrders/{day} to work with status-filter 
This works on #115

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
 2024-01-09 14:04:11 +01:00
Theo Reichert ea78ec93b7 Add working filtration of orders for admin 2024-01-09 14:04:11 +01:00
Mathis Kral f961071265 Add employee query to order controller 
This was simply forgotten before cross-testing.
 2024-01-09 13:50:10 +01:00
Simon Bruder 8ab01fd65f
Simplify signature of InventoryMutateForm::of 
This complicates the subclasses’ implementation, but it avoids having
to pass an unnecessary parameter.
 2024-01-09 10:53:12 +01:00
Simon Bruder 7365b384e3
Make metric variable 
This was somehow overlooked, but it should work.

This needs to change how the InventoryMutateForm handles quantities, as
the amount has to be split from the metric for addition to work.
 2024-01-09 10:53:12 +01:00
Denis Natusch 06fc8732cc
Refuse username if username is already in use 2024-01-08 18:47:11 +01:00
Denis Natusch 13641bc6a2
Use form for editing customer profile 2024-01-08 16:00:40 +01:00
Simon Bruder 6297f3c073
Update copyright dates of recently changed files 
I forgot to update them in commits
743e459d41,
90d368a95b,
7fbd26d84c,
and 2d87b3928b.

It also adds swt23w23 as copyright owner on the time recording, as this
was forgotten when the attributions had initially been added.
 2024-01-06 22:06:48 +01:00
Simon Bruder 90d368a95b
Implement hashCode/equals on ID for Entities 
This also drops an angry comment that was the result of not being able
to fathom the default behaviour.

Fixes #87.
 2024-01-04 11:43:20 +01:00
Mathis Kral 44c9eb8f3a Add order backend for kundenwunsch 
This checks if the requested product to add is suitable for the event.
This works on #100
 2023-12-14 20:11:35 +01:00
Denis Natusch 5736b49080
Remove redundant code from viewProfile method 2023-12-14 09:53:14 +01:00
Simon Bruder bac025fd0a
Make project REUSE compliant 
This finally makes the licensing under AGPL-3.0-or-later explicit after
I got the okay from the kickstart source owners.

This also checks the REUSE compliance in a pre commit hook, and
therefore also in CI.
 2023-12-11 17:59:14 +01:00
Paul Heimer 4300ee0408
Add comments to InventoryController 2023-12-09 12:02:38 +01:00
Simon Bruder e24ea8704f
Fix argument type for InventoryController::addRentable 2023-12-09 12:02:38 +01:00
Simon Bruder 4d89fdc10a
Restrict product types for inventory edit 
The error message gets slightly less meaningful, but either are
currently just a mess.
 2023-12-09 12:02:38 +01:00
Simon Bruder 0eb3276dde
Use class-wide PreAuthorize for InventoryController 
This should protect against accidentally forgetting it for one method.
 2023-12-09 12:02:37 +01:00
Simon Bruder 3e2cc3d0b2
Allow specifying order types in inventory 
Fixes #95
 2023-12-09 12:02:37 +01:00
Simon Bruder 580d3a6af6
Implement per-month employee working hours 
Closes #76

Co-auther-by: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
 2023-12-09 00:35:43 +01:00
Paul Heimer e4d23d8e81
Add invoice for customer 2023-12-08 17:37:52 +01:00
Mathis Kral cb3a33651e Associate rentables with order and event explicitly 
This closes #74

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
 2023-12-07 17:06:43 +01:00
Mathis Kral 6dab8319a7 Fix broken cart cleanup 
This fixes an error occuring when multiple employees were
added to the event before checkout.
 2023-12-07 17:06:43 +01:00
Denis Natusch af09dd4a83
Add wage to employee 2023-12-05 10:14:15 +01:00
Denis Natusch 17a0e29dad
Add getAvailableStaffByJob to staff package 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-12-05 10:14:15 +01:00
Simon Bruder 2dff2842fc
Adapt inventory to new catalog interface 
This also does a major restructuring of the inventory mutate form.

Some things still are not as they should be, but it mostly works like
before. They can be fixed later.

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
 2023-11-29 18:42:37 +01:00
Theo Reichert a4099f1de0
Fully adapt catalog to salespoint 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-29 17:15:04 +01:00
Denis Natusch 0119b1cfa0
Add staff form and bind it to model 
Closes #51
 2023-11-29 12:25:29 +01:00
Simon Bruder c398c12592
Remove unused parameter in InventoryController 
This was introduced in 6bd1c23e2d.
 2023-11-27 18:45:38 +01:00
Denis Natusch 8a084b1f2e
Add test for form validator 
The validator requires some changes to already existing tests.

Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-27 18:25:55 +01:00
Denis Natusch d7c4482200
Add form validator to users package 
Closes #35
Closes #59
Closes #64
Closes #71

Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-27 18:11:07 +01:00
Simon Bruder 4f1ed1f134
Use proper terminology for Staff and Employee 
Staff is plural. The singular should be employee or a synonym.

Co-authored-by: Mathis Kral <mathis_tiberius.kral@mailbox.tu-dresden.de>
 2023-11-27 18:03:26 +01:00
Simon Bruder a90a8cc051
Simplify staff addition and update 2023-11-27 16:46:46 +01:00
Simon Bruder 14dc478e41
Unify naming of employee id 2023-11-27 16:46:46 +01:00
Simon Bruder 3ebedd4ad8
Remove unused attribute in staff listing 2023-11-27 16:46:45 +01:00
Eren Asker b4dfa72852
Unify adding staff 
Co-authored-by: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-27 16:46:44 +01:00
Eren Asker 403cc56ae0
Return Streamable in StaffManagement.findAll 2023-11-27 16:46:43 +01:00
Erik Hohlfeld 795ccc31d2 Base orderCatalog fully on salespoint 2023-11-26 21:49:55 +01:00