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

343 commits

Author SHA1 Message Date
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
Simon Bruder 0f4b174460
Remove duplicate title elements 
The title element should only be set by the layout template.
 2023-11-21 18:00:35 +01:00
Simon Bruder aaa8b38f6b
Switch to bootstrap for styling 2023-11-21 18:00:35 +01:00
Simon Bruder 967db8793e
Move footer into body 2023-11-21 18:00:35 +01:00
Simon Bruder bc7bc6345d
Inline static strings in welcome 2023-11-21 18:00:34 +01:00
Simon Bruder 1320de9f3c
Use more modern charset declaration 
This also deduplicates the charset declaration to only specify it once.
 2023-11-21 18:00:34 +01:00
Simon Bruder a8d4e0ef5d
Use correct UTF-8 in welcome template 2023-11-21 18:00:34 +01:00
Mathis Kral a276701c8a
Add sec:authorize to catalog and orders 
Closes #22
 2023-11-21 18:00:33 +01:00
Denis Natusch 9eeb25a281
Make only customers able to delete their own account 2023-11-21 18:00:33 +01:00
Denis Natusch cbb9710371
Logout user when changing the username 2023-11-21 18:00:32 +01:00
Denis Natusch 02551aa802
Make only enabled customers able to be removed 2023-11-21 18:00:32 +01:00
Theo Reichert bb5e89a83d
Update cell in calender links to orders filteredByDay 2023-11-21 18:00:32 +01:00
Theo Reichert 9b71926c58
Fix calender() order in wrong calender day/cell 2023-11-21 18:00:31 +01:00
Mathis Kral c7c8a0126a
Add improved checkout 2023-11-21 18:00:31 +01:00
Mathis Kral b3d93685c3
Add filteredByDay to OrderController 2023-11-21 18:00:31 +01:00
Denis Natusch d29c1b4553
Logout customer after deleting their account 2023-11-21 18:00:30 +01:00
Denis Natusch cd401219e2
Make user consistent with design model 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-21 18:00:30 +01:00
Simon Bruder 578968296d
Fix thymeleaf deprecation warnings in layout 2023-11-21 18:00:30 +01:00
Simon Bruder 7d3a5f4d0c
Integrate security into navigation 
This also simplifies the template quite a bit, as it previously
contained some redundancy.
 2023-11-21 18:00:29 +01:00
Mathis Kral 1598a57a61
Include layout.html 2023-11-21 18:00:29 +01:00
Theo Reichert 1777e268db
Add calender to OrderController 
calender displays `order.id`s per day
 2023-11-21 18:00:29 +01:00
Theo Reichert 397027a650
Add calender to OrderController 
calender can't count orders per day
 2023-11-21 18:00:28 +01:00
