From 941121e2deacf88d7c54695e395ef6b15f7cdb6b Mon Sep 17 00:00:00 2001
From: Frank Poetzsch-Heffter <p-h@katharineum.de>
Date: Sun, 15 Dec 2019 08:58:39 +0100
Subject: [PATCH] switch status to ordered or submit-invoice

---
 biscuit/apps/fibu/models.py                 |  1 -
 biscuit/apps/fibu/templates/fibu/index.html | 24 +++++++++++----------
 biscuit/apps/fibu/views.py                  | 16 ++++++--------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/biscuit/apps/fibu/models.py b/biscuit/apps/fibu/models.py
index bd9dccb..e52cec8 100644
--- a/biscuit/apps/fibu/models.py
+++ b/biscuit/apps/fibu/models.py
@@ -63,7 +63,6 @@ class Booking(models.Model):
 
 
     def getStatus(self):
-        print(self.status, self.contact, self.id)
         return status_list[self.status]
 
 
diff --git a/biscuit/apps/fibu/templates/fibu/index.html b/biscuit/apps/fibu/templates/fibu/index.html
index 4347594..507d93e 100755
--- a/biscuit/apps/fibu/templates/fibu/index.html
+++ b/biscuit/apps/fibu/templates/fibu/index.html
@@ -20,34 +20,36 @@
     <h4>Laufende Anträge</h4>
        <div class="collection">
            {% for booking in bookings %}
-               STATUS_ID: {{ booking.status }}
                <div class="collection-item row">
-{#            <a href="{% url 'booking_edit' booking.id %}"  class="collection-item row"> #}
-                    <span class="col s12 m8">{{ booking.description }}</span>
-                    <span class="col s12 m2 flushright">{{ booking.planned_amount }} €</span>
-                    <span class="col s12 m1 badge new {{ booking.getStatus.style_class }}">{{ booking.getStatus.name }}</span>
-                    <form action="{% url 'booking_edit' booking.id %}" class="col s12 m1">
+                    <span class="col s12 m9">{{ booking.description }}</span>
+                    <span class="col s12 m1 right-align">{{ booking.planned_amount }} €</span>
+                    <span class="col s12 m1 badge new center-align {{ booking.getStatus.style_class }}">{{ booking.getStatus.name }}</span>
+                    <form action="{% url 'booking_edit' booking.id %}" class="col s12 m1 right-align">
                         {% csrf_token %}
                         <input type="hidden" value="{{ booking.id }}" name="booking-id">
                         {% if booking.status == 0 %}
                             <button type="submit" name="edit"
-                                    class="waves-effect waves-light btn-flat btn-flat-large" title="Bearbeiten">
+                                    class="waves-effect waves-light btn-flat btn-flat-medium" title="Bearbeiten">
                                 <i class="material-icons center green-text">create</i>
                             </button>
                         {% endif %}
                     </form>
-                     <form action="{% url 'fibu_index'  %}" class="col s12 m1">
+                     <form action="" method="POST" class="col s12 m1">
                         {% csrf_token %}
                         <input type="hidden" value="{{ booking.id }}" name="booking-id">
                         <input type="hidden" value="{{ booking.status }}" name="booking-status">
                         {% if booking.status == 1 %}
-                            <button type="submit" name="order"
-                                class="waves-effect waves-light btn-flat btn-flat-large" title="Status auf 'bestellt' ändern">
+                            <button type="submit" name="ordered"
+                                class="waves-effect waves-light btn-flat btn-flat-medium right-align" title="Status auf 'bestellt' ändern">
                                 <i class="material-icons center red-text">shopping_cart</i>
                             </button>
+                        {% elif booking.status == 3 %}
+                            <button type="submit" name="submit-invoice"
+                                class="waves-effect waves-light btn-flat btn-flat-medium right-align" title="Status auf 'Rechnung eingereicht' ändern">
+                                <i class="material-icons center red-text">description</i>
+                            </button>
                         {% endif %}
                     </form>
-{#           </a>#}
            </div>
            {% endfor %}
        </div>
diff --git a/biscuit/apps/fibu/views.py b/biscuit/apps/fibu/views.py
index 6db1859..3fd45f3 100644
--- a/biscuit/apps/fibu/views.py
+++ b/biscuit/apps/fibu/views.py
@@ -10,22 +10,20 @@ from .forms import EditBookingForm
 #@permission_required('fibu.view_booking')
 def index(request):
     bookings = Booking.objects.filter()
-    print('request:',request.method)
-
-# @login_required
-# @permission_required('fibu.make_booking')
-# def make_booking(request):
     if request.method == 'POST':
         if 'booking-id' in request.POST:
             booking_id = request.POST['booking-id']
             booking = Booking.objects.get(id=booking_id)
-            form = EditBookingForm(instance=booking)
+            if 'ordered' in request.POST:
+                Booking.objects.filter(id=booking_id).update(status=3)
+                return redirect('fibu_index')
+            elif 'submit-invoice' in request.POST:
+                Booking.objects.filter(id=booking_id).update(status=4)
+                return redirect('fibu_index')
             print('Edit-Form erstellt ############# form.is_valid:', form.is_valid())
+            form = EditBookingForm(instance=booking)
         else:
             form = EditBookingForm(request.POST or None)
-    elif 'booking-status' in request.GET:
-        print('status',request.GET)
-#        booking-status = str(int(booking-status)+1)
     else:
         form = EditBookingForm()
     if form.is_valid():
-- 
GitLab