diff --git a/smash/web/views/appointment.py b/smash/web/views/appointment.py index 71ec5824f4cd9e48d3816e1ef1782d4d07cdfcb8..8bc59f0c2d1b637b96abe4c12ba5966c2dea6732 100644 --- a/smash/web/views/appointment.py +++ b/smash/web/views/appointment.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.shortcuts import get_object_or_404, redirect -from notifications import get_today_midnight_date, get_filter_locations, get_calendar_full_appointments, \ - get_unfinished_appointments from . import wrap_response from ..forms import AppointmentDetailForm, AppointmentAddForm, AppointmentEditForm, SubjectEditForm from ..models import Appointment diff --git a/smash/web/views/notifications.py b/smash/web/views/notifications.py index 0c57e769614b0c18076a4bc6079520af0a4ed79d..31f749d8f8997c25ada97ffa4f2043b059f2ce21 100644 --- a/smash/web/views/notifications.py +++ b/smash/web/views/notifications.py @@ -241,12 +241,4 @@ def get_filter_locations(user): def get_today_midnight_date(): today = datetime.datetime.now() today_midnight = datetime.datetime(today.year, today.month, today.day) - return today_midnight - - -def get_calendar_full_appointments(user): - month_ago = get_today_midnight_date() + datetime.timedelta(days=-31) - return Appointment.objects.filter( - datetime_when__gt=month_ago, - location__in=get_filter_locations(user), - ).order_by('datetime_when') + return today_midnight \ No newline at end of file