mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
364 commits 56 branches 0 tags 16 MiB
Commit graph

350 commits

Author SHA1 Message Date
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
Theo Reichert e37c2506b8
Add catalog unit tests with empty set up method 2024-01-08 22:44:00 +01:00
Simon Bruder 20ea9e5869
Document used Template Methods 
Closes #118
 2024-01-08 19:32:03 +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
Denis Natusch 2f06261d87
Add unit tests to the staff package 
The main purpose of this commit is to achieve 100% (line) test
coverage for the staff package.
 2024-01-06 21:50:29 +01:00
Eren Asker 6e4fe14339
Add user tests 2024-01-05 17:37:43 +01:00
Simon Bruder 743e459d41
Align week numbers from time tracking with upstream 
Fixes #123
 2024-01-05 15:40:32 +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 baafd768ec
Add protocol and time recording for 2023-12-15 2024-01-04 10:55:06 +01:00
Simon Bruder 2d87b3928b
Fix typos in Staff integration tests 2024-01-04 10:29:58 +01:00
Simon Bruder 7fbd26d84c
Fix cursed test failure 
This was introduced in 580d3a6af6.

Fixes #121
 2024-01-04 00:56:43 +01:00
Mathis Kral 7b86f96976
Update order package-diagram to match current implementation 
This closes #109.
 2023-12-15 15:10:59 +01:00
Simon Bruder b9f67b452a
Add protocol from 2023-12-08 2023-12-14 23:41:39 +01:00
Simon Bruder 71bb2f768f
Add time recording for week 8 2023-12-14 23:40:36 +01:00
Mathis Kral 699db13864 Add test for wrong addProduct request 
This works on #100
 2023-12-14 20:11:35 +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 b0279a5c78
Add source code link to layout template 
This is required by the terms of the AGPL.

The link to the source code is to a mirror of the original repository,
as the original can’t be made public.
 2023-12-11 20:31:43 +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
Simon Bruder d491e7aa52
Use CC-BY licensed image for interim presentation 
The “Unsplash License” is not an OSI approved License.

Yes, I know that the CC-BY 2.0 is also not OSI approved, but it looks
very compatible to me, as a non-lawyer.
 2023-12-11 17:40:13 +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 c5f6b18cd3
Make inventory authorization tests more complete 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 0200330625
Explicitly handle placement of inventory buttons 2023-12-09 12:02:36 +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 cc05fb2e2e Use the beloved ASCII art as banner 2023-12-07 20:09:59 +01:00
Simon Bruder 0b90fb30c1
Decrease javamoney log level 
Otherwise, the console is flooded with dozens of useless identical
messages.
 2023-12-07 19:58:30 +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
Simon Bruder ee7ab27a6d
Remove legacy from inventory template 
The comments are already addressed (or not needed). Also, UUIDs really
are long and do not add any benefit to the administrator.
 2023-12-05 12:17:22 +01:00
Simon Bruder b6acc2cab3
Add protocol from 2023-11-30 2023-12-05 10:24:08 +01:00
Simon Bruder cd17725ce6
Add time recording for week 7 2023-12-05 10:24:07 +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 a4e82362c8
Add protocol from 2023-11-24 2023-11-28 11:02:23 +01:00
Simon Bruder 35f7f1a7de
Add time recording for week 6 2023-11-28 11:02:22 +01:00
Simon Bruder 9de7f559e9
Add protocol from 2023-11-17 2023-11-28 11:02:22 +01:00
Simon Bruder fa990e45ff
Add time recording for week 5 2023-11-28 11:02:16 +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
Denis Natusch b72fa87445
Use findAll in staff tests 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-27 18:04:07 +01:00
Eren Asker 1b1aac5476
Update developer documentation for 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 18:04: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
Erik Hohlfeld 8cc44c8121 Fix the remove methods to work again 2023-11-26 21:49:55 +01:00
Erik Hohlfeld eab8e3fee0 Add inventory based product selection 2023-11-26 21:49:55 +01:00
Erik Hohlfeld ddf4d7f645 Change CustomCatalogEntryRepository to extend CrudRepository 2023-11-26 21:49:55 +01:00
Mathis Kral f50fbb5ac4 Add basic order-staff-relation 
Works on #73
This contains changes on multiple files to associate
multiple employees with an order and make customers
able to add employees to their order.
Because of SQL JPA things, this will not be final.
 2023-11-26 20:34:23 +01:00
Mathis Kral d207386d1d Add staff functionality to CustomCart and CustomOrder 
This works on #73
This also contains unit-tests for the CustomOrder.
 2023-11-26 20:34:23 +01:00
