diff --git a/api/serializers.py b/api/serializers.py index 53596468..716f3b74 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -3,12 +3,12 @@ from __future__ import unicode_literals from rest_framework import serializers -from core.models import Baby, DiaperChange, Feeding, Note, Sleep, TummyTime +from core.models import Child, DiaperChange, Feeding, Note, Sleep, TummyTime -class BabySerializer(serializers.HyperlinkedModelSerializer): +class ChildSerializer(serializers.HyperlinkedModelSerializer): class Meta: - model = Baby + model = Child fields = ('first_name', 'last_name', 'birth_date') diff --git a/api/urls.py b/api/urls.py index faa5826f..8d27ae7c 100644 --- a/api/urls.py +++ b/api/urls.py @@ -4,11 +4,11 @@ from __future__ import unicode_literals from django.conf.urls import url, include from rest_framework import routers -from .views import (BabyViewSet, DiaperChangeViewSet, FeedingViewSet, +from .views import (ChildViewSet, DiaperChangeViewSet, FeedingViewSet, NoteViewSet, SleepViewSet, TummyTimeViewSet) router = routers.DefaultRouter() -router.register(r'babies', BabyViewSet) +router.register(r'children', ChildViewSet) router.register(r'diaper-changes', DiaperChangeViewSet) router.register(r'feedings', FeedingViewSet) router.register(r'notes', NoteViewSet) diff --git a/api/views.py b/api/views.py index 333da098..e5628292 100644 --- a/api/views.py +++ b/api/views.py @@ -3,20 +3,20 @@ from __future__ import unicode_literals from rest_framework import viewsets -from core.models import Baby, DiaperChange, Feeding, Note, Sleep, TummyTime +from core.models import Child, DiaperChange, Feeding, Note, Sleep, TummyTime from core.utils import filter_by_params -from .serializers import (BabySerializer, DiaperChangeSerializer, +from .serializers import (ChildSerializer, DiaperChangeSerializer, FeedingSerializer, NoteSerializer, SleepSerializer, TummyTimeSerializer,) -class BabyViewSet(viewsets.ModelViewSet): - queryset = Baby.objects.all() - serializer_class = BabySerializer +class ChildViewSet(viewsets.ModelViewSet): + queryset = Child.objects.all() + serializer_class = ChildSerializer def get_queryset(self): params = ['first_name', 'last_name'] - return filter_by_params(self.request, Baby, params) + return filter_by_params(self.request, Child, params) class DiaperChangeViewSet(viewsets.ModelViewSet): diff --git a/core/admin.py b/core/admin.py index 5e7c6ed0..39a95d5c 100644 --- a/core/admin.py +++ b/core/admin.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals from django.contrib import admin -from .models import Baby, DiaperChange, Feeding, Note, Sleep, TummyTime +from .models import Child, DiaperChange, Feeding, Note, Sleep, TummyTime -@admin.register(Baby) -class BabyAdmin(admin.ModelAdmin): +@admin.register(Child) +class ChildAdmin(admin.ModelAdmin): list_display = ('first_name', 'last_name', 'birth_date',) list_filter = ('last_name',) search_fields = ('first_name', 'last_name', 'birth_date',) diff --git a/core/models.py b/core/models.py index f36c2456..7af0864d 100644 --- a/core/models.py +++ b/core/models.py @@ -6,7 +6,7 @@ from django.db import models from .utils import duration_string -class Baby(models.Model): +class Child(models.Model): first_name = models.CharField(max_length=255) last_name = models.CharField(max_length=255) birth_date = models.DateField(blank=False, null=False) @@ -16,14 +16,14 @@ class Baby(models.Model): class Meta: default_permissions = ('view', 'add', 'change', 'delete') ordering = ['last_name', 'first_name'] - verbose_name_plural = 'Babies' + verbose_name_plural = 'Children' def __str__(self): return '{} {}'.format(self.first_name, self.last_name) class DiaperChange(models.Model): - baby = models.ForeignKey('Baby', related_name='diaper_change') + baby = models.ForeignKey('Child', related_name='diaper_change') time = models.DateTimeField(blank=False, null=False) wet = models.BooleanField() solid = models.BooleanField() @@ -45,7 +45,7 @@ class DiaperChange(models.Model): class Feeding(models.Model): - baby = models.ForeignKey('Baby', related_name='feeding') + baby = models.ForeignKey('Child', related_name='feeding') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) type = models.CharField(max_length=255, choices=[ @@ -73,7 +73,7 @@ class Feeding(models.Model): class Note(models.Model): - baby = models.ForeignKey('Baby', related_name='note') + baby = models.ForeignKey('Child', related_name='note') note = models.TextField() time = models.DateTimeField(auto_now=True) @@ -88,7 +88,7 @@ class Note(models.Model): class Sleep(models.Model): - baby = models.ForeignKey('Baby', related_name='sleep') + baby = models.ForeignKey('Child', related_name='sleep') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) @@ -108,7 +108,7 @@ class Sleep(models.Model): class TummyTime(models.Model): - baby = models.ForeignKey('Baby', related_name='tummy_time') + baby = models.ForeignKey('Child', related_name='tummy_time') start = models.DateTimeField(blank=False, null=False) end = models.DateTimeField(blank=False, null=False) milestone = models.CharField(max_length=255, blank=True) diff --git a/core/templates/core/base.html b/core/templates/core/base.html index bd1b2cce..08498a30 100644 --- a/core/templates/core/base.html +++ b/core/templates/core/base.html @@ -25,8 +25,8 @@ -
diff --git a/core/templates/core/baby_form.html b/core/templates/core/child_form.html similarity index 92% rename from core/templates/core/baby_form.html rename to core/templates/core/child_form.html index 2d2b0fca..32d0ad26 100644 --- a/core/templates/core/baby_form.html +++ b/core/templates/core/child_form.html @@ -1,10 +1,10 @@ {% extends 'core/base.html' %} {% load i18n widget_tweaks %} -{% block title %}Add a Baby{% endblock %} +{% block title %}Add a Child{% endblock %} {% block content %} -

Add a Baby

+

Add a Child

{% csrf_token %} {% for field in form %} diff --git a/core/urls.py b/core/urls.py index 4e3613cc..81f4aed6 100644 --- a/core/urls.py +++ b/core/urls.py @@ -7,9 +7,9 @@ from . import views urlpatterns = [ url(r'^$', views.Index.as_view(), name='index'), - url(r'baby/add/$', views.BabyAdd.as_view(), name='baby-add'), - url(r'baby/(?P[0-9]+)/$', views.BabyUpdate.as_view(), - name='baby-update'), - url(r'baby/(?P[0-9]+)/delete/$', views.BabyDelete.as_view(), - name='baby-delete'), + url(r'child/add/$', views.ChildAdd.as_view(), name='child-add'), + url(r'child/(?P[0-9]+)/$', views.ChildUpdate.as_view(), + name='child-update'), + url(r'child/(?P[0-9]+)/delete/$', views.ChildDelete.as_view(), + name='child-delete'), ] diff --git a/core/views.py b/core/views.py index 80de3b6b..23b652ac 100644 --- a/core/views.py +++ b/core/views.py @@ -4,24 +4,24 @@ from __future__ import unicode_literals from django.views.generic.base import TemplateView from django.views.generic.edit import CreateView, UpdateView, DeleteView -from .models import Baby +from .models import Child class Index(TemplateView): template_name = 'core/index.html' -class BabyAdd(CreateView): - model = Baby +class ChildAdd(CreateView): + model = Child fields = ['first_name', 'last_name', 'birth_date'] success_url = '/' -class BabyUpdate(UpdateView): - model = Baby +class ChildUpdate(UpdateView): + model = Child fields = ['first_name', 'last_name', 'birth_date'] success_url = '/' -class BabyDelete(DeleteView): - model = Baby +class ChildDelete(DeleteView): + model = Child