Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
phillipthelen committed Oct 14, 2021
1 parent 4d842fe commit 3c950df
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 12 deletions.
1 change: 1 addition & 0 deletions Lagerregal/settings/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Django settings for Lagerregal project.
import os

from reportlab.lib.units import mm

# Local time zone for this installation. Choices can be found here:
Expand Down
4 changes: 2 additions & 2 deletions devices/admin.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from django.contrib import admin

from locations.models import Building
from devices.models import Device
from devices.models import DeviceInformation
from devices.models import DeviceInformationType
from devices.models import Lending
from devices.models import Manufacturer
from devices.models import Note
from devices.models import Picture
from locations.models import Room
from devices.models import Template
from locations.models import Building
from locations.models import Room


class DeviceAdmin(admin.ModelAdmin):
Expand Down
3 changes: 2 additions & 1 deletion devices/migrations/0014_auto_20210628_1406.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Generated by Django 3.2.3 on 2021-06-28 12:06

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations
from django.db import models


class Migration(migrations.Migration):
Expand Down
9 changes: 5 additions & 4 deletions devices/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import json
import textwrap
import time
from django.http.response import HttpResponseNotFound

import pdfrw
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.models import Group
Expand All @@ -16,10 +14,12 @@
from django.db import models
from django.db.models import Q
from django.db.transaction import atomic
from django.http import Http404, FileResponse
from django.http import FileResponse
from django.http import Http404
from django.http import HttpResponse
from django.http import HttpResponseBadRequest
from django.http import HttpResponseRedirect
from django.http.response import HttpResponseNotFound
from django.shortcuts import get_object_or_404
from django.shortcuts import render
from django.urls import reverse
Expand All @@ -38,12 +38,13 @@
from django.views.generic.detail import BaseDetailView
from django.views.generic.detail import SingleObjectMixin
from django.views.generic.detail import SingleObjectTemplateResponseMixin

import pdfrw
from reportlab.graphics.barcode import code128
from reportlab.lib.pagesizes import A4
from reportlab.lib.units import mm
from reportlab.pdfgen import canvas
from rest_framework.renderers import JSONRenderer

from reversion import revisions as reversion
from reversion.models import Version

Expand Down
4 changes: 3 additions & 1 deletion devices/views.test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from devices import views
import pytest

from devices import views


class Test_Search_Parse_boolean:

@pytest.fixture()
Expand Down
3 changes: 2 additions & 1 deletion locations/migrations/0004_building_room.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Generated by Django 3.2.3 on 2021-06-28 12:03

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations
from django.db import models


class Migration(migrations.Migration):
Expand Down
1 change: 1 addition & 0 deletions locations/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.db import models
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _

import reversion


Expand Down
2 changes: 1 addition & 1 deletion locations/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from devices.models import Device
from Lagerregal.utils import PaginationMixin
from locations.models import Building
from locations.models import Section
from locations.models import Room
from locations.models import Section
from users.mixins import PermissionRequiredMixin


Expand Down
2 changes: 1 addition & 1 deletion main/management/commands/populate.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from devicetypes.models import Type
from Lagerregal import utils
from locations.models import Building
from locations.models import Section
from locations.models import Room
from locations.models import Section
from users.models import Department
from users.models import DepartmentUser
from users.models import Lageruser
Expand Down
3 changes: 2 additions & 1 deletion users/migrations/0022_alter_lageruser_timezone.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by Django 3.2.3 on 2021-06-28 12:01

from django.db import migrations, models
from django.db import migrations
from django.db import models


class Migration(migrations.Migration):
Expand Down

0 comments on commit 3c950df

Please sign in to comment.