Feature/dummy data pdp
I think it would be a good idea to merge this since the dummy data script is useful for different branches.
Changes in smash/web/templates/doctors/breadcrumb.html
and smash/web/views/worker.py
are cherry picks from other branch.
Merge request reports
Activity
1 1 <li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li> 2 <li class="active"><a href="{% url 'web.views.workers' worker_type %}">Workers</a></li> Are you sure this is not reintroducing this error #241 (closed)?
Edited by Piotr GawronThis is the cherrypicked commit already merged on master from the daily_planning branch. How can we do this test?
we can check if rendering this template works without problem
Edited by Piotr GawronI think it is already tested here but without a
worker_type
. I can add another one with aworker_type
.class WorkerViewTests(LoggedInTestCase): def test_render_workers_list_request(self): create_worker() response = self.client.get(reverse('web.views.workers')) self.assertEqual(response.status_code, 200)
The
templates/doctors/breadcrum.html
file is then rendered after the call to this functiondef worker_list(request, worker_type=WORKER_STAFF): doctors_list = Worker.get_workers_by_worker_type(worker_type, study_id=GLOBAL_STUDY_ID, ).order_by('-last_name') context = { 'doctors_list': doctors_list, 'worker_type': worker_type } return wrap_response(request, "doctors/index.html", context)
I added some tests in this commit 2c9140d8
def test_render_worker_type_request(self): create_worker() response = self.client.get(reverse('web.views.workers', kwargs={'worker_type': WORKER_STAFF})) self.assertEqual(response.status_code, 200) response = self.client.get(reverse('web.views.workers', kwargs={'worker_type': WORKER_HEALTH_PARTNER})) self.assertEqual(response.status_code, 200) response = self.client.get(reverse('web.views.workers', kwargs={'worker_type': WORKER_VOUCHER_PARTNER})) self.assertEqual(response.status_code, 200)
added 1 commit
- 2c9140d8 - added tests for different worker_type in 'web.views.workers'
assigned to @piotr.gawron
added 2 commits
I don't know exactly what might be the conflict. I will check it tomorrow. I think I picked the function
get_by_id
of study.py.Edited by Carlos Vega
added 64 commits
-
5e114166...bbe5d91b - 63 commits from branch
master
- 7a624a05 - Merge branch 'master' into feature/dummy_data_pdp
-
5e114166...bbe5d91b - 63 commits from branch
assigned to @piotr.gawron
mentioned in commit d0152cb0
mentioned in issue #257 (closed)