clara/Inventarium
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

created object adder app

Browse source
This commit is contained in:
Clemens-Dautermann 2018-12-18 19:27:15 +01:00
parent 8e855e0748
commit 594712650c
15 changed files with 71 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
invsystem/invsystem/settings.py
View file

@ -32,6 +32,7 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [ INSTALLED_APPS = [
'user_manager', 'user_manager',
'object_adder',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',

1
invsystem/invsystem/urls.py
View file

@ -20,5 +20,6 @@ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django.contrib.auth.urls')),
path('', include('user_manager.urls')), path('', include('user_manager.urls')),
path('add/', include('object_adder.urls'))
] ]

0
invsystem/object_adder/__init__.py Normal file
View file

10
invsystem/object_adder/admin.py Normal file
View file

@ -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)

5
invsystem/object_adder/apps.py Normal file
View file

@ -0,0 +1,5 @@
from django.apps import AppConfig
class ObjectAdderConfig(AppConfig):
name = 'object_adder'

0
invsystem/object_adder/migrations/__init__.py Normal file
View file

15
invsystem/object_adder/models.py Normal file
View file

@ -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)

3
invsystem/object_adder/tests.py Normal file
View file

@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

6
invsystem/object_adder/urls.py Normal file
View file

@ -0,0 +1,6 @@
from django.urls import path
from . import views
urlpatterns = [
path('', views.add, name='add'),
]

11
invsystem/object_adder/views.py Normal file
View file

@ -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)

1
invsystem/requirements.txt
View file

@ -9,3 +9,4 @@ django-import-export
psycopg2-binary psycopg2-binary
requests requests
Faker Faker
Pillow

2
invsystem/user_manager/forms.py
View file

@ -8,4 +8,4 @@ class SignUpForm(UserCreationForm):
class Meta: class Meta:
model = User model = User
fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2', ) fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2',)

4
invsystem/user_manager/templates/bases/navbar.html
View file

@ -11,6 +11,7 @@
integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous"> integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
<title>{{ title }}</title>
</head> </head>
@ -32,8 +33,7 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{% url 'index' %}">Home</a></li> <li><a href="{% url 'index' %}">Home</a></li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% else %} <li><a href="{% url 'add' %}">Objekt inventarisieren</a></li>
<li><a href="#">Page 2</a></li>
{% endif %} {% endif %}
</ul> </ul>
{% if user.is_authenticated %} {% if user.is_authenticated %}

12
invsystem/user_manager/templates/object_adder/index.html Normal file
View file

@ -0,0 +1,12 @@
{% extends 'bases/navbar.html' %}
<html>
{% block content%}
<body>
<div class="container">
<p>On this page objects can be added.</p>
</div>
</body>
{% endblock %}
</html>

4
invsystem/user_manager/views.py
View file

@ -11,6 +11,7 @@ def index(request):
def register(request): def register(request):
if request.method == 'POST': if request.method == 'POST':
form = SignUpForm(request.POST) form = SignUpForm(request.POST)
title = 'Login'
if form.is_valid(): if form.is_valid():
form.save() form.save()
@ -22,6 +23,7 @@ def register(request):
else: else:
form = SignUpForm() form = SignUpForm()
title = 'Registrieren'
context = {'form': form} context = {'form': form, 'title': title}
return render(request, 'registration/register.html', context) return render(request, 'registration/register.html', context)