diff --git a/invsystem/object_adder/models.py b/invsystem/object_adder/models.py index 02d7083..9cc302a 100644 --- a/invsystem/object_adder/models.py +++ b/invsystem/object_adder/models.py @@ -8,13 +8,13 @@ from django.contrib.auth.models import User class Object(models.Model): ammout = models.PositiveIntegerField(default=1, blank=False) title = models.TextField(max_length=100, default=None, blank=False) - img = models.ImageField(default=None, blank=True) + img = models.ImageField(default='/images/None/nopic.svg', blank=True, upload_to='images/') uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) inventarized_date = models.DateTimeField(blank=False, null=True) 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) + category = models.ForeignKey('Category', on_delete=models.SET_NULL, blank=True, default=None, null=True) objects = models.Manager() diff --git a/invsystem/object_adder/views.py b/invsystem/object_adder/views.py index def3198..2e7528d 100644 --- a/invsystem/object_adder/views.py +++ b/invsystem/object_adder/views.py @@ -9,7 +9,7 @@ from django.utils import timezone @login_required def add(request): if request.method == 'POST': - form = ObjectForm(request.POST) + form = ObjectForm(request.POST, request.FILES) if form.is_valid(): try: diff --git a/invsystem/object_lister/urls.py b/invsystem/object_lister/urls.py index 7482103..00c88ee 100644 --- a/invsystem/object_lister/urls.py +++ b/invsystem/object_lister/urls.py @@ -5,5 +5,6 @@ import uuid urlpatterns = [ path('', views.objlist, name='objlist'), path('', views.objlist, name='objlist_ordered'), - path('/delete', views.delete, name='del_obj') + path('/delete', views.delete, name='del_obj'), + path('/delete/category', views.deleteCategory, name='del_cat') ] diff --git a/invsystem/object_lister/views.py b/invsystem/object_lister/views.py index 2e1817e..e370a05 100644 --- a/invsystem/object_lister/views.py +++ b/invsystem/object_lister/views.py @@ -48,7 +48,7 @@ def objlist(request, orderstr=None): return render(request, 'object_lister/index.html', context) elif request.method == 'POST': - form = ObjectForm(request.POST) + form = ObjectForm(request.POST, request.FILES) if form.is_valid(): result = re.fullmatch(uuidv4pattern, orderstr) @@ -78,3 +78,10 @@ def delete(request, uuid_url): obj = get_object_or_404(Object, pk=uuid_url) obj.delete() return render(request, 'object_lister/delete.html', {'uuid': uuid_url}) + + +@login_required +def deleteCategory(request, uuid_url): + cat = get_object_or_404(Category, pk=uuid_url) + cat.delete() + return render(request, 'object_lister/delete.html', {'uuid': uuid_url}) diff --git a/invsystem/user_manager/forms.py b/invsystem/user_manager/forms.py index ba1c19e..54dfdf4 100644 --- a/invsystem/user_manager/forms.py +++ b/invsystem/user_manager/forms.py @@ -5,6 +5,9 @@ from django.contrib.auth.models import User class SignUpForm(UserCreationForm): username = CharField(required=True) + last_name = CharField(required=True) + first_name = CharField(required=True) + email = CharField(required=True) class Meta: model = User diff --git a/invsystem/user_manager/static/user_manager/style.css b/invsystem/user_manager/static/user_manager/style.css index b2fc083..8e95544 100644 --- a/invsystem/user_manager/static/user_manager/style.css +++ b/invsystem/user_manager/static/user_manager/style.css @@ -112,17 +112,19 @@ .cattable { border-collapse: collapse; width: 50%; - margin-top: 2em; - margin-bottom: 2em; + margin: 2em auto 2em auto; } -.cattable * { +.cattable .leftalign { text-align: left; } +.cattable .rightalign{ + text-align: right; +} + .lower-box { margin-top: 2em; - width: 50%; } .celllink, .celllink:hover, .celllink:visited, .celllink:active { @@ -149,4 +151,30 @@ .delbtn{ margin-bottom: 1em !important; +} + +.delcatbtn{ + margin-top: 0.5em !important; + margin-bottom: 0.5em !important; +} + +.nodec{ + list-style: none; +} + +.registerformcontainer *{ + margin-top: 1em; +} + +.registerformcontainer input{ + margin-left: 0.7em; +} + +.nomarg{ + margin: 2em 0 0 0 !important; +} + +.pwdinfo{ + border: 2px solid rgba(110, 110, 110, 0.28); + width: 50%; } \ No newline at end of file diff --git a/invsystem/user_manager/templates/bases/navbar.html b/invsystem/user_manager/templates/bases/navbar.html index d51818c..22d8a80 100644 --- a/invsystem/user_manager/templates/bases/navbar.html +++ b/invsystem/user_manager/templates/bases/navbar.html @@ -42,13 +42,13 @@ {% if user.is_authenticated %} {% else %} {% endif %} diff --git a/invsystem/user_manager/templates/object_adder/index.html b/invsystem/user_manager/templates/object_adder/index.html index 01087b9..a324233 100644 --- a/invsystem/user_manager/templates/object_adder/index.html +++ b/invsystem/user_manager/templates/object_adder/index.html @@ -10,7 +10,7 @@ Das Objekt {{ obj_name }} wurde inventarisiert! {% endif %} -
+ {% csrf_token %}
{{ form.ammout.errors }} @@ -27,11 +27,13 @@ {{ form.category }}
+
{{ form.description.errors }} diff --git a/invsystem/user_manager/templates/object_lister/details.html b/invsystem/user_manager/templates/object_lister/details.html index d9a8266..a5bd96b 100644 --- a/invsystem/user_manager/templates/object_lister/details.html +++ b/invsystem/user_manager/templates/object_lister/details.html @@ -14,7 +14,7 @@ × Abbruch.
- + {% csrf_token %}
{{ form.ammout.errors }} @@ -31,11 +31,13 @@ {{ form.category }}
+
{{ form.description.errors }} diff --git a/invsystem/user_manager/templates/object_lister/index.html b/invsystem/user_manager/templates/object_lister/index.html index cfd32ce..de7a5bf 100644 --- a/invsystem/user_manager/templates/object_lister/index.html +++ b/invsystem/user_manager/templates/object_lister/index.html @@ -4,6 +4,14 @@
+
+ × + Kategorie wurde gelöscht. +
+
+ × + Abbruch. +
{% csrf_token %} @@ -46,17 +54,49 @@
- + + {% for category in categories %} - + + {% endfor %}
KategorieKategorie
{{ category.name }}{{ category.name }} + +

{{ ncats }} Kategorien insgesamt

-{% endblock %} + +{% endblock %} \ No newline at end of file diff --git a/invsystem/user_manager/templates/registration/logged_out.html b/invsystem/user_manager/templates/registration/logged_out.html index 1968dd3..afc2cea 100644 --- a/invsystem/user_manager/templates/registration/logged_out.html +++ b/invsystem/user_manager/templates/registration/logged_out.html @@ -4,8 +4,8 @@ {% block content %}
-

Logged out!

- Click here to login again. +

Ausgelogt.

+ Klicken sie hier um sich erneut einzuloggen.
{% endblock %} diff --git a/invsystem/user_manager/templates/registration/login.html b/invsystem/user_manager/templates/registration/login.html index f3be895..d8d5b7f 100644 --- a/invsystem/user_manager/templates/registration/login.html +++ b/invsystem/user_manager/templates/registration/login.html @@ -6,9 +6,9 @@ -
+
{% if form.errors %} -

Wrong username/password combination

+

Falscher Nutzername oder falsches Passwort

{% endif %} {% if next %} @@ -19,13 +19,13 @@ {% csrf_token %}
- +
{{ form.username }}
- +
{{ form.password }}
@@ -33,9 +33,9 @@
- + - Lost password? + Passwort vergessen?
diff --git a/invsystem/user_manager/templates/registration/register.html b/invsystem/user_manager/templates/registration/register.html index 76c412a..3787fb3 100644 --- a/invsystem/user_manager/templates/registration/register.html +++ b/invsystem/user_manager/templates/registration/register.html @@ -5,20 +5,55 @@ {% block content %} -
-

registration page

- +
+

Registrieren

+ {% csrf_token %} {% if form.errors %}

There are errors in the form

{% endif %} - {{ form }} - +
+ {{ form.username.errors }} + + {{ form.username }} +
+
+ {{ form.first_name.errors }} + + {{ form.first_name }} +
+
+ {{ form.last_name.errors }} + + {{ form.last_name }} +
+ +
+ {{ form.password1.errors }} + + {{ form.password1 }} +
+
    +
  • Das Passwort darf nicht zu ähnlich zu Ihren anderen persönlichen Informationen sein.
    • +
  • Das Passwort muss mindestens 8 Zeichen enthalten.
    • +
  • Das Passwort darf nicht allgemein üblich sein.
    • +
  • Das Passwort darf nicht komplett aus Ziffern bestehen.
    • +
+
+ {{ form.password2.errors }} + + {{ form.password2 }} +
+ +
- diff --git a/invsystem/user_manager/templates/user_manager/index.html b/invsystem/user_manager/templates/user_manager/index.html index 1c97bf9..ea71d44 100644 --- a/invsystem/user_manager/templates/user_manager/index.html +++ b/invsystem/user_manager/templates/user_manager/index.html @@ -3,7 +3,7 @@ {% block content%} -
+

Inventarium

Mit diesem System können allerlei Dinge inventarisiert werden.

Zum Beispiel: