Merge branch 'master' into feature/improve_management_of_visits_from_subject_list (9cb6ff5a) · 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

9cb6ff5a

Commit 9cb6ff5a authored 6 years ago by Carlos Vega

Downloads
- Plain Diff

Merge branch 'master' into feature/improve_management_of_visits_from_subject_list

parents a06ca80a db3b6d62

No related branches found

No related tags found

1 merge request!188Feature/improve management of visits from subject list

Pipeline #7604 passed 6 years ago

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

smash/web/models/visit.py 14 additions, 11 deletions

smash/web/models/visit.py
smash/web/models/worker.py 9 additions, 0 deletions

smash/web/models/worker.py
smash/web/static/js/daily_planning.js 146 additions, 130 deletions

smash/web/static/js/daily_planning.js
smash/web/templates/_base.html 1 addition, 1 deletion

smash/web/templates/_base.html
smash/web/templates/appointments/add.html 98 additions, 39 deletions

smash/web/templates/appointments/add.html
smash/web/templates/daily_planning.html 4 additions, 0 deletions

smash/web/templates/daily_planning.html
smash/web/templates/doctors/index.html 19 additions, 3 deletions

smash/web/templates/doctors/index.html
smash/web/tests/models/test_visit.py 43 additions, 0 deletions

smash/web/tests/models/test_visit.py
smash/web/tests/models/test_worker.py 10 additions, 0 deletions

smash/web/tests/models/test_worker.py

with 344 additions and 184 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