From 34d48c2b56ab9f9e5a8139307595e266a7d7d5e3 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 5 Apr 2017 11:10:43 +0200
Subject: [PATCH] refactor on the variable names
---
smash/web/views/doctor.py | 46 +++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/smash/web/views/doctor.py b/smash/web/views/doctor.py
index e8b6ade7..09031a36 100644
--- a/smash/web/views/doctor.py
+++ b/smash/web/views/doctor.py
@@ -5,6 +5,14 @@ from . import wrap_response
from ..forms import WorkerAddForm, WorkerEditForm, WorkerDetailForm
from ..models import Worker, Availability
+MONDAY_AS_DAY_OF_WEEK = 1
+TUESDAY_AS_DAY_OF_WEEK = 2
+WEDNESDAY_AS_DAY_OF_WEEK = 3
+THURSDAY_AS_DAY_OF_WEEK = 4
+FRIDAY_AS_DAY_OF_WEEK = 5
+SATURDAY_AS_DAY_OF_WEEK = 6
+SUNDAY_AS_DAY_OF_WEEK = 7
+
def doctors(request):
doctors_list = Worker.objects.order_by('-last_name')
@@ -47,24 +55,24 @@ def doctor_details(request, doctor_id):
def doctor_availability(request, doctor_id):
- avall = Availability.objects.filter(person=doctor_id)
+ availabilities = Availability.objects.filter(person=doctor_id)
- avmon = avall.filter(day_number=1)
- avtue = avall.filter(day_number=2)
- avwed = avall.filter(day_number=3)
- avthu = avall.filter(day_number=4)
- avfri = avall.filter(day_number=5)
- avsat = avall.filter(day_number=6)
- avsun = avall.filter(day_number=7)
+ availability_on_monday = availabilities.filter(day_number=MONDAY_AS_DAY_OF_WEEK)
+ availability_on_tuesday = availabilities.filter(day_number=TUESDAY_AS_DAY_OF_WEEK)
+ availability_on_wednesday = availabilities.filter(day_number=WEDNESDAY_AS_DAY_OF_WEEK)
+ availability_on_thursday = availabilities.filter(day_number=THURSDAY_AS_DAY_OF_WEEK)
+ availability_on_friday = availabilities.filter(day_number=FRIDAY_AS_DAY_OF_WEEK)
+ availability_on_saturday = availabilities.filter(day_number=SATURDAY_AS_DAY_OF_WEEK)
+ availability_on_sunday = availabilities.filter(day_number=SUNDAY_AS_DAY_OF_WEEK)
context = {
- 'avmon': avmon,
- 'avtue': avtue,
- 'avwed': avwed,
- 'avthu': avthu,
- 'avfri': avfri,
- 'avsat': avsat,
- 'avsun': avsun,
+ 'avmon': availability_on_monday,
+ 'avtue': availability_on_tuesday,
+ 'avwed': availability_on_wednesday,
+ 'avthu': availability_on_thursday,
+ 'avfri': availability_on_friday,
+ 'avsat': availability_on_saturday,
+ 'avsun': availability_on_sunday,
'id': doctor_id
}
@@ -72,7 +80,7 @@ def doctor_availability(request, doctor_id):
def doctor_availability_delete(request, doctor_id, availability_id):
- availibility = Availability.objects.filter(id=availability_id)
- if len(availibility) > 0:
- availibility.delete()
- return redirect(doctoravail, id=doctor_id) # FIXME doctoravail doesn't exist
+ availability = Availability.objects.filter(id=availability_id)
+ if len(availability) > 0:
+ availability.delete()
+ return redirect(doctor_availability, id=doctor_id)
--
GitLab