diff --git a/invsystem/invsystem/settings.py b/invsystem/invsystem/settings.py index 37c95e0..68713f8 100644 --- a/invsystem/invsystem/settings.py +++ b/invsystem/invsystem/settings.py @@ -32,6 +32,7 @@ ALLOWED_HOSTS = [] INSTALLED_APPS = [ 'user_manager', + 'object_adder', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/invsystem/invsystem/urls.py b/invsystem/invsystem/urls.py index 972ff28..feac818 100644 --- a/invsystem/invsystem/urls.py +++ b/invsystem/invsystem/urls.py @@ -20,5 +20,6 @@ urlpatterns = [ path('admin/', admin.site.urls), path('accounts/', include('django.contrib.auth.urls')), path('', include('user_manager.urls')), + path('add/', include('object_adder.urls')) ] diff --git a/invsystem/object_adder/__init__.py b/invsystem/object_adder/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/invsystem/object_adder/admin.py b/invsystem/object_adder/admin.py new file mode 100644 index 0000000..edd57bb --- /dev/null +++ b/invsystem/object_adder/admin.py @@ -0,0 +1,10 @@ +from django.contrib import admin +from .models import Object + + +class ObjectAdmin(admin.ModelAdmin): + pass + + +# Register your models here. +admin.site.register(Object, ObjectAdmin) diff --git a/invsystem/object_adder/apps.py b/invsystem/object_adder/apps.py new file mode 100644 index 0000000..7d2f1ca --- /dev/null +++ b/invsystem/object_adder/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ObjectAdderConfig(AppConfig): + name = 'object_adder' diff --git a/invsystem/object_adder/migrations/__init__.py b/invsystem/object_adder/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/invsystem/object_adder/models.py b/invsystem/object_adder/models.py new file mode 100644 index 0000000..4bc9330 --- /dev/null +++ b/invsystem/object_adder/models.py @@ -0,0 +1,15 @@ +from django.db import models +import uuid +from django.contrib.auth.models import User + + +# Create your models here. + +class Object(models.Model): + title = models.TextField(max_length=100, default=None) + img = models.ImageField(default=None) + uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + inventarized_date = models.DateTimeField() + description = models.TextField(max_length=500) + removed_date = models.DateTimeField() + user_added = models.ForeignKey(User, on_delete=models.CASCADE) diff --git a/invsystem/object_adder/tests.py b/invsystem/object_adder/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/invsystem/object_adder/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/invsystem/object_adder/urls.py b/invsystem/object_adder/urls.py new file mode 100644 index 0000000..98b17e1 --- /dev/null +++ b/invsystem/object_adder/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('', views.add, name='add'), +] diff --git a/invsystem/object_adder/views.py b/invsystem/object_adder/views.py new file mode 100644 index 0000000..af99baf --- /dev/null +++ b/invsystem/object_adder/views.py @@ -0,0 +1,11 @@ +from django.shortcuts import render +from django.contrib.auth.decorators import login_required + + +# Create your views here. + +@login_required +def add(request): + context = {'title': 'Objekt inventarisieren'} + + return render(request, 'object_adder/index.html', context) diff --git a/invsystem/requirements.txt b/invsystem/requirements.txt index 225d6fc..dd811cd 100644 --- a/invsystem/requirements.txt +++ b/invsystem/requirements.txt @@ -9,3 +9,4 @@ django-import-export psycopg2-binary requests Faker +Pillow \ No newline at end of file diff --git a/invsystem/user_manager/forms.py b/invsystem/user_manager/forms.py index dccf4d3..ba1c19e 100644 --- a/invsystem/user_manager/forms.py +++ b/invsystem/user_manager/forms.py @@ -8,4 +8,4 @@ class SignUpForm(UserCreationForm): class Meta: model = User - fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2', ) \ No newline at end of file + fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2',) diff --git a/invsystem/user_manager/templates/bases/navbar.html b/invsystem/user_manager/templates/bases/navbar.html index ac7d2ae..0ddd6ec 100644 --- a/invsystem/user_manager/templates/bases/navbar.html +++ b/invsystem/user_manager/templates/bases/navbar.html @@ -11,6 +11,7 @@ integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous"> + {{ title }} @@ -32,8 +33,7 @@ {% if user.is_authenticated %} diff --git a/invsystem/user_manager/templates/object_adder/index.html b/invsystem/user_manager/templates/object_adder/index.html new file mode 100644 index 0000000..8a0f364 --- /dev/null +++ b/invsystem/user_manager/templates/object_adder/index.html @@ -0,0 +1,12 @@ +{% extends 'bases/navbar.html' %} + +{% block content%} + + +
+

On this page objects can be added.

+
+ +{% endblock %} + + \ No newline at end of file diff --git a/invsystem/user_manager/views.py b/invsystem/user_manager/views.py index f2ac587..040f866 100644 --- a/invsystem/user_manager/views.py +++ b/invsystem/user_manager/views.py @@ -11,6 +11,7 @@ def index(request): def register(request): if request.method == 'POST': form = SignUpForm(request.POST) + title = 'Login' if form.is_valid(): form.save() @@ -22,6 +23,7 @@ def register(request): else: form = SignUpForm() + title = 'Registrieren' - context = {'form': form} + context = {'form': form, 'title': title} return render(request, 'registration/register.html', context)