From 1b9f6e131293223790c9ac4577bd9e3324d4d4fc Mon Sep 17 00:00:00 2001
From: Frank Poetzsch-Heffter <p-h@katharineum.de>
Date: Thu, 31 Oct 2019 08:27:37 +0100
Subject: [PATCH] first form
---
biscuit/apps/fibu/models.py | 7 +++----
biscuit/apps/fibu/templates/{aub => fibu}/index.html | 6 +++---
biscuit/apps/fibu/urls.py | 2 +-
biscuit/apps/fibu/views.py | 12 ++++++------
4 files changed, 13 insertions(+), 14 deletions(-)
rename biscuit/apps/fibu/templates/{aub => fibu}/index.html (94%)
diff --git a/biscuit/apps/fibu/models.py b/biscuit/apps/fibu/models.py
index 81bcbb7..fad86f0 100644
--- a/biscuit/apps/fibu/models.py
+++ b/biscuit/apps/fibu/models.py
@@ -22,7 +22,7 @@ class Budget(models.Model):
)
class Booking(models.Model):
- cost_center = models.ForeignKey(to=CostCenter.name, on_delete=models.CASCADE)
+ cost_center = models.ForeignKey(CostCenter, on_delete=models.CASCADE)
invoice_date = models.DateField()
invoice_number = models.CharField(max_length=20)
firma = models.CharField(max_length=30)
@@ -33,13 +33,12 @@ class Booking(models.Model):
payout_number = models.IntegerField()
booking_date = models.DateField()
maturity = models.DateField()
- account = models.ForeignKey(to=Account.number, on_delete=models.CASCADE)
- budget = models.ForeignKey(to=Budget.name, on_delete=models.CASCADE)
+ account = models.ForeignKey(Account, on_delete=models.CASCADE)
+ budget = models.ForeignKey(Budget, on_delete=models.CASCADE)
upload = models.FileField(upload_to='uploads/fibu/%Y/')
class Meta:
permissions = (
- ('view_booking', 'Can view a list of bookings'),
('edit_booking', 'Can edit bookings'),
('apply_acquisition', 'Can apply an acquisition'),
)
\ No newline at end of file
diff --git a/biscuit/apps/fibu/templates/aub/index.html b/biscuit/apps/fibu/templates/fibu/index.html
similarity index 94%
rename from biscuit/apps/fibu/templates/aub/index.html
rename to biscuit/apps/fibu/templates/fibu/index.html
index 4c25427..5e581cf 100755
--- a/biscuit/apps/fibu/templates/aub/index.html
+++ b/biscuit/apps/fibu/templates/fibu/index.html
@@ -2,8 +2,8 @@
{% load material_form %}
<main>
-
- <a href="{% url 'aub_apply_for' %}" class="waves-effect waves-light btn green">Neuen Antrag stellen</a>
+Hallo
+ {% comment %} <a href="{% url 'aub_apply_for' %}" class="waves-effect waves-light btn green">Neuen Antrag stellen</a>
{% block content %}
@@ -60,6 +60,6 @@
</li>
{% endfor %}
</ul>
- {% endblock %}
+ {% endblock %}{% endcomment %}
</main>
{% include 'partials/footer.html' %}
diff --git a/biscuit/apps/fibu/urls.py b/biscuit/apps/fibu/urls.py
index 314ef06..1db9bce 100755
--- a/biscuit/apps/fibu/urls.py
+++ b/biscuit/apps/fibu/urls.py
@@ -4,5 +4,5 @@ from . import views
urlpatterns = [
path('', views.index, name='booking_index'),
- path('edit/<int:id>', views.edit, name='booking_edit'),
+ #path('edit/<int:id>', views.edit, name='booking_edit'),
]
diff --git a/biscuit/apps/fibu/views.py b/biscuit/apps/fibu/views.py
index 1d7915c..be4ad9e 100644
--- a/biscuit/apps/fibu/views.py
+++ b/biscuit/apps/fibu/views.py
@@ -1,13 +1,13 @@
-from django.shortcuts import render
-
from .models import Booking
-
-# Create your views here.
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import render, redirect, get_object_or_404
@login_required
-@permission_required('fibu.view_booking')
+#@permission_required('fibu.view_booking')
def index(request):
- items = Booking.objects.filter()
+ #items = Booking.objects.filter()
+ items = [1,2]
+ print(items)
context = {
'bookings': items,
--
GitLab