List feature

+ implemented list feature
+ implemented category feature

invsystem/object_adder/admin.py

@@ -1,10 +1,15 @@
 from django.contrib import admin
-from .models import Object
+from .models import Object, Category
 
 
 class ObjectAdmin(admin.ModelAdmin):
     list_display = ('title', 'ammout', 'uuid', 'img')
 
 
+class CategoryAdmin(admin.ModelAdmin):
+    list_display = ('name', 'id')
+
+
 # Register your models here.
 admin.site.register(Object, ObjectAdmin)
+admin.site.register(Category, CategoryAdmin)

invsystem/object_adder/forms.py

@@ -1,12 +1,21 @@
 from django.forms import ModelForm, TextInput
 
-from .models import Object
+from .models import Object, Category
 
 
 class ObjectForm(ModelForm):
     class Meta:
         model = Object
-        fields = ('ammout', 'title', 'img', 'description')
+        fields = ('ammout', 'title', 'img', 'description', 'category')
         widgets = {
             'title': TextInput(),
         }
+
+
+class CategoryForm(ModelForm):
+    class Meta:
+        model = Category
+        fields = ['name']
+        widgets = {
+            'name': TextInput()
+        }

invsystem/object_adder/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.4 on 2018-12-18 17:57
+# Generated by Django 2.1.4 on 2018-12-22 19:20
 
 from django.conf import settings
 from django.db import migrations, models
@@ -18,11 +18,14 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Object',
             fields=[
+                ('ammout', models.PositiveIntegerField(default=1)),
+                ('title', models.TextField(default=None, max_length=100)),
+                ('img', models.ImageField(blank=True, default=None, upload_to='')),
                 ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
-                ('inventarized_date', models.DateTimeField()),
-                ('description', models.TextField(max_length=500)),
-                ('removed_date', models.DateTimeField()),
-                ('user_added', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('inventarized_date', models.DateTimeField(null=True)),
+                ('description', models.TextField(blank=True, max_length=500)),
+                ('removed_date', models.DateTimeField(blank=True, default=None, null=True)),
+                ('user_added', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

invsystem/object_adder/migrations/0002_object_img.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.4 on 2018-12-18 18:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('object_adder', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='object',
-            name='img',
-            field=models.ImageField(default=None, upload_to=''),
-        ),
-    ]

invsystem/object_adder/migrations/0003_object_title.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.1.4 on 2018-12-18 18:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('object_adder', '0002_object_img'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='object',
-            name='title',
-            field=models.TextField(default=None, max_length=100),
-        ),
-    ]

invsystem/object_adder/models.py

@@ -14,3 +14,19 @@ class Object(models.Model):
     description = models.TextField(max_length=500, blank=True)
     removed_date = models.DateTimeField(blank=True, default=None, null=True)
     user_added = models.ForeignKey(User, on_delete=models.CASCADE, blank=False, null=True)
+    category = models.ForeignKey('Category', on_delete=models.CASCADE, blank=True, default=None, null=True)
+
+    objects = models.Manager()
+
+    def __str__(self):
+        return str(self.uuid)
+
+
+class Category(models.Model):
+    name = models.TextField(blank=False, max_length=150)
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+
+    categories = models.Manager()
+
+    def __str__(self):
+        return self.name

invsystem/object_adder/urls.py

@@ -3,4 +3,5 @@ from . import views
 
 urlpatterns = [
     path('', views.add, name='add'),
+    path('kategorie', views.category, name='category')
 ]

invsystem/object_adder/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
-from .forms import ObjectForm
+from .forms import ObjectForm, CategoryForm
 from django.utils import timezone
 
 
@@ -24,10 +24,28 @@ def add(request):
             obj.user_added = request.user
             obj.save()
 
-        context = {'title': 'Objekt inventarisieren', 'form': ObjectForm,
-                   'obj_name': form.cleaned_data.get('title')}
-        return render(request, 'object_adder/index.html', context)
+            context = {'title': 'Objekt inventarisieren', 'form': ObjectForm,
+                       'obj_name': form.cleaned_data.get('title')}
+            return render(request, 'object_adder/index.html', context)
 
     else:
         context = {'title': 'Objekt inventarisieren', 'form': ObjectForm}
         return render(request, 'object_adder/index.html', context)
+
+
+@login_required
+def category(request):
+    if request.method == 'POST':
+        form = CategoryForm(request.POST)
+
+        if form.is_valid():
+            cat = form.save()
+            cat.save()
+
+            context = {'title': 'Neue Kategorie hinzufügen',
+                       'cat_name': form.cleaned_data.get('name'),
+                       'form': CategoryForm}
+            return render(request, 'object_adder/category.html', context)
+    else:
+        context = {'form': CategoryForm, 'title': 'Neue Kategorie hinzufügen'}
+        return render(request, 'object_adder/category.html', context)