Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/tv shows disabled week #531

Closed
wants to merge 70 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
e94b42c
added email to user profile
IrisOlfermann Jul 16, 2024
9e56bc9
added second event to the edit week site in the frontend, second even…
IrisOlfermann Jul 16, 2024
5757345
made the design of the event selection responsive
IrisOlfermann Jul 22, 2024
e995f85
added email as a variable
IrisOlfermann Jul 22, 2024
6971111
migrated db, added event collection to Day.php
IrisOlfermann Jul 22, 2024
dba0f35
updated fixture and tried to adjust the files to the new EventPartici…
IrisOlfermann Jul 25, 2024
de0a83f
fixed eventParticipation collection in Controller, changed getEvents(…
IrisOlfermann Jul 26, 2024
804e51e
changed MenuDay.vue, two events can now be input
IrisOlfermann Jul 26, 2024
61da3ea
updated dashboard to show both events (not working yet)
IrisOlfermann Jul 26, 2024
6b1932e
updated methods in EventController.php
IrisOlfermann Jul 26, 2024
ea6bf8e
updated api calls for events now including event id, added getEventId…
IrisOlfermann Jul 30, 2024
2b5745c
updated events in test
IrisOlfermann Jul 30, 2024
7d42cdf
event is input into the database, just one event at a time works at t…
IrisOlfermann Jul 31, 2024
ae3a6ee
Added possibility to input two events for one day, doesn't show in th…
IrisOlfermann Aug 2, 2024
781512a
started to update frontend to show events
IrisOlfermann Aug 2, 2024
c02899a
updated event id in data set migration
IrisOlfermann Aug 2, 2024
2324747
updated structure of event dictionary and started to debug in order t…
IrisOlfermann Aug 6, 2024
49df2b4
deleted logger
IrisOlfermann Aug 9, 2024
2380820
Event is shown in the frontend - updated weekStore and the fetch for …
IrisOlfermann Aug 9, 2024
e5f194b
deleted comments and updated formatting
IrisOlfermann Aug 9, 2024
db1370c
Ändern von Events funktioniert
IrisOlfermann Aug 26, 2024
9a572cf
enabled deleting of events and updated the frontend to always show tw…
IrisOlfermann Aug 26, 2024
03f3ebd
added check for max meals in backend
Aug 7, 2024
ab61aa1
added verification in guest component and added flashmessage to infor…
Aug 8, 2024
04f3c23
removed commented code
Aug 9, 2024
63b6682
potential fix for docker build warning
Aug 12, 2024
8f20c99
added checks for updating menus and setting serving size of dishes, a…
Aug 13, 2024
b7c225a
removed tcpdf, because it is no longer used to create pdfs and has a …
Aug 13, 2024
c5e3413
fixed several security issues
Aug 13, 2024
9e83da0
updated axios because of a vulnerability that allowed server-side req…
Aug 14, 2024
05a71a4
fixed missing shadows by removing global css
Aug 14, 2024
3250377
changed that users with a balance of 0 can be shown in the costs tab
Aug 14, 2024
d09c30c
fixed a bug that prevented setting the servingsize correctly and adde…
Aug 15, 2024
e81e693
fixed a bug that occured when trying to join a combi meal when no mor…
Aug 15, 2024
843fe02
Release v3.1.4
Aug 15, 2024
91fbe0c
fixed a bug that prevented booked Guest meals to be displayed in the …
Aug 21, 2024
0507e2c
fixed formatting
Aug 21, 2024
adfe199
added second event to the edit week site in the frontend, second even…
IrisOlfermann Jul 16, 2024
07782c0
fixed rebase error oops
IrisOlfermann Aug 26, 2024
c4f60db
added events to dashboard
IrisOlfermann Aug 27, 2024
ea88936
fixed backend structure of events works but destroyed join and leave …
IrisOlfermann Aug 28, 2024
c88cfc0
updated join and delete methods
IrisOlfermann Sep 2, 2024
721b1e6
fixed modal that shows participants for an event
IrisOlfermann Sep 2, 2024
8340e2b
added events to the notification of updated/new week in mattermost
IrisOlfermann Sep 3, 2024
0b574bd
ran prettier
IrisOlfermann Sep 3, 2024
d88ec66
started to edit guest invitation
IrisOlfermann Sep 4, 2024
73cb280
edited the mapping of event, url generation works now
IrisOlfermann Sep 6, 2024
653bc6b
added seperate methods for event and meal invitation
IrisOlfermann Sep 6, 2024
c87c679
Updated id generation to avoid duplicate key problem, event link is g…
IrisOlfermann Sep 9, 2024
e594bcb
updated participation counter and checkbox to be updated via mercure …
IrisOlfermann Sep 12, 2024
25a8ad5
fixed guestButton
IrisOlfermann Sep 13, 2024
0a38309
fixed frontend unit tests
IrisOlfermann Sep 16, 2024
01c5e15
fixed some backend tests
IrisOlfermann Sep 17, 2024
00c185b
fixed all backend tests
IrisOlfermann Sep 18, 2024
1dd3dbe
fixed all cypress tests
IrisOlfermann Sep 19, 2024
6d6cec0
refactoring but the backend tests broke
IrisOlfermann Sep 20, 2024
f2a2d3a
final refactoring changes
IrisOlfermann Sep 24, 2024
d0993c9
fixed missing shadows by removing global css
Aug 14, 2024
b2e5d7b
Release v3.1.5
Aug 21, 2024
4015078
added second event to the edit week site in the frontend, second even…
IrisOlfermann Jul 16, 2024
771dd5c
Revert "added second event to the edit week site in the frontend, sec…
IrisOlfermann Sep 24, 2024
b21ba8f
SSO: Use client specific user roles (#515)
chetan-thapliyal Sep 12, 2024
aef8640
added second event to the edit week site in the frontend, second even…
IrisOlfermann Jul 16, 2024
92f5c7a
added second event to the edit week site in the frontend, second even…
IrisOlfermann Jul 16, 2024
ea59a70
Revert "added second event to the edit week site in the frontend, sec…
IrisOlfermann Sep 24, 2024
0418920
prettier
IrisOlfermann Sep 24, 2024
40f2242
update packages
Nov 18, 2024
0dee1a5
Fix eventService injection
Nov 18, 2024
8d5f04a
Show message if week or day is disabled
Nov 19, 2024
c483791
Fix linter message
Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ additional_fqdns:
- meals.test
database:
type: mariadb
version: "10.11"
version: "10.2"
performance_mode: none
hooks:
post-start:
Expand Down
3 changes: 2 additions & 1 deletion .php-cs-fixer.dist
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ return $config
],
],
'single_line_throw' => false,
'global_namespace_import' => true
'global_namespace_import' => true,
'trailing_comma_in_multiline' => false
])
->setUsingCache(false)
->setFinder($finder);
70 changes: 70 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,75 @@
# Changelog

