Format src

src/ralph/__init__.py

@@ -1,11 +1,12 @@
 from django.db.models.options import Options
 
-__version__ = '3.0.0'
+__version__ = "3.0.0"
 
 
 def monkey_options_init(self, meta, app_label):
     self._old__init__(meta, app_label)
-    self.default_permissions = ('add', 'change', 'delete', 'view')
+    self.default_permissions = ("add", "change", "delete", "view")
+
 
 # TODO: create PR to Django - default_permissions from settings
 Options._old__init__ = Options.__init__

src/ralph/__main__.py

@@ -3,30 +3,30 @@
 import sys
 
 
-def main(settings_module='ralph.settings', force=False):
+def main(settings_module="ralph.settings", force=False):
     if force:
-        os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
+        os.environ["DJANGO_SETTINGS_MODULE"] = settings_module
     else:
-        os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings_module)
+        os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 
     from django.core.management import execute_from_command_line
 
     execute_from_command_line(sys.argv)
 
 
 def dev():
-    main('ralph.settings.dev')
+    main("ralph.settings.dev")
 
 
 def test():
     # test only with test settings, not local (or any set by environment
     # variable DJANGO_SETTINGS_MODULE)
-    main('ralph.settings.test', force=True)
+    main("ralph.settings.test", force=True)
 
 
 def prod():
-    main('ralph.settings.prod')
+    main("ralph.settings.prod")
 
 
-if __name__ == '__main__':
-    main('ralph.settings.prod')
+if __name__ == "__main__":
+    main("ralph.settings.prod")

src/ralph/access_cards/admin.py

@@ -9,69 +9,81 @@
 @register(AccessCard)
 class AccessCardAdmin(TransitionAdminMixin, RalphAdmin):
     show_transition_history = True
-    list_display = ['status', 'visual_number', 'system_number', 'user',
-                    'owner', 'get_employee_id', 'get_employee_company']
-    list_select_related = ['user', 'owner']
-    raw_id_fields = ['user', 'owner', 'region']
-    list_filter = ['status', 'issue_date', 'visual_number',
-                   'system_number', 'user', 'owner', 'user__segment',
-                   'user__company', 'user__department', 'user__employee_id',
-                   'access_zones', 'notes']
-    search_fields = ['visual_number', 'system_number', 'user__first_name',
-                     'user__last_name', 'user__username']
-    readonly_fields = ['get_employee_id', 'get_employee_company']
+    list_display = [
+        "status",
+        "visual_number",
+        "system_number",
+        "user",
+        "owner",
+        "get_employee_id",
+        "get_employee_company",
+    ]
+    list_select_related = ["user", "owner"]
+    raw_id_fields = ["user", "owner", "region"]
+    list_filter = [
+        "status",
+        "issue_date",
+        "visual_number",
+        "system_number",
+        "user",
+        "owner",
+        "user__segment",
+        "user__company",
+        "user__department",
+        "user__employee_id",
+        "access_zones",
+        "notes",
+    ]
+    search_fields = [
+        "visual_number",
+        "system_number",
+        "user__first_name",
+        "user__last_name",
+        "user__username",
+    ]
+    readonly_fields = ["get_employee_id", "get_employee_company"]
 
     fieldsets = (
         (
-            _('Access Card Info'),
+            _("Access Card Info"),
             {
-                'fields': ('visual_number', 'system_number',
-                           'status', 'region', 'issue_date', 'notes')
-            }
+                "fields": (
+                    "visual_number",
+                    "system_number",
+                    "status",
+                    "region",
+                    "issue_date",
+                    "notes",
+                )
+            },
         ),
         (
-            _('User Info'),
-            {
-                'fields': ('user', 'owner', 'get_employee_id',
-                           'get_employee_company')
-            }
+            _("User Info"),
+            {"fields": ("user", "owner", "get_employee_id", "get_employee_company")},
         ),
-        (
-            _('Access Zones'),
-            {
-                'fields': ('access_zones',)
-            }
-        ),
-
+        (_("Access Zones"), {"fields": ("access_zones",)}),
     )
 
     def get_employee_id(self, obj):
         if obj.user is not None:
             return obj.user.employee_id
         else:
-            return '-'
+            return "-"
 
-    get_employee_id.short_description = _('Employee ID')
+    get_employee_id.short_description = _("Employee ID")
 
     def get_employee_company(self, obj):
         if obj.user is not None:
             return obj.user.company
         else:
-            return '-'
+            return "-"
 
-    get_employee_company.short_description = _('Employee Company')
+    get_employee_company.short_description = _("Employee Company")
 
 
 @register(AccessZone)
 class AccessZoneAdmin(RalphMPTTAdmin):
-    list_display = ['name', 'parent', 'description']
-    search_fields = ['name', 'description']
+    list_display = ["name", "parent", "description"]
+    search_fields = ["name", "description"]
 
-    fieldsets = (
-        (
-            _('Access Zone'),
-            {
-                'fields': ('parent', 'name', 'description')
-            }
-        ),
-    )
+    fieldsets = ((_("Access Zone"), {"fields": ("parent", "name", "description")}),)

