diff --git a/smash/web/models/__init__.py b/smash/web/models/__init__.py index 553a544844bcfc0ad97c2c2c81218ce291093e6a..8b5de969d74df68db00fccace5627dfc877fe210 100644 --- a/smash/web/models/__init__.py +++ b/smash/web/models/__init__.py @@ -18,8 +18,6 @@ from item import Item from language import Language from subject import Subject -__author__ = 'Valentin Grouès' - def get_current_year(): return datetime.datetime.now().year diff --git a/smash/web/models/appointment.py b/smash/web/models/appointment.py index f71d2bbbf0fabe8258ef335e71b8ebc1fae5e482..59128c6e42d0b4d4e23253729bb31cc13d0da1b0 100644 --- a/smash/web/models/appointment.py +++ b/smash/web/models/appointment.py @@ -6,8 +6,6 @@ from django.db import models from constants import APPOINTMENT_TYPE_DEFAULT_COLOR, APPOINTMENT_TYPE_DEFAULT_FONT_COLOR from . import FlyingTeam, Location, Room, Visit, Worker -__author__ = 'Valentin Grouès' - class Appointment(models.Model): class Meta: diff --git a/smash/web/models/appointment_type.py b/smash/web/models/appointment_type.py index 9b3e48dcba89575e8a7d6ad8b9f75078ca9a786a..84304f466bc0da92703207852048dbc8f180f48d 100644 --- a/smash/web/models/appointment_type.py +++ b/smash/web/models/appointment_type.py @@ -3,8 +3,6 @@ from django.db import models from constants import APPOINTMENT_TYPE_DEFAULT_COLOR, APPOINTMENT_TYPE_DEFAULT_FONT_COLOR -__author__ = 'Valentin Grouès' - class AppointmentType(models.Model): class Meta: diff --git a/smash/web/models/avaibility.py b/smash/web/models/avaibility.py index bbc465ade1dca8b6b2a417c863561dfa92076ea1..d448758776af6766186a930de235b2aaf3bedee9 100644 --- a/smash/web/models/avaibility.py +++ b/smash/web/models/avaibility.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Avaibility(models.Model): class Meta: diff --git a/smash/web/models/constants.py b/smash/web/models/constants.py index 1d8ad089f2621f01d3053eb1f0f6c08d58c69b2f..19d93238b48f0c5a1ab6c0acd63c7b643035e7b2 100644 --- a/smash/web/models/constants.py +++ b/smash/web/models/constants.py @@ -1,5 +1,4 @@ # coding=utf-8 -__author__ = 'Valentin Grouès' BOOL_CHOICES = ((True, 'Yes'), (False, 'No')) SEX_CHOICES_MALE = 'M' SEX_CHOICES_FEMALE = 'F' diff --git a/smash/web/models/flying_team.py b/smash/web/models/flying_team.py index 04d6f6705bc00c049793836dd27985398f921094..e44dc127f2bde50c24fcb93bbf4aabf7ec5fa4cf 100644 --- a/smash/web/models/flying_team.py +++ b/smash/web/models/flying_team.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class FlyingTeam(models.Model): class Meta: diff --git a/smash/web/models/holiday.py b/smash/web/models/holiday.py index 6e3f37b454f37ba604bbe032c90b8f7b9f04e181..113df03a4f50dbed5485d8c172fb7222ab0efcd8 100644 --- a/smash/web/models/holiday.py +++ b/smash/web/models/holiday.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Holiday(models.Model): class Meta: diff --git a/smash/web/models/item.py b/smash/web/models/item.py index 8946783178382a01faa66f9412acd8a37e08a9e6..b27f729c7a4d87037b1a80a8a6dccce3017771b3 100644 --- a/smash/web/models/item.py +++ b/smash/web/models/item.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Item(models.Model): class Meta: diff --git a/smash/web/models/language.py b/smash/web/models/language.py index 582191834a0d00922561e01341102a6586110c1e..8e786111d9a4265f366f2f1389db98a9af1e50f0 100644 --- a/smash/web/models/language.py +++ b/smash/web/models/language.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Language(models.Model): class Meta: diff --git a/smash/web/models/location.py b/smash/web/models/location.py index a81f2af303079029647c42755cf0b0202ded476d..2ae251486b48044adaaf668c7417ee1b2373d89d 100644 --- a/smash/web/models/location.py +++ b/smash/web/models/location.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Location(models.Model): class Meta: diff --git a/smash/web/models/room.py b/smash/web/models/room.py index 1a02850b8a24bc4f591c3038eae465af14188e69..2822b8dfd8b71da5974c7c52dcc9ed67c60b4f0e 100644 --- a/smash/web/models/room.py +++ b/smash/web/models/room.py @@ -1,8 +1,6 @@ # coding=utf-8 from django.db import models -__author__ = 'Valentin Grouès' - class Room(models.Model): equipment = models.ManyToManyField("web.Item", diff --git a/smash/web/models/subject.py b/smash/web/models/subject.py index 45e9082d0a7bdf0a6914861a38403602540ff630..aa7d746cdfe6d43a8b5720a67cba72c0c0cf012c 100644 --- a/smash/web/models/subject.py +++ b/smash/web/models/subject.py @@ -4,8 +4,6 @@ from django.db import models from constants import BOOL_CHOICES, SEX_CHOICES, SUBJECT_TYPE_CHOICES from . import Appointment, Language, Location, Visit -__author__ = 'Valentin Grouès' - class Subject(models.Model): class Meta: diff --git a/smash/web/models/visit.py b/smash/web/models/visit.py index 313b960dc86ddf35f23e54ebbdd3ee5724f64b6a..7554e3984307d09fd55ccaae81c12e8547fc8aef 100644 --- a/smash/web/models/visit.py +++ b/smash/web/models/visit.py @@ -5,8 +5,6 @@ from django.db import models from constants import BOOL_CHOICES, SUBJECT_TYPE_CHOICES_CONTROL -__author__ = 'Valentin Grouès' - class Visit(models.Model): class Meta: diff --git a/smash/web/models/worker.py b/smash/web/models/worker.py index d6bf3c1e5fdac0fd3eebe83ab0303f188fce4a1d..5e051e75cc9c3b9d3f66dea06f0b2231b6acdbf6 100644 --- a/smash/web/models/worker.py +++ b/smash/web/models/worker.py @@ -4,8 +4,6 @@ import datetime from django.contrib.auth.models import User from django.db import models -__author__ = 'Valentin Grouès' - class Worker(models.Model): class Meta: diff --git a/smash/web/views/__init__.py b/smash/web/views/__init__.py index 12bf76cd82f60c4af59f4559463487ae28a0b82a..1ae7ae1c0faf72106b8061582409264355a45fea 100644 --- a/smash/web/views/__init__.py +++ b/smash/web/views/__init__.py @@ -6,7 +6,6 @@ from django.shortcuts import redirect, render from notifications import get_notifications from ..models import Worker -__author__ = 'Valentin Grouès' handler404 = 'web.views.e404_page_not_found' handler500 = 'web.views.e500_error' handler403 = 'web.views.e403_permission_denied' diff --git a/smash/web/views/appointment.py b/smash/web/views/appointment.py index 279f44fa3b0c6921e1b9e896df62c154d5c036e2..c13a07129603005fb0a2d6cb508573299822d5cb 100644 --- a/smash/web/views/appointment.py +++ b/smash/web/views/appointment.py @@ -7,8 +7,6 @@ from . import wrap_response from ..forms import AppointmentDetailForm, AppointmentAddForm, AppointmentEditForm, SubjectEditForm from ..models import Appointment -__author__ = 'Valentin Grouès' - def appointments(request): approaching_list = Appointment.objects.filter( @@ -85,7 +83,8 @@ def appointment_edit(request, id): if subject_form is not None: subject_form.save() the_appointment = get_object_or_404(Appointment, id=id) - if (the_appointment.status != Appointment.APPOINTMENT_STATUS_SCHEDULED) and (the_appointment.visit is not None): + if (the_appointment.status != Appointment.APPOINTMENT_STATUS_SCHEDULED) and ( + the_appointment.visit is not None): return redirect('web.views.visit_details', id=the_appointment.visit.id) else: return redirect('web.views.appointments') @@ -99,4 +98,4 @@ def appointment_edit(request, id): 'subject_form': subject_form, 'id': id, 'appointment': the_appointment - }) \ No newline at end of file + }) diff --git a/smash/web/views/auth.py b/smash/web/views/auth.py index 9ff4730d8e5030c28a1e7fe4159e6c981f93d168..2e095773c321d1a6b201d3c50d582f36e37e5e99 100644 --- a/smash/web/views/auth.py +++ b/smash/web/views/auth.py @@ -3,8 +3,6 @@ from django.shortcuts import redirect, render from ..auth import do_login, do_logout -__author__ = 'Valentin Grouès' - def login(request): context = { diff --git a/smash/web/views/doctor.py b/smash/web/views/doctor.py index a59e322198ccf22db36e2463534dbf9b7445cb13..1aa0e538f9996d71c3a4a5b52494e6271ee3c8e2 100644 --- a/smash/web/views/doctor.py +++ b/smash/web/views/doctor.py @@ -5,8 +5,6 @@ from . import wrap_response from ..forms import WorkerAddForm, WorkerEditForm, WorkerDetailForm from ..models import Worker, Avaibility -__author__ = 'Valentin Grouès' - def doctors(request): doctors_list = Worker.objects.order_by('-last_name') diff --git a/smash/web/views/equipment.py b/smash/web/views/equipment.py index 417b1f7da97263985fee54c31aad127abcadb391..0a8299071a793695c39d007a65dfe22043b496d2 100644 --- a/smash/web/views/equipment.py +++ b/smash/web/views/equipment.py @@ -2,8 +2,6 @@ from . import wrap_response from ..models import Item -__author__ = 'Valentin Grouès' - def equipment_def(request): equipment_list = Item.objects.order_by('-name') diff --git a/smash/web/views/export.py b/smash/web/views/export.py index 8d5182b027ce6e08abfd72ce4390a9a1bd2bfcec..d76a0465623321b07215b6cdd2345591bb16a988 100644 --- a/smash/web/views/export.py +++ b/smash/web/views/export.py @@ -8,8 +8,6 @@ from notifications import get_today_midnight_date from . import e500_error, wrap_response from ..models import Subject, Appointment -__author__ = 'Valentin Grouès' - @login_required def export_to_csv2(request, type="subjects"): diff --git a/smash/web/views/kit.py b/smash/web/views/kit.py index 36d8e440054732ef5be864f3fe13fc050ff23f4c..f4a7b9e2e2065a6b1f1d6ff36f4ea5e7301f2547 100644 --- a/smash/web/views/kit.py +++ b/smash/web/views/kit.py @@ -8,8 +8,6 @@ from . import wrap_response from ..forms import KitRequestForm from ..models import AppointmentType, Appointment -__author__ = 'Valentin Grouès' - def get_kit_requests(user, start_date=None, end_date=None): if start_date is None: diff --git a/smash/web/views/mails.py b/smash/web/views/mails.py index e949129f6cae5b3059ffb2cb0a5edf1dc2ac917c..041daa092e41c729c55e0d0262d1f4e5352191d4 100644 --- a/smash/web/views/mails.py +++ b/smash/web/views/mails.py @@ -1,8 +1,6 @@ # coding=utf-8 from . import wrap_response -__author__ = 'Valentin Grouès' - def mail_templates(request): return wrap_response(request, "mail_templates/index.html", {}) diff --git a/smash/web/views/notifications.py b/smash/web/views/notifications.py index 4cebc3205163f0bb3ed06a1b9e90090ae67c712f..ce900ae8f6fae4bac90c3da8a4b5d9bca141838e 100644 --- a/smash/web/views/notifications.py +++ b/smash/web/views/notifications.py @@ -6,8 +6,6 @@ from django.db.models import Count, Case, When from ..models import Worker, Subject, Visit, Appointment, Location -__author__ = 'Valentin Grouès' - class NotificationCount(object): title = "" diff --git a/smash/web/views/statistics.py b/smash/web/views/statistics.py index 486427f5f6d4ac18de9606b121378b4f24121ce7..67bdb79c8784b427bba9526b546661f266eaf10f 100644 --- a/smash/web/views/statistics.py +++ b/smash/web/views/statistics.py @@ -3,8 +3,6 @@ from . import wrap_response from ..forms import StatisticsForm from ..statistics import StatisticsManager, get_previous_year_and_month -__author__ = 'Valentin Grouès' - def statistics(request): statistics_manager = StatisticsManager() diff --git a/smash/web/views/subject.py b/smash/web/views/subject.py index a3556a99e038d54383fe5cf4fc0e374d74a0069a..cfeddecd2ef7c1d3ccd6014dcd3bc94dc64afba5 100644 --- a/smash/web/views/subject.py +++ b/smash/web/views/subject.py @@ -7,8 +7,6 @@ from . import wrap_response from ..forms import SubjectAddForm, SubjectEditForm, VisitDetailForm from ..models import Subject -__author__ = 'Valentin Grouès' - def subjects(request): subjects_list = Subject.objects.order_by('-last_name') @@ -57,7 +55,8 @@ def subject_edit(request, id): was_dead = the_subject.dead was_resigned = the_subject.resigned if request.method == 'POST': - form = SubjectEditForm(request.POST, request.FILES, instance=the_subject, was_dead=was_dead, was_resigned=was_resigned) + form = SubjectEditForm(request.POST, request.FILES, instance=the_subject, was_dead=was_dead, + was_resigned=was_resigned) if form.is_valid(): form.save() # check if subject was marked as dead or resigned diff --git a/smash/web/views/visit.py b/smash/web/views/visit.py index dfce9763c938cc7e0f467320a99c5b48e40d3ab8..4d2319cdd31642359eeb2a5fbc29189845fe9722 100644 --- a/smash/web/views/visit.py +++ b/smash/web/views/visit.py @@ -8,8 +8,6 @@ from . import wrap_response from ..forms import VisitDetailForm, SubjectDetailForm, VisitAddForm from ..models import Visit, Appointment, Subject -__author__ = 'Valentin Grouès' - def visits(request): visit_list = Visit.objects.order_by('-datetime_begin')