From d5befdd018dd600cdbedbc1b6a6cd5fbb4ce89f3 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Tue, 18 Nov 2025 23:34:17 +0100 Subject: [PATCH] Changed settings project name, removed tech db stuff --- .vscode/launch.json | 2 +- cntmanage/catops/admin.py | 21 ---- cntmanage/catops/apps.py | 6 -- cntmanage/catops/migrations/0001_initial.py | 20 ---- .../migrations/0002_rename_parts_part.py | 17 --- ...rt_expiry_time_part_last_stock_and_more.py | 101 ------------------ cntmanage/catops/migrations/0004_vendor.py | 22 ---- cntmanage/catops/migrations/0005_customer.py | 26 ----- cntmanage/catops/migrations/0006_plane.py | 30 ------ .../migrations/0007_operator_workorder.py | 41 ------- cntmanage/catops/migrations/0008_movimag.py | 26 ----- cntmanage/catops/migrations/__init__.py | 0 cntmanage/catops/misc/__init__.py | 0 cntmanage/catops/misc/units.py | 19 ---- cntmanage/catops/models/__init__.py | 0 cntmanage/catops/models/box.py | 69 ------------ cntmanage/catops/models/customer.py | 39 ------- cntmanage/catops/models/formone.py | 31 ------ cntmanage/catops/models/movimag.py | 43 -------- cntmanage/catops/models/operator.py | 39 ------- cntmanage/catops/models/part.py | 87 --------------- cntmanage/catops/models/plane.py | 59 ---------- cntmanage/catops/models/vendor.py | 23 ---- cntmanage/catops/models/workorder.py | 54 ---------- cntmanage/catops/tests.py | 3 - cntmanage/catops/views.py | 3 - cntmanage/{catops => cntmanage}/__init__.py | 0 cntmanage/{techdb => cntmanage}/asgi.py | 2 +- cntmanage/{techdb => cntmanage}/settings.py | 4 +- cntmanage/{techdb => cntmanage}/urls.py | 0 cntmanage/{techdb => cntmanage}/wsgi.py | 2 +- cntmanage/manage.py | 2 +- cntmanage/techdb/__init__.py | 0 33 files changed, 6 insertions(+), 785 deletions(-) delete mode 100644 cntmanage/catops/admin.py delete mode 100644 cntmanage/catops/apps.py delete mode 100644 cntmanage/catops/migrations/0001_initial.py delete mode 100644 cntmanage/catops/migrations/0002_rename_parts_part.py delete mode 100644 cntmanage/catops/migrations/0003_formone_part_active_part_expiry_time_part_last_stock_and_more.py delete mode 100644 cntmanage/catops/migrations/0004_vendor.py delete mode 100644 cntmanage/catops/migrations/0005_customer.py delete mode 100644 cntmanage/catops/migrations/0006_plane.py delete mode 100644 cntmanage/catops/migrations/0007_operator_workorder.py delete mode 100644 cntmanage/catops/migrations/0008_movimag.py delete mode 100644 cntmanage/catops/migrations/__init__.py delete mode 100644 cntmanage/catops/misc/__init__.py delete mode 100644 cntmanage/catops/misc/units.py delete mode 100644 cntmanage/catops/models/__init__.py delete mode 100644 cntmanage/catops/models/box.py delete mode 100644 cntmanage/catops/models/customer.py delete mode 100644 cntmanage/catops/models/formone.py delete mode 100644 cntmanage/catops/models/movimag.py delete mode 100644 cntmanage/catops/models/operator.py delete mode 100644 cntmanage/catops/models/part.py delete mode 100644 cntmanage/catops/models/plane.py delete mode 100644 cntmanage/catops/models/vendor.py delete mode 100644 cntmanage/catops/models/workorder.py delete mode 100644 cntmanage/catops/tests.py delete mode 100644 cntmanage/catops/views.py rename cntmanage/{catops => cntmanage}/__init__.py (100%) rename cntmanage/{techdb => cntmanage}/asgi.py (82%) rename cntmanage/{techdb => cntmanage}/settings.py (97%) rename cntmanage/{techdb => cntmanage}/urls.py (100%) rename cntmanage/{techdb => cntmanage}/wsgi.py (82%) delete mode 100644 cntmanage/techdb/__init__.py diff --git a/.vscode/launch.json b/.vscode/launch.json index ff19b07..7703375 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Python Debugger: Django", "type": "debugpy", "request": "launch", - "program": "${workspaceFolder}/techdb/manage.py", + "program": "${workspaceFolder}/cntmanage/manage.py", "args": ["runserver"], "console": "integratedTerminal", "django": true, diff --git a/cntmanage/catops/admin.py b/cntmanage/catops/admin.py deleted file mode 100644 index c039bae..0000000 --- a/cntmanage/catops/admin.py +++ /dev/null @@ -1,21 +0,0 @@ -from django.contrib import admin -from .models.box import Box, BoxAdmin -from .models.part import Part, PartAdmin -from .models.vendor import Vendor, VendorAdmin -from .models.formone import FormOne,FormOneAdmin -from .models.customer import Customer, CustomerAdmin -from .models.plane import Plane, PlaneAdmin -from .models.workorder import Workorder, WorkorderAdmin -from .models.operator import Operator, OperatorAdmin -from .models.movimag import Movimag, MovimagAdmin - -# Register your models here. -admin.site.register(Box, BoxAdmin) -admin.site.register(Part, PartAdmin) -admin.site.register(Vendor, VendorAdmin) -admin.site.register(FormOne,FormOneAdmin) -admin.site.register(Customer, CustomerAdmin) -admin.site.register(Plane, PlaneAdmin) -admin.site.register(Workorder, WorkorderAdmin) -admin.site.register(Operator, OperatorAdmin) -admin.site.register(Movimag, MovimagAdmin) diff --git a/cntmanage/catops/apps.py b/cntmanage/catops/apps.py deleted file mode 100644 index dc5e523..0000000 --- a/cntmanage/catops/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class CatopsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'catops' diff --git a/cntmanage/catops/migrations/0001_initial.py b/cntmanage/catops/migrations/0001_initial.py deleted file mode 100644 index db8d006..0000000 --- a/cntmanage/catops/migrations/0001_initial.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 09:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Parts', - fields=[ - ('id', models.UUIDField(primary_key=True, serialize=False)), - ], - ), - ] diff --git a/cntmanage/catops/migrations/0002_rename_parts_part.py b/cntmanage/catops/migrations/0002_rename_parts_part.py deleted file mode 100644 index 976ba8c..0000000 --- a/cntmanage/catops/migrations/0002_rename_parts_part.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 09:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0001_initial'), - ] - - operations = [ - migrations.RenameModel( - old_name='Parts', - new_name='Part', - ), - ] diff --git a/cntmanage/catops/migrations/0003_formone_part_active_part_expiry_time_part_last_stock_and_more.py b/cntmanage/catops/migrations/0003_formone_part_active_part_expiry_time_part_last_stock_and_more.py deleted file mode 100644 index adffc3a..0000000 --- a/cntmanage/catops/migrations/0003_formone_part_active_part_expiry_time_part_last_stock_and_more.py +++ /dev/null @@ -1,101 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:45 - -import django.db.models.deletion -import django.db.models.functions.datetime -import uuid -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0002_rename_parts_part'), - ] - - operations = [ - migrations.CreateModel( - name='FormOne', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('external_id', models.CharField(db_index=True, null=True)), - ('doc_path', models.FilePathField(null=True)), - ('active', models.BooleanField(db_default=True)), - ], - ), - migrations.AddField( - model_name='part', - name='active', - field=models.BooleanField(db_default=True), - ), - migrations.AddField( - model_name='part', - name='expiry_time', - field=models.DurationField(null=True), - ), - migrations.AddField( - model_name='part', - name='last_stock', - field=models.DateField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False), - ), - migrations.AddField( - model_name='part', - name='min_reorder', - field=models.PositiveIntegerField(null=True), - ), - migrations.AddField( - model_name='part', - name='part_number', - field=models.CharField(db_index=True, default='aaa', max_length=64, unique=True), - preserve_default=False, - ), - migrations.AddField( - model_name='part', - name='properties', - field=models.JSONField(null=True), - ), - migrations.AddField( - model_name='part', - name='quantity', - field=models.PositiveIntegerField(default=0), - ), - migrations.AddField( - model_name='part', - name='reg_date', - field=models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False), - ), - migrations.AddField( - model_name='part', - name='serial_number', - field=models.CharField(db_index=True, max_length=64, null=True, unique=True), - ), - migrations.AddField( - model_name='part', - name='unit', - field=models.CharField(choices=[('QTY', 'Quantity'), ('LT', 'Liters'), ('USG', 'US Gallons'), ('QTS', 'US Quarters'), ('KG', 'Kilograms'), ('LBS', 'Pounds')], default='QTY'), - ), - migrations.AlterField( - model_name='part', - name='id', - field=models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False), - ), - migrations.CreateModel( - name='Box', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.UUIDField(db_index=True, default=uuid.uuid1, editable=False, primary_key=True, serialize=False)), - ('loc_room', models.CharField(choices=[('ST1', 'Magazzino'), ('ST2', 'Deposito Esterno')], default='ST1', max_length=3)), - ('loc_x', models.CharField(max_length=4)), - ('loc_y', models.CharField(max_length=4)), - ('loc_z', models.CharField(max_length=4)), - ('active', models.BooleanField(db_default=True)), - ('label_printed', models.BooleanField(db_default=False)), - ('part', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='catops.part')), - ], - ), - migrations.AddField( - model_name='part', - name='form_one', - field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='catops.formone'), - ), - ] diff --git a/cntmanage/catops/migrations/0004_vendor.py b/cntmanage/catops/migrations/0004_vendor.py deleted file mode 100644 index 96d7160..0000000 --- a/cntmanage/catops/migrations/0004_vendor.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:45 - -import django.db.models.functions.datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0003_formone_part_active_part_expiry_time_part_last_stock_and_more'), - ] - - operations = [ - migrations.CreateModel( - name='Vendor', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.UUIDField(primary_key=True, serialize=False)), - ('active', models.BooleanField(db_default=True)), - ], - ), - ] diff --git a/cntmanage/catops/migrations/0005_customer.py b/cntmanage/catops/migrations/0005_customer.py deleted file mode 100644 index ff3dde7..0000000 --- a/cntmanage/catops/migrations/0005_customer.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:45 - -import django.db.models.functions.datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0004_vendor'), - ] - - operations = [ - migrations.CreateModel( - name='Customer', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=32)), - ('surname', models.CharField(max_length=32)), - ('external_id', models.CharField(db_index=True, null=True)), - ('properties', models.JSONField(null=True)), - ('active', models.BooleanField(db_default=True)), - ], - ), - ] diff --git a/cntmanage/catops/migrations/0006_plane.py b/cntmanage/catops/migrations/0006_plane.py deleted file mode 100644 index 4c01540..0000000 --- a/cntmanage/catops/migrations/0006_plane.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:46 - -import django.db.models.deletion -import django.db.models.functions.datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0005_customer'), - ] - - operations = [ - migrations.CreateModel( - name='Plane', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('tail', models.CharField(max_length=6)), - ('manufacturer', models.CharField(max_length=32)), - ('model', models.CharField(max_length=32)), - ('chassis_num', models.CharField(max_length=32)), - ('external_id', models.CharField(db_index=True, null=True)), - ('properties', models.JSONField(null=True)), - ('active', models.BooleanField(db_default=True)), - ('customer', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.customer')), - ], - ), - ] diff --git a/cntmanage/catops/migrations/0007_operator_workorder.py b/cntmanage/catops/migrations/0007_operator_workorder.py deleted file mode 100644 index 4c9ae6a..0000000 --- a/cntmanage/catops/migrations/0007_operator_workorder.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:47 - -import django.db.models.deletion -import django.db.models.functions.datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0006_plane'), - ] - - operations = [ - migrations.CreateModel( - name='Operator', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=32)), - ('surname', models.CharField(max_length=32)), - ('external_id', models.CharField(db_index=True, null=True)), - ('properties', models.JSONField(null=True)), - ('active', models.BooleanField(db_default=True)), - ], - ), - migrations.CreateModel( - name='Workorder', - fields=[ - ('reg_date', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('date_begin', models.DateTimeField(db_default=django.db.models.functions.datetime.Now())), - ('date_end', models.DateTimeField()), - ('external_id', models.CharField(db_index=True, max_length=32, null=True)), - ('properties', models.JSONField(null=True)), - ('active', models.BooleanField(db_default=True)), - ('operator', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.operator')), - ('plane', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.plane')), - ], - ), - ] diff --git a/cntmanage/catops/migrations/0008_movimag.py b/cntmanage/catops/migrations/0008_movimag.py deleted file mode 100644 index 14c5b68..0000000 --- a/cntmanage/catops/migrations/0008_movimag.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 5.1.2 on 2024-10-18 15:47 - -import django.db.models.deletion -import django.db.models.functions.datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('catops', '0007_operator_workorder'), - ] - - operations = [ - migrations.CreateModel( - name='Movimag', - fields=[ - ('mov_datetime', models.DateTimeField(auto_created=True, db_default=django.db.models.functions.datetime.Now(), editable=False)), - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('direction', models.CharField(choices=[('LOAD', 'Load'), ('UNLOAD', 'UnLoad')])), - ('operator', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.operator')), - ('part', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.part')), - ('workorder', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='catops.workorder')), - ], - ), - ] diff --git a/cntmanage/catops/migrations/__init__.py b/cntmanage/catops/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cntmanage/catops/misc/__init__.py b/cntmanage/catops/misc/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cntmanage/catops/misc/units.py b/cntmanage/catops/misc/units.py deleted file mode 100644 index 7b2ce56..0000000 --- a/cntmanage/catops/misc/units.py +++ /dev/null @@ -1,19 +0,0 @@ -from django.db import models -from django.utils.translation import gettext_lazy as _ - -class RoomLocation(models.TextChoices): - STORAGE_1 = "ST1", _("Magazzino") - STORAGE_2 = "ST2", _("Deposito Esterno") - -class Units(models.TextChoices): - NUM = "QTY", _("Quantity") - LT = "LT", _("Liters") - USG = "USG", _("US Gallons") - QTS = "QTS", _("US Quarters") - KG = "KG", _("Kilograms") - LBS = "LBS", _("Pounds") - -class MoviDirection(models.TextChoices): - LOAD = "LOAD", _("Load") - UNLOAD = "UNLOAD", _("UnLoad") - \ No newline at end of file diff --git a/cntmanage/catops/models/__init__.py b/cntmanage/catops/models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cntmanage/catops/models/box.py b/cntmanage/catops/models/box.py deleted file mode 100644 index 110b066..0000000 --- a/cntmanage/catops/models/box.py +++ /dev/null @@ -1,69 +0,0 @@ -import uuid - -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now -from .part import Part -from ..misc.units import RoomLocation - -# Box identifies a part storage location, it can be a drawer or a bag or a carbord box. -# It has a location and one or multiple parts inside it. - -# Properties to visualize the Box model in the Django admin view -class BoxAdmin(admin.ModelAdmin): - list_display = ("id", "loc_room", "loc_x", "loc_y", "loc_z", "reg_date", "active") - list_filter = ["loc_room"] - -class Box(models.Model): - id = models.UUIDField( - primary_key=True, - default=uuid.uuid1, - db_index=True, - editable=False, - serialize=str, - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now(), - ) - - loc_room = models.CharField( - max_length=3, - choices=RoomLocation, - default=RoomLocation.STORAGE_1, - null=False, - ) - - loc_x = models.CharField( - max_length=4, - ) - - loc_y = models.CharField( - max_length=4, - ) - - loc_z = models.CharField( - max_length=4, - ) - - active = models.BooleanField( - db_default=True - ) - - label_printed = models.BooleanField( - db_default=False, - ) - - part = models.OneToOneField( - Part, - unique=True, - db_index=True, - swappable=True, - null=True, - on_delete=models.CASCADE, - ) - - def __str__(self): - return f"{str(self.id)}" diff --git a/cntmanage/catops/models/customer.py b/cntmanage/catops/models/customer.py deleted file mode 100644 index 544f379..0000000 --- a/cntmanage/catops/models/customer.py +++ /dev/null @@ -1,39 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -class CustomerAdmin(admin.ModelAdmin): - list_display = () - list_filter = [] - -class Customer(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - name = models.CharField( - max_length=32 - ) - - surname = models.CharField( - max_length=32 - ) - - external_id = models.CharField( - db_index=True, - null=True, - ) - - properties = models.JSONField( - null=True - ) - - active = models.BooleanField( - db_default=True - ) \ No newline at end of file diff --git a/cntmanage/catops/models/formone.py b/cntmanage/catops/models/formone.py deleted file mode 100644 index 1632079..0000000 --- a/cntmanage/catops/models/formone.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -class FormOneAdmin(admin.ModelAdmin): - list_display = () - list_filter = [] - -class FormOne(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - external_id = models.CharField( - db_index=True, - null=True, - ) - - doc_path = models.FilePathField( - null=True - ) - - active = models.BooleanField( - db_default=True - ) diff --git a/cntmanage/catops/models/movimag.py b/cntmanage/catops/models/movimag.py deleted file mode 100644 index f939b0f..0000000 --- a/cntmanage/catops/models/movimag.py +++ /dev/null @@ -1,43 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -from .part import Part -from .operator import Operator -from .workorder import Workorder -from ..misc import units - -class MovimagAdmin(admin.ModelAdmin): - list_display = () - list_filter = [] - -class Movimag(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - mov_datetime = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - part = models.ForeignKey( - Part, - on_delete=models.DO_NOTHING - ) - - workorder = models.ForeignKey( - Workorder, - on_delete=models.DO_NOTHING - ) - - operator = models.ForeignKey( - Operator, - on_delete=models.DO_NOTHING - ) - - direction = models.CharField( - null=False, - choices=units.MoviDirection - ) diff --git a/cntmanage/catops/models/operator.py b/cntmanage/catops/models/operator.py deleted file mode 100644 index 4ec2618..0000000 --- a/cntmanage/catops/models/operator.py +++ /dev/null @@ -1,39 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -class OperatorAdmin(admin.ModelAdmin): - list_display = () - list_filter = () - -class Operator(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - name = models.CharField( - max_length=32 - ) - - surname = models.CharField( - max_length=32 - ) - - external_id = models.CharField( - db_index=True, - null=True, - ) - - properties = models.JSONField( - null=True - ) - - active = models.BooleanField( - db_default=True - ) diff --git a/cntmanage/catops/models/part.py b/cntmanage/catops/models/part.py deleted file mode 100644 index bea6f28..0000000 --- a/cntmanage/catops/models/part.py +++ /dev/null @@ -1,87 +0,0 @@ -import uuid - -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now -from django.utils.translation import gettext_lazy as _ - -from ..misc.units import Units -from .formone import FormOne - -# Part identifies a part with its part number and associated properties: -# such as torage quantity, min reorder quantities and expiry date. - -class PartAdmin(admin.ModelAdmin): - list_display = () - list_filter = () - -class Part(models.Model): - id = models.UUIDField( - primary_key=True, - default=uuid.uuid4, - db_index=True, - editable=False, - serialize=str - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - part_number = models.CharField( - db_index=True, - max_length=64, - null=False, - unique=True - ) - - serial_number = models.CharField( - db_index=True, - max_length=64, - null=True, - unique=True - ) - - quantity = models.PositiveIntegerField( - null=False, - default=0 - ) - - unit = models.CharField( - choices=Units, - default=Units.NUM, - null=False - ) - - last_stock = models.DateField( - null=False, - auto_created=True, - editable=False, - db_default=Now() - ) - - expiry_time = models.DurationField( - null=True, - ) - - min_reorder = models.PositiveIntegerField( - null=True - ) - - properties = models.JSONField( - null=True - ) - - form_one = models.OneToOneField( - FormOne, - on_delete=models.DO_NOTHING, - db_index=True, - unique=True, - null=True - ) - - active = models.BooleanField( - db_default=True - ) diff --git a/cntmanage/catops/models/plane.py b/cntmanage/catops/models/plane.py deleted file mode 100644 index 96fe8a4..0000000 --- a/cntmanage/catops/models/plane.py +++ /dev/null @@ -1,59 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -from .customer import Customer - -class PlaneAdmin(admin.ModelAdmin): - list_display = () - list_filter = [] - -class Plane(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - tail = models.CharField( - max_length=6, - null=False - ) - - manufacturer = models.CharField( - max_length=32, - null=False - ) - - model = models.CharField( - max_length=32, - null=False - ) - - chassis_num = models.CharField( - max_length=32, - null=False - ) - - external_id = models.CharField( - db_index=True, - null=True, - ) - - customer = models.ForeignKey( - Customer, - on_delete=models.DO_NOTHING - ) - - properties = models.JSONField( - null=True - ) - - active = models.BooleanField( - db_default=True - ) - \ No newline at end of file diff --git a/cntmanage/catops/models/vendor.py b/cntmanage/catops/models/vendor.py deleted file mode 100644 index d81ab71..0000000 --- a/cntmanage/catops/models/vendor.py +++ /dev/null @@ -1,23 +0,0 @@ -import uuid - -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -class VendorAdmin(admin.ModelAdmin): - list_display = () - list_filter = () - -class Vendor(models.Model): - id = models.UUIDField(primary_key=True) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - active = models.BooleanField( - db_default=True - ) - diff --git a/cntmanage/catops/models/workorder.py b/cntmanage/catops/models/workorder.py deleted file mode 100644 index f8ab1e6..0000000 --- a/cntmanage/catops/models/workorder.py +++ /dev/null @@ -1,54 +0,0 @@ -from django.db import models -from django.contrib import admin -from django.db.models.functions import Now - -from .plane import Plane -from .operator import Operator - -class WorkorderAdmin(admin.ModelAdmin): - list_display = () - list_filter = [] - -class Workorder(models.Model): - id = models.BigAutoField( - primary_key=True - ) - - reg_date = models.DateTimeField( - auto_created=True, - editable=False, - db_default=Now() - ) - - date_begin = models.DateTimeField( - null=False, - db_default=Now() - ) - - date_end = models.DateTimeField( - null=False - ) - - external_id = models.CharField( - max_length=32, - db_index=True, - null=True, - ) - - plane = models.ForeignKey( - Plane, - on_delete=models.DO_NOTHING - ) - - operator = models.ForeignKey( - Operator, - on_delete=models.DO_NOTHING - ) - - properties = models.JSONField( - null=True - ) - - active = models.BooleanField( - db_default=True - ) diff --git a/cntmanage/catops/tests.py b/cntmanage/catops/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/cntmanage/catops/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/cntmanage/catops/views.py b/cntmanage/catops/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/cntmanage/catops/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/cntmanage/catops/__init__.py b/cntmanage/cntmanage/__init__.py similarity index 100% rename from cntmanage/catops/__init__.py rename to cntmanage/cntmanage/__init__.py diff --git a/cntmanage/techdb/asgi.py b/cntmanage/cntmanage/asgi.py similarity index 82% rename from cntmanage/techdb/asgi.py rename to cntmanage/cntmanage/asgi.py index b953def..fba326b 100644 --- a/cntmanage/techdb/asgi.py +++ b/cntmanage/cntmanage/asgi.py @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'techdb.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cntmanage.settings') application = get_asgi_application() diff --git a/cntmanage/techdb/settings.py b/cntmanage/cntmanage/settings.py similarity index 97% rename from cntmanage/techdb/settings.py rename to cntmanage/cntmanage/settings.py index caeb22d..f3ad71c 100644 --- a/cntmanage/techdb/settings.py +++ b/cntmanage/cntmanage/settings.py @@ -62,7 +62,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'techdb.urls' +ROOT_URLCONF = 'cntmanage.urls' TEMPLATES = [ { @@ -80,7 +80,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'techdb.wsgi.application' +WSGI_APPLICATION = 'cntmanage.wsgi.application' STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), diff --git a/cntmanage/techdb/urls.py b/cntmanage/cntmanage/urls.py similarity index 100% rename from cntmanage/techdb/urls.py rename to cntmanage/cntmanage/urls.py diff --git a/cntmanage/techdb/wsgi.py b/cntmanage/cntmanage/wsgi.py similarity index 82% rename from cntmanage/techdb/wsgi.py rename to cntmanage/cntmanage/wsgi.py index 6f84dff..76fabc7 100644 --- a/cntmanage/techdb/wsgi.py +++ b/cntmanage/cntmanage/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'techdb.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cntmanage.settings') application = get_wsgi_application() diff --git a/cntmanage/manage.py b/cntmanage/manage.py index c24379c..9cfb47c 100755 --- a/cntmanage/manage.py +++ b/cntmanage/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'techdb.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cntmanage.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/cntmanage/techdb/__init__.py b/cntmanage/techdb/__init__.py deleted file mode 100644 index e69de29..0000000