## Version v3.1.5 (2024-08-21)

### Fixes

- fixed formatting (53e33911)
- fixed a bug that prevented booked Guest meals to be displayed in the participant list (ad609b22)

## Version v3.1.4 (2024-08-15)

### Security Fixes

- security fix for vue-template-compiler (e275564e)

### Fixes

- fixed a bug that occured when trying to join a combi meal when no more meals for the day could be booked (aabf1138)
- fixed a bug that prevented setting the servingsize correctly and added updating combimeals after setting serving size (73d61478)
- fixed missing shadows by removing global css (ab236a00)
- fixed several security issues (f03f27c2)
- fixed typing issue (1af59607)
- fixed broken cypress tests (2c0be0af)
- fix for flaky test (5faf6f2c)
- fixed missing shadow on GuestDay (5d754d82)
- fixed broken button coloring (ce3bf666)
- fixed missing background on participation counter (0e94f66e)
- fixed cypress tests (d9f40df9)
- fixed formatting (716fb012)
- fixed remaining typing problems (bf649ef8)
- fixed several typing issues (430cf7e2)
- fixed several typing issues (dee97908)
- fixed some typing problems (7af806e1)
- fixed ddev setup process (7246021a)
- fixed make commands / npm commands (16e980ce)
- fixed some typing problems (37781bd4)

### Chores and tidying

- updated axios because of a vulnerability that allowed server-side request forgery in axios (61a20844)
- Updated Readme (6bfe1e12)
- updated folder to Recources (2cbb1cf2)

### Other

- changed that users with a balance of 0 can be shown in the costs tab (e47a49d8)
- added checks for updating menus and setting serving size of dishes, also added verbose errormessages for failed checks (3735fd53)
- removed tcpdf, because it is no longer used to create pdfs and has a vulnerability (d7e48eea)
- potential fix for docker build warning (fc5ea854)
- another fix for broken cypress test (a2fdcc9d)
- removed commented code (a6ef925f)
- added verification in guest component and added flashmessage to inform users when they exceed the max number of meals per day (3e527539)
- added required optional parameter (b100d966)
- adjusted formatting (1caecf7a)
- added check for max meals in backend (ed2584d0)
- removed console.logs (77c58f21)
- added Guest label to displayed lists of participants (d69ce782)
- implemented lazy loading of views to reduce initial bundle size (133d23a9)
- changed node variable to vite env variable (6787e570)
- reverted cypress version as a potential fix (d8ea4a5c)
- changed yarn to npm in cypress build (7de083a8)
- adjusted github actions pipeline to use vitest and vue-tsc (0d5c7f90)
- migrated jest tests to vitest (f0482cc4)
- started jest to vitest migration (ab1aab41)
- finalised vite setup (884adab0)
- added dev config (5ea42daf)
- added vite config (7b96720e)
- added symfony-vite-bundle (09437f5a)
- adjusted imports to be compatiuble with vite, added missing packages and added some null checks (80483e4c)
- copied files from webpack package (72dc98cb)
- initialized basic vite config (afcbf06a)

## Version v3.1.3 (2024-08-05)

### Fixes
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# generate frontend assets
FROM node:20 as frontend
FROM node:20 AS frontend
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests \
build-essential \
nodejs
WORKDIR var/www/html/src/Resources
WORKDIR /var/www/html/src/Resources
COPY src/Resources/package.json src/Resources/package-lock.json ./
RUN npm install
COPY src/Resources/ .
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ In the Vite Dev mode browsers will typically send out a Warning("Source-Map-Fehl
* 201: There are parameters missing to create a dish
* 202: One or more titles haven't been sent
* 203: There was an error while counting the number of times dishes were taken
* 204: The servingSize cannot be adjusted, because there are booked combi-meals
*CategoryController 3xx*
* 301: The choosen titles for the category either are missing or do already exist
*ParticipantController 4xx*
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"psr/container": "^1.0",
"psr/link": "^1.0",
"psr/log": "^1|^2",
"qipsius/tcpdf-bundle": "^2.0",
"stof/doctrine-extensions-bundle": "^1.6",
"symfony/asset": "^6.4",
"symfony/config": "^6.4",
Expand Down
Loading
Loading