Merge remote-tracking branch 'origin/master' into fix/435 (5b5e28fe) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

5b5e28fe

Commit 5b5e28fe authored 3 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into fix/435

parents fe5ad131 7aac7308

No related branches found

No related tags found

1 merge request!333consider the case that an appoinment is not set to a particular visit. the...

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 21 additions, 16 deletions

CHANGELOG
smash/web/api_views/daily_planning.py 14 additions, 3 deletions

smash/web/api_views/daily_planning.py
smash/web/static/js/daily_planning.js 1 addition, 0 deletions

smash/web/static/js/daily_planning.js
smash/web/templates/doctors/add_holiday.html 15 additions, 1 deletion

smash/web/templates/doctors/add_holiday.html
smash/web/templates/equipment_and_rooms/kit_requests/kit_requests.html 1 addition, 1 deletion

...plates/equipment_and_rooms/kit_requests/kit_requests.html
smash/web/tests/api_views/test_daily_planning.py 46 additions, 3 deletions

smash/web/tests/api_views/test_daily_planning.py
smash/web/views/kit.py 2 additions, 4 deletions

smash/web/views/kit.py

with 100 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment