Compare commits

...

5 Commits

Author SHA1 Message Date
fa0dc5b544 Merge pull request 'dont-show-guests-on-external-boats' (#486) from dont-show-guests-on-external-boats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m57s
CI/CD Pipeline / deploy-staging (push) Successful in 6m13s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #486
2024-05-12 23:08:41 +02:00
c3c7ecec98 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m10s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-05-12 22:38:25 +02:00
a0d53366e0 dont show guests on external boats
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
CI/CD Pipeline / test (push) Failing after 5m15s
2024-05-12 22:26:02 +02:00
b69eded21d Merge pull request 'allow-membershippdf-upload' (#483) from allow-membershippdf-upload into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #483
2024-05-06 13:46:40 +02:00
5602ad2681 Merge pull request 'only have a single user with details struct' (#481) from simplify-user-structs into main
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #481
2024-05-06 13:30:36 +02:00
2 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ jobs:
cargo build
cd frontend && npm install && npm run build
- name: Frontend tests
run: cd frontend && npx playwright test --workers 1 --reporter line
run: cd frontend && npx playwright install && npx playwright test --workers 1 --reporter line
- name: Backend tests
run: cargo test --verbose
#- uses: actions/upload-artifact@v3

View File

@ -152,7 +152,7 @@
{% endfor %}
{% set amount_rowers = log.rowers | length %}
{% set amount_guests = log.boat.amount_seats - amount_rowers %}
{% if amount_guests > 0 %}
{% if amount_guests > 0 and not log.boat.external %}
Gäste
<small class="text-gray-600">(ohne Account)</small>:
{{ amount_guests }}