src/ralph/access_cards/api.py

@@ -7,7 +7,7 @@ class AccessZoneSimpleSerializer(RalphAPISerializer):
     class Meta:
         model = AccessZone
         depth = 0
-        fields = ['id', 'name', 'parent', 'description']
+        fields = ["id", "name", "parent", "description"]
 
 
 class AccessZoneSerializer(RalphAPISerializer):
@@ -25,19 +25,30 @@ class AccessCardSerializer(RalphAPISerializer):
 
     class Meta:
         model = AccessCard
-        fields = ['id', 'status', 'user', 'owner', 'created', 'modified',
-                  'visual_number', 'system_number', 'issue_date', 'notes',
-                  'region', 'access_zones']
+        fields = [
+            "id",
+            "status",
+            "user",
+            "owner",
+            "created",
+            "modified",
+            "visual_number",
+            "system_number",
+            "issue_date",
+            "notes",
+            "region",
+            "access_zones",
+        ]
 
 
 class AccessCardViewSet(RalphAPIViewSet):
-    queryset = AccessCard.objects.order_by('id').all()
-    select_related = ['user', 'owner', 'region']
+    queryset = AccessCard.objects.order_by("id").all()
+    select_related = ["user", "owner", "region"]
     serializer_class = AccessCardSerializer
-    prefetch_related = ['access_zones']
+    prefetch_related = ["access_zones"]
     extended_filter_fields = {
-        'access_zones__name': ['access_zones__name__icontains'],
-        'access_zones__id': ['access_zones__id']
+        "access_zones__name": ["access_zones__name__icontains"],
+        "access_zones__id": ["access_zones__id"],
     }
 
 
@@ -46,6 +57,6 @@ class AccessZoneViewSet(RalphAPIViewSet):
     serializer_class = AccessZoneSerializer
 
 
-router.register(r'access-card', AccessCardViewSet)
-router.register(r'access-zone', AccessZoneViewSet)
+router.register(r"access-card", AccessCardViewSet)
+router.register(r"access-zone", AccessZoneViewSet)
 urlpatterns = []

src/ralph/access_cards/migrations/0001_initial.py

@@ -12,29 +12,100 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0006_remove_ralphuser_gender'),
+        ("accounts", "0006_remove_ralphuser_gender"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='AccessCard',
+            name="AccessCard",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
-                ('created', models.DateTimeField(verbose_name='date created', auto_now_add=True)),
-                ('modified', models.DateTimeField(verbose_name='last modified', auto_now=True)),
-                ('visual_number', models.CharField(max_length=255, unique=True, help_text='Number visible on the access card')),
-                ('system_number', models.CharField(max_length=255, unique=True, help_text='Internal number in the access system')),
-                ('issue_date', models.DateField(blank=True, null=True, help_text='Date of issue to the User')),
-                ('notes', models.TextField(blank=True, null=True, help_text='Optional notes')),
-                ('status', dj.choices.fields.ChoiceField(default=1, choices=ralph.access_cards.models.AccessCardStatus, help_text='Access card status')),
-                ('owner', models.ForeignKey(blank=True, null=True, help_text='Owner of the card', related_name='+', on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
-                ('region', models.ForeignKey(to='accounts.Region', on_delete=django.db.models.deletion.CASCADE)),
-                ('user', models.ForeignKey(blank=True, null=True, help_text='User of the card', related_name='+', on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        primary_key=True,
+                        serialize=False,
+                        auto_created=True,
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        verbose_name="date created", auto_now_add=True
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(verbose_name="last modified", auto_now=True),
+                ),
+                (
+                    "visual_number",
+                    models.CharField(
+                        max_length=255,
+                        unique=True,
+                        help_text="Number visible on the access card",
+                    ),
+                ),
+                (
+                    "system_number",
+                    models.CharField(
+                        max_length=255,
+                        unique=True,
+                        help_text="Internal number in the access system",
+                    ),
+                ),
+                (
+                    "issue_date",
+                    models.DateField(
+                        blank=True, null=True, help_text="Date of issue to the User"
+                    ),
+                ),
+                (
+                    "notes",
+                    models.TextField(blank=True, null=True, help_text="Optional notes"),
+                ),
+                (
+                    "status",
+                    dj.choices.fields.ChoiceField(
+                        default=1,
+                        choices=ralph.access_cards.models.AccessCardStatus,
+                        help_text="Access card status",
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        help_text="Owner of the card",
+                        related_name="+",
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "region",
+                    models.ForeignKey(
+                        to="accounts.Region",
+                        on_delete=django.db.models.deletion.CASCADE,
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        help_text="User of the card",
+                        related_name="+",
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'ordering': ('-modified', '-created'),
-                'abstract': False,
+                "ordering": ("-modified", "-created"),
+                "abstract": False,
             },
             bases=(ralph.lib.mixins.models.AdminAbsoluteUrlMixin, models.Model),
         ),