Skip to content
Snippets Groups Projects
Commit def4a6be authored by Valentin Groues's avatar Valentin Groues :eyes:
Browse files

fix typo: avaibility

parent 40ecf864
No related branches found
No related tags found
1 merge request!32Resolve "Contact attempts"
This commit is part of merge request !32. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
smash/web/admin.py
+ 2
− 2
View file @ def4a6be
from django.contrib import admin from django.contrib import admin
from models import Subject, Item, Room, AppointmentType, Language, Location, Worker, FlyingTeam, Avaibility, Holiday, \ from models import Subject, Item, Room, AppointmentType, Language, Location, Worker, FlyingTeam, Availability, Holiday, \
Visit, Appointment Visit, Appointment
...@@ -18,6 +18,6 @@ admin.site.register(Language, LanguageAdmin) ...@@ -18,6 +18,6 @@ admin.site.register(Language, LanguageAdmin)
admin.site.register(Location) admin.site.register(Location)
admin.site.register(Worker) admin.site.register(Worker)
admin.site.register(FlyingTeam) admin.site.register(FlyingTeam)
admin.site.register(Avaibility) admin.site.register(Availability)
admin.site.register(Holiday) admin.site.register(Holiday)
admin.site.register(Appointment) admin.site.register(Appointment)
smash/web/migrations/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ 40ecf864
smash/web/models/__init__.py
+ 2
− 2
View file @ def4a6be
...@@ -12,7 +12,7 @@ from visit import Visit ...@@ -12,7 +12,7 @@ from visit import Visit
from worker import Worker from worker import Worker
from appointment import Appointment from appointment import Appointment
from appointment_type import AppointmentType from appointment_type import AppointmentType
from avaibility import Avaibility from availability import Availability
from holiday import Holiday from holiday import Holiday
from item import Item from item import Item
from language import Language from language import Language
...@@ -23,5 +23,5 @@ def get_current_year(): ...@@ -23,5 +23,5 @@ def get_current_year():
return datetime.datetime.now().year return datetime.datetime.now().year
__all__ = [FlyingTeam, Appointment, AppointmentType, Avaibility, Holiday, Item, Language, Location, Room, Subject, __all__ = [FlyingTeam, Appointment, AppointmentType, Availability, Holiday, Item, Language, Location, Room, Subject,
Visit, Worker] Visit, Worker]
smash/web/models/avaibility.py → smash/web/models/availability.py
+ 4
− 3
View file @ def4a6be
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
from django.db import models from django.db import models
class Avaibility(models.Model): class Availability(models.Model):
class Meta: class Meta:
app_label = 'web' app_label = 'web'
db_table = 'web_avaibility'
person = models.ForeignKey("web.Worker", on_delete=models.CASCADE, person = models.ForeignKey("web.Worker", on_delete=models.CASCADE,
verbose_name='Worker' verbose_name='Worker'
...@@ -13,10 +14,10 @@ class Avaibility(models.Model): ...@@ -13,10 +14,10 @@ class Avaibility(models.Model):
verbose_name='Day of the week' verbose_name='Day of the week'
) )
available_from = models.TimeField( available_from = models.TimeField(
verbose_name='Avaible since' verbose_name='Available since'
) )
available_till = models.TimeField( available_till = models.TimeField(
verbose_name='Avaible until' verbose_name='Available until'
) )
is_current = models.BooleanField( is_current = models.BooleanField(
verbose_name='Is current?', verbose_name='Is current?',
......
smash/web/templates/doctors/availability_delete.html
+ 13
− 13
View file @ def4a6be
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{% block ui_active_tab %}'workers'{% endblock ui_active_tab %} {% block ui_active_tab %}'workers'{% endblock ui_active_tab %}
{% block page_header %}Workers{% endblock page_header %} {% block page_header %}Workers{% endblock page_header %}
{% block page_description %}avaibility{% endblock page_description %} {% block page_description %}availability{% endblock page_description %}
{% block breadcrumb %} {% block breadcrumb %}
{% include "doctors/breadcrumb.html" %} {% include "doctors/breadcrumb.html" %}
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
{% else %} {% else %}
<p>No avaibilities on Monday.</p> <p>No availabilities on Monday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
<h3>Tuesday</h3> <h3>Tuesday</h3>
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
{% else %} {% else %}
<p>No avaibilities on Tuesday.</p> <p>No availabilities on Tuesday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
<h3>Wednesday</h3> <h3>Wednesday</h3>
...@@ -115,13 +115,13 @@ ...@@ -115,13 +115,13 @@
{% else %} {% else %}
<p>No avaibilities on Wednesday.</p> <p>No availabilities on Wednesday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
<h3>Thursday</h3> <h3>Thursday</h3>
...@@ -150,13 +150,13 @@ ...@@ -150,13 +150,13 @@
{% else %} {% else %}
<p>No avaibilities on Thursday.</p> <p>No availabilities on Thursday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
<h3>Friday</h3> <h3>Friday</h3>
...@@ -185,13 +185,13 @@ ...@@ -185,13 +185,13 @@
{% else %} {% else %}
<p>No avaibilities on Friday.</p> <p>No availabilities on Friday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
<h3>Saturday</h3> <h3>Saturday</h3>
...@@ -220,13 +220,13 @@ ...@@ -220,13 +220,13 @@
{% else %} {% else %}
<p>No avaibilities on Saturday.</p> <p>No availabilities on Saturday.</p>
{% endif %} {% endif %}
<div> <div>
<a href="{% url 'web.views.doctor_add' %}" class="btn btn-app"> <a href="{% url 'web.views.doctor_add' %}" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
</div> </div>
......
smash/web/templates/doctors/availability_index.html
+ 15
− 15
View file @ def4a6be
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{% block ui_active_tab %}'workers'{% endblock ui_active_tab %} {% block ui_active_tab %}'workers'{% endblock ui_active_tab %}
{% block page_header %}Workers{% endblock page_header %} {% block page_header %}Workers{% endblock page_header %}
{% block page_description %}avaibility{% endblock page_description %} {% block page_description %}availability{% endblock page_description %}
{% block breadcrumb %} {% block breadcrumb %}
{% include "doctors/breadcrumb.html" %} {% include "doctors/breadcrumb.html" %}
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avmon %} {% if avmon %}
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Monday.</p> <p>No availabilities on Monday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avtue %} {% if avtue %}
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Tuesday.</p> <p>No availabilities on Tuesday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avwed %} {% if avwed %}
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Wednesday.</p> <p>No availabilities on Wednesday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avthu %} {% if avthu %}
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Thursday.</p> <p>No availabilities on Thursday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avfri %} {% if avfri %}
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Friday.</p> <p>No availabilities on Friday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avsat %} {% if avsat %}
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Saturday.</p> <p>No availabilities on Saturday.</p>
{% endif %} {% endif %}
</div> </div>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
<div class="new-availability"> <div class="new-availability">
<a href="#" class="btn btn-app"> <a href="#" class="btn btn-app">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
Add new avaibility</a> Add new availability</a>
</div> </div>
{% if avsun %} {% if avsun %}
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
</table> </table>
{% else %} {% else %}
<p>No avaibilities on Sunday.</p> <p>No availabilities on Sunday.</p>
{% endif %} {% endif %}
</div> </div>
......
smash/web/views/doctor.py
+ 3
− 3
View file @ def4a6be
...@@ -3,7 +3,7 @@ from django.shortcuts import redirect, get_object_or_404 ...@@ -3,7 +3,7 @@ from django.shortcuts import redirect, get_object_or_404
from . import wrap_response from . import wrap_response
from ..forms import WorkerAddForm, WorkerEditForm, WorkerDetailForm from ..forms import WorkerAddForm, WorkerEditForm, WorkerDetailForm
from ..models import Worker, Avaibility from ..models import Worker, Availability
def doctors(request): def doctors(request):
...@@ -47,7 +47,7 @@ def doctor_details(request, doctor_id): ...@@ -47,7 +47,7 @@ def doctor_details(request, doctor_id):
def doctor_availability(request, doctor_id): def doctor_availability(request, doctor_id):
avall = Avaibility.objects.filter(person=doctor_id) avall = Availability.objects.filter(person=doctor_id)
avmon = avall.filter(day_number=1) avmon = avall.filter(day_number=1)
avtue = avall.filter(day_number=2) avtue = avall.filter(day_number=2)
...@@ -72,7 +72,7 @@ def doctor_availability(request, doctor_id): ...@@ -72,7 +72,7 @@ def doctor_availability(request, doctor_id):
def doctor_availability_delete(request, doctor_id, availability_id): def doctor_availability_delete(request, doctor_id, availability_id):
availibility = Avaibility.objects.filter(id=availability_id) availibility = Availability.objects.filter(id=availability_id)
if len(availibility) > 0: if len(availibility) > 0:
availibility.delete() availibility.delete()
return redirect(doctoravail, id=doctor_id) # FIXME doctoravail doesn't exist return redirect(doctoravail, id=doctor_id) # FIXME doctoravail doesn't exist
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment