diff --git a/biscuit/apps/fibu/templates/fibu/check.html b/biscuit/apps/fibu/templates/fibu/check.html index dda4ad870876962f075bb7be7fe63ebd719627f8..b40b1b035aa77b428aaa46f4ee6930ec379a2e93 100755 --- a/biscuit/apps/fibu/templates/fibu/check.html +++ b/biscuit/apps/fibu/templates/fibu/check.html @@ -7,7 +7,6 @@ <a href="{% url 'booking_edit' booking.id %}" class="collection-item row"> <span class="col s12 m6">{{ booking.description }}</span> <span class="col s12 m3 flushright">{{ booking.planned_amount }} €</span> - <span class="col s12 m1 badge new {{ booking.getStatus.style_class }}">{{ booking.getStatus.name }}</span> <form action="" method="POST" class="col s12 m2 right"> {% csrf_token %} <input type="hidden" value="{{ booking.id }}" name="booking-id"> diff --git a/biscuit/apps/fibu/templates/fibu/index.html b/biscuit/apps/fibu/templates/fibu/index.html index 348aa198cc3816703c4da3132f545e03fc52d4ee..4347594e18430aac1da8ab83c6943bbfaadfe7e3 100755 --- a/biscuit/apps/fibu/templates/fibu/index.html +++ b/biscuit/apps/fibu/templates/fibu/index.html @@ -20,7 +20,7 @@ <h4>Laufende Anträge</h4> <div class="collection"> {% for booking in bookings %} - STATUS_ID: {% booking.status.id %} + 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> @@ -29,16 +29,21 @@ <form action="{% url 'booking_edit' booking.id %}" class="col s12 m1"> {% csrf_token %} <input type="hidden" value="{{ booking.id }}" name="booking-id"> - {% if booking.status.id == 0 %} + {% if booking.status == 0 %} <button type="submit" name="edit" class="waves-effect waves-light btn-flat btn-flat-large" title="Bearbeiten"> <i class="material-icons center green-text">create</i> </button> {% endif %} - {% if booking.status.id == 1 %} + </form> + <form action="{% url 'fibu_index' %}" 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="Ware ist bestellt"> - <i class="material-icons center red-text">shopping-cart</i> + class="waves-effect waves-light btn-flat btn-flat-large" title="Status auf 'bestellt' ändern"> + <i class="material-icons center red-text">shopping_cart</i> </button> {% endif %} </form> diff --git a/biscuit/apps/fibu/views.py b/biscuit/apps/fibu/views.py index a705dc3de3839bbf0e3ab7da2446cb3ebee4197b..6db1859c967e9654f9965ed2867df0f0b74f51b3 100644 --- a/biscuit/apps/fibu/views.py +++ b/biscuit/apps/fibu/views.py @@ -10,7 +10,7 @@ from .forms import EditBookingForm #@permission_required('fibu.view_booking') def index(request): bookings = Booking.objects.filter() - print(bookings) + print('request:',request.method) # @login_required # @permission_required('fibu.make_booking') @@ -23,6 +23,9 @@ def index(request): print('Edit-Form erstellt ############# form.is_valid:', form.is_valid()) 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():