Theo Reichert 53c40fec2f
Fix link from calender day to page with orders on this day 2023-11-24 20:24:14 +01:00
Theo Reichert e83b6380be
Fix days in calendar and display of events per calendar day 2023-11-24 20:24:14 +01:00
Theo Reichert b836a38942
Add orderCalender 2023-11-24 20:24:13 +01:00
Simon Bruder 391ddaf03b
Create admin user only if it does not yet exist 
Fixes #28
 2023-11-24 20:21:17 +01:00
Mathis Kral a795fc99aa
Add simple get and post tests to order package 
These tests mainly check the correct redirection and working input values,
but not many edge cases or any business logic.

Works on #48
 2023-11-24 19:22:54 +01:00
Mathis Kral d012646537 Remove unused function 2023-11-24 18:53:46 +01:00
Simon Bruder 4c83c661fe
Test inventory error handling 2023-11-24 17:25:34 +01:00
Paul Heimer cbe7d14a64
Update design model of inventory to reflect new methods 2023-11-24 17:25:34 +01:00
Paul Heimer f1f9539aae
Add error handling for inventory 2023-11-24 17:25:33 +01:00
Simon Bruder 6bd1c23e2d
Bind inventory mutate form to template 
Co-authored-by: Paul Heimer <heimerp54@gmail.com>
 2023-11-24 17:25:33 +01:00
Simon Bruder 695bc1d821
Do not use MonetaryAmount in inventory mutate form 
While this creates duplicate code in the controller, it will vastly
simplify handling the form values.
 2023-11-24 17:25:33 +01:00
Simon Bruder f7d859b25d
Add integration tests for inventory controller 2023-11-24 17:25:32 +01:00
Simon Bruder 58dae6532e
Make inventory only accessible for administrator 
Fixes #33
 2023-11-24 17:25:32 +01:00
Denis Natusch 2515c17de5
Let admin edit all fields of customer 2023-11-24 15:47:23 +01:00
Denis Natusch b944d04b5d
Add tests to staff package 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-23 16:10:01 +01:00
Denis Natusch 79895d715b
Log out user properly after changing own username 2023-11-22 15:25:03 +01:00
Denis Natusch 6c8daa5287
Use enum for job types 2023-11-21 18:06:12 +01:00
Denis Natusch 5aeaf01e0e
Remove surname from staff 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-21 18:06:12 +01:00
Denis Natusch 3ecdcffbcd
Simplifiy user id 2023-11-21 18:06:11 +01:00
Erik Hohlfeld 317af597f5
Make orderCatalog use OrderType 2023-11-21 18:04:56 +01:00
Denis Natusch 2248e8eeef
Replace address input with textarea 2023-11-21 18:04:56 +01:00
Denis Natusch 6759841742
Implement staff with salespoint 
Co-authored-by: Eren Asker <eren.asker@mailbox.tu-dresden.de>
 2023-11-21 18:04:54 +01:00
Denis Natusch eccff8d2b0
Refuse nullbyte as password 
Closes #26
 2023-11-21 18:04:54 +01:00
Mathis Kral 27fdc3ef02
Add additional functionality to order package 
This adds improved product removal from cart, changeable order time and
nice colors to order list.

Works on #38
 2023-11-21 18:04:16 +01:00
Denis Natusch ea24c27d6e
Add more attributes to user/customer 
Closes #42
 2023-11-21 18:04:15 +01:00
Mathis Kral a8a67a9626
Update basics of order package to salespoint 
This removes the calendar, as it currently conflicts with the salespoint
architecture.

Works on #38
 2023-11-21 18:04:14 +01:00
Simon Bruder 0c4286e198
Use valid e-mail in footer 2023-11-21 18:00:38 +01:00
Simon Bruder 0fb4d910fb
Rename test package to catering 2023-11-21 18:00:38 +01:00
Theo Reichert 5cc1596363
Fix template and css for calender 2023-11-21 18:00:37 +01:00
Simon Bruder 5446483776
Use more friendly welcome message 
Co-authored-by: Erik Hohlfeld <erik.hohlfeld@mailbox.tu-dresden.de>
 2023-11-21 18:00:37 +01:00
Simon Bruder 09a79e0b95
Make footer more professional 2023-11-21 18:00:37 +01:00
Simon Bruder 32f997464e
Don’t use messages 
The system won’t be multilingual anyway, so this just adds complexity
and things to trip over.

Closes #25
 2023-11-21 18:00:36 +01:00
Denis Natusch 7dfc7f66f9
Remove unused model parameter from UserController 
Closes #21
 2023-11-21 18:00:36 +01:00
Denis Natusch 11f00f52f0
Remove AuthenticationManagement 
Closes #20
 2023-11-21 18:00:36 +01:00