From 79472dcdbe4a98e58802438765c18da0a16c8215 Mon Sep 17 00:00:00 2001
From: Christopher Charbonneau Wells <chris@chrxs.net>
Date: Wed, 16 Aug 2017 18:07:25 -0400
Subject: [PATCH] Add an amount field to the Feeding model.

---
 api/serializers.py                    | 3 ++-
 api/views.py                          | 2 +-
 core/admin.py                         | 6 ++++--
 core/forms.py                         | 2 +-
 core/models.py                        | 1 +
 core/templates/core/feeding_list.html | 6 +++---
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/api/serializers.py b/api/serializers.py
index 716f3b74..7a886115 100644
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -21,7 +21,8 @@ class DiaperChangeSerializer(serializers.HyperlinkedModelSerializer):
 class FeedingSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Feeding
-        fields = ('baby', 'start', 'end', 'duration', 'type', 'method')
+        fields = ('baby', 'start', 'end', 'duration', 'type', 'method',
+                  'amount')
 
 
 class NoteSerializer(serializers.HyperlinkedModelSerializer):
diff --git a/api/views.py b/api/views.py
index e5628292..f1248853 100644
--- a/api/views.py
+++ b/api/views.py
@@ -33,7 +33,7 @@ class FeedingViewSet(viewsets.ModelViewSet):
     serializer_class = FeedingSerializer
 
     def get_queryset(self):
-        params = ['baby__last_name', 'type', 'method']
+        params = ['baby__last_name', 'type', 'method', 'amount']
         return filter_by_params(self.request, Feeding, params)
 
 
diff --git a/core/admin.py b/core/admin.py
index cc60dbb4..5ec9ab29 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -22,9 +22,11 @@ class DiaperChangeAdmin(admin.ModelAdmin):
 
 @admin.register(Feeding)
 class FeedingAdmin(admin.ModelAdmin):
-    list_display = ('start', 'end', 'duration', 'child', 'type', 'method',)
+    list_display = ('start', 'end', 'duration', 'child', 'type', 'method',
+                    'amount')
     list_filter = ('child', 'type', 'method',)
-    search_fields = ('child__first_name', 'child__last_name', 'type', 'method',)
+    search_fields = ('child__first_name', 'child__last_name', 'type',
+                     'method',)
 
 
 @admin.register(Note)
diff --git a/core/forms.py b/core/forms.py
index 684f8035..45759125 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -35,7 +35,7 @@ class DiaperChangeForm(forms.ModelForm):
 class FeedingForm(forms.ModelForm):
     class Meta:
         model = Feeding
-        fields = ['child', 'start', 'end', 'type', 'method']
+        fields = ['child', 'start', 'end', 'type', 'method', 'amount']
         widgets = {
             'start': forms.DateTimeInput(attrs={
                 'class': 'datepicker-input',
diff --git a/core/models.py b/core/models.py
index dc751289..506b79af 100644
--- a/core/models.py
+++ b/core/models.py
@@ -57,6 +57,7 @@ class Feeding(models.Model):
         ('left breast', 'Left breast'),
         ('right breast', 'Right breast'),
     ])
+    amount = models.FloatField(blank=True, null=True)
 
     objects = models.Manager()
 
diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html
index 0eb3f0f2..1e434319 100644
--- a/core/templates/core/feeding_list.html
+++ b/core/templates/core/feeding_list.html
@@ -11,11 +11,11 @@
                 <tr>
                     <th>#</th>
                     <th>Child</th>
-                    <th>Start</th>
-                    <th>End</th>
+                    <th>Date</th>
                     <th>Duration</th>
                     <th>Type</th>
                     <th>Method</th>
+                    <th>Amount (oz)</th>
                     <th class="text-center">Actions</th>
                 </tr>
             </thead>
@@ -25,10 +25,10 @@
                         <th scope="row">{{ feeding.id }}</th>
                         <td>{{ feeding.child }}</td>
                         <td>{{ feeding.start }}</td>
-                        <td>{{ feeding.end }}</td>
                         <td>{{ feeding.duration }}</td>
                         <td>{{ feeding.type }}</td>
                         <td>{{ feeding.method }}</td>
+                        <td>{{ feeding.amount }}</td>
                         <td class="text-center">
                             <div class="btn-group btn-group-sm" role="group" aria-label="Actions">
                                 <a href="{% url 'feeding-update' feeding.id %}" class="btn btn-primary"><i class="fa fa-pencil" aria-hidden="true"></i></a>