Erik Hohlfeld 24e4ce63dc
Add functionality to add to the catalog with the catalog_editor 2023-11-21 18:00:28 +01:00
Erik Hohlfeld e7a722b6f8
Add removal of CustomCatalogEntry inside catalog via button 2023-11-21 18:00:27 +01:00
Erik Hohlfeld 580529ab2f
Add adding and removing of CustomProducts inside catalog_editor 2023-11-21 18:00:27 +01:00
Theo Reichert 5925ede2f8
Add classes Consumable and Rentable to package catering.catalog 2023-11-21 18:00:27 +01:00
Mathis Kral 2f24b9a80e
Rename catalog package to orderCatalog 2023-11-21 18:00:26 +01:00
Erik Hohlfeld 89eed0755d
Add forms to the catalog editor to submit its data 2023-11-21 18:00:26 +01:00
Erik Hohlfeld 94a03e2266
Add getters and setters for CustomProduct 2023-11-21 18:00:26 +01:00
Erik Hohlfeld de0fbc31dc
Remove constructor arguments and add getters and setters for CustomCatalogEntry 2023-11-21 18:00:25 +01:00
Erik Hohlfeld 6875622c19
Add display of all catalog entries (CustomCatalogEntry) in catalog 2023-11-21 18:00:25 +01:00
Mathis Kral 052b8e1a75
Remove unnecessary print statements 2023-11-21 18:00:25 +01:00
Mathis Kral dfd892d04b
Remove swearing 2023-11-21 18:00:24 +01:00
Erik Hohlfeld 9f7a90814d
Initialize all Catalog classes regarding the prototype 2023-11-21 18:00:24 +01:00
Mathis Kral d8bcb311dc
Add checkout and change of orderType 2023-11-21 18:00:24 +01:00
Mathis Kral 8eb8281e5c
Add functionality for adding products to an event 2023-11-21 18:00:23 +01:00
Mathis Kral 15f47a04b3
Add simple table structure 2023-11-21 18:00:23 +01:00
Mathis Kral c49210ca3c
Add link to eventPlanner.html in the controller 2023-11-21 18:00:23 +01:00
Mathis Kral 6e677eba82
Add eventPlanner.html and improve navbar 2023-11-21 18:00:22 +01:00
Erik Hohlfeld 3df78b4ba0
Add event_configuration.html and adjusted WelcomeController.java to link it 2023-11-21 18:00:22 +01:00
Mathis Kral b3b817b869
Add full order data to orders.html table 2023-11-21 18:00:21 +01:00
Mathis Kral f5454ddab5
Add order removal 2023-11-21 18:00:21 +01:00
Mathis Kral 895b68c028
Add orderRepositoryIterator in orders.html 2023-11-21 18:00:21 +01:00
Mathis Kral dcae05cd24
Add data initialization and total count of orders 2023-11-21 18:00:20 +01:00
Mathis Kral 6ce60ec3de
Add date to CustomOrder 2023-11-21 18:00:20 +01:00
Mathis Kral 4269e278a5
Add CustomOrderDataInitializer 2023-11-21 18:00:20 +01:00
Mathis Kral 5b4aaec73a
Add OrderController, CustomOrder, CustomOrderRepository 2023-11-21 18:00:19 +01:00
Mathis Kral 5f04f2e1b8
Initial commit for prototype 2023-11-21 18:00:19 +01:00
Eren Asker de9c20fd09
Add customer overview prototype 2023-11-21 18:00:19 +01:00
Eren Asker 135f9b9e87
Add staff overview prototype 2023-11-21 18:00:18 +01:00
Denis Natusch 16f5ff20e3
Add profile prototype 2023-11-21 18:00:18 +01:00
Theo Reichert eec4066dd0
Add layout.html and navigation.html 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-21 18:00:18 +01:00
Paul Heimer 4969473821
Add prototype of login/register 2023-11-21 18:00:17 +01:00
Simon Bruder a156d9b2f7
Implement inventory prototype 2023-11-21 18:00:17 +01:00
Simon Bruder be8519cdf1
Implement dummy catalogue to enable inventory prototype 
The initializer is partially taken from videoshop.
 2023-11-21 18:00:17 +01:00
Simon Bruder d2925c1263
Rename package kickstart to catering 2023-11-21 18:00:09 +01:00
Simon Bruder 16a230c152
Remove <<use>> from dependencies 
Even videoshop does not do this consistently, so we decided to just
remove it.
 2023-11-16 19:55:08 +01:00
Theo Reichert 2c13637737
Remove annotations inside catalog design model 2023-11-16 19:55:08 +01:00
Erik Hohlfeld 5eaf97d8db
Update order design to match prototype 
Add orderCatalog.puml UML-diagram.
Split up the order and orderCatalog UML-diagrams to reduce the size.
Updated the developer_documentation.adoc.
 2023-11-16 19:55:07 +01:00
Theo Reichert a1fb091bea
Update arrows in catalog.puml 2023-11-16 19:55:07 +01:00
Denis Natusch 57b1fc9b43
Update staff design model 2023-11-16 19:55:07 +01:00
Theo Reichert eee5a24452
Remove catalog controller and form in design model 2023-11-16 19:55:06 +01:00
Denis Natusch ff8013e914
Update documentation for package users 
Closes #19
 2023-11-16 19:55:06 +01:00
Simon Bruder 2f9704b8c6
Add interim presentation draft 2023-11-16 19:55:06 +01:00
Mathis Kral 1a9f2dfe50
Fix wrong redirect in order seq diagram 2023-11-16 19:54:45 +01:00
Simon Bruder 54c6cbf2ce
Make customer design model diagram more compact 2023-11-16 19:48:51 +01:00
Simon Bruder 3e9332c37c
Add property for running behind reverse proxy 
It is disabled by default as this should only be enabled on the server.

Fixes #29
 2023-11-16 10:51:08 +01:00
Simon Bruder b5e7f81ec2
Remove trailing whitespace 2023-11-15 15:36:19 +01:00
Simon Bruder ec542be0fd
Add protocol from 2023-11-10 
Co-authored-by: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
 2023-11-14 22:17:47 +01:00
Simon Bruder 70cd6c9aa3
Add time recording for week 4 2023-11-14 22:17:41 +01:00
Simon Bruder da7003a2f2
Add final newline to files where it was missing 2023-11-12 20:59:33 +01:00
eras660c 7a769f2976
Update Customer and Staff design model and class descriptions 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-12 20:05:57 +01:00
Theo Reichert ca38efaf1c
Add rentable and consumable to analysis-design link 2023-11-12 19:57:44 +01:00
Theo Reichert fce7aff3e9
Update dialogue_map design model to all English 2023-11-12 19:57:10 +01:00
Theo Reichert 55cc6291b0
Update src/main/asciidoc/developer_documentation.adoc 
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
 2023-11-12 19:57:10 +01:00
Mathis Kral d40f5f00f1
Add missing OrderType 2023-11-12 19:57:10 +01:00
Mathis Kral 394a1acd37
Change all instances of “HTTPS” to “HTTP” in TLA 2023-11-12 19:57:10 +01:00
Simon Bruder 09767cb9d2
Update inventory design to match dual catalog 2023-11-12 19:57:10 +01:00
Theo Reichert ed3f6c59f2
Add “Design Patterns” and “Persistence” to “Architecture decisions” 2023-11-12 19:56:37 +01:00
Mathis Kral 0ecf67b277
Add version 1.0 2023-11-12 19:56:37 +01:00
Mathis Kral 56ae7eb198
Remove redundant German description 2023-11-12 19:56:37 +01:00
Mathis Kral 80b36f792b
Adjust headlines to match a single style 2023-11-12 19:56:37 +01:00
Mathis Kral 99b2f4aaf4
Add external frameworks and analysis-design-relation 2023-11-12 19:56:37 +01:00
Mathis Kral 4b833b159d
Change missing headlines to English 2023-11-12 19:56:37 +01:00
Theo Reichert b2761bca3c
Update catalog design model 2023-11-12 19:56:20 +01:00
Theo Reichert 949fc09bf4
Update Class/Enum descriptions of Catering, Catalog 2023-11-12 19:55:26 +01:00
Theo Reichert e660a03d71
Add sequence diagram for catalog 2023-11-12 19:55:04 +01:00
Theo Reichert 6060c8081e
Update catalog design model 2023-11-12 19:54:59 +01:00
Theo Reichert 8815cbe6eb
Add catering design model 2023-11-12 19:54:31 +01:00
Theo Reichert 32ed70b777
Add user interface in “Architecture Decision” 2023-11-12 19:54:20 +01:00
Denis Natusch 8648963892
Add class description for user-diagram 2023-11-12 19:54:20 +01:00
makr912e 4a8cbb8458
Add TLA, client-server and system-context (diagrams) 2023-11-12 19:54:20 +01:00
makr912e eba9e60df0
Fix spelling error with word staff 2023-11-12 19:54:20 +01:00
Theo Reichert 6b7f34a964
Add sequence diagrams to developer documentation 2023-11-12 19:54:20 +01:00
Denis Natusch ad88c6e067
Add users sequence diagram 2023-11-12 19:54:19 +01:00
Mathis Kral 4052224dba
Add order sequence diagram 2023-11-12 19:54:19 +01:00
Mathis Kral 04f6f04512
Add class description for order-diagram 2023-11-12 19:54:19 +01:00
Simon Bruder 68709a7265
Add class descriptions for inventory to dev docs 2023-11-12 19:54:19 +01:00
Denis Natusch 3b77717506
Add customer design module 2023-11-12 19:54:19 +01:00
Denis Natusch b3c6e3c144
Add qualitiy demand fulfillment 2023-11-12 19:54:18 +01:00
Theo Reichert 1b2d43a755
Add subsections in section “Building block view” 2023-11-12 19:53:58 +01:00
Theo Reichert 9ae84d47ee
Update catalog.puml 2023-11-12 19:53:58 +01:00
Mathis Kral 40f594ab66
Translate TLA to english 2023-11-12 19:53:58 +01:00
Mathis Kral 84c96332ec
Add system context diagram to design package 2023-11-12 19:53:58 +01:00
Mathis Kral 5e896fc980
Update order-diagram to be closer to prototype 2023-11-12 19:53:58 +01:00
Simon Bruder de64a048bc
Add constraints to developer documentation 2023-11-12 19:53:58 +01:00
Simon Bruder 45f1ae88b3
Add sequence diagram for inventory 
It is deliberately simplified to still be somewhat readable, especially
regarding the names of participants.
 2023-11-12 19:53:58 +01:00
Denis Natusch b6f774664f
Add staff design model 2023-11-12 19:53:58 +01:00