django-bom 1.252__tar.gz → 1.257__tar.gz

{django_bom-1.252/django_bom.egg-info → django_bom-1.257}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-bom
-Version: 1.252
+Version: 1.257
 Summary: A simple Django app to manage a bill of materials.
 Author-email: Mike Kasparian <mpkasp@gmail.com>
 License: GPL-3.0-only

{django_bom-1.252 → django_bom-1.257}/bom/admin.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
@@ -9,9 +10,13 @@ from .models import (
     Part,
     PartClass,
     PartRevision,
+    PartRevisionProperty,
+    PartRevisionPropertyDefinition,
     Seller,
     SellerPart,
     Subpart,
+    UnitDefinition,
+    QuantityOfMeasure,
     get_organization_model,
     get_user_meta_model
 )
@@ -86,7 +91,10 @@ class PartClassAdmin(admin.ModelAdmin):
 
 class PartRevisionAdminInline(admin.TabularInline):
     model = PartRevision
+    extra = 0
     raw_id_fields = ('assembly',)
+    readonly_fields = ('timestamp',)
+    show_change_link = True
 
 
 class PartAdmin(admin.ModelAdmin):
@@ -96,8 +104,10 @@ class PartAdmin(admin.ModelAdmin):
         'organization',
         'get_full_part_number',
     )
+    list_filter = ('organization', 'number_class',)
     raw_id_fields = ('number_class', 'primary_manufacturer_part',)
     inlines = [
+        PartRevisionAdminInline,
         ManufacturerPartAdminInline,
     ]
 
@@ -108,10 +118,22 @@ class PartAdmin(admin.ModelAdmin):
     get_full_part_number.admin_order_field = 'number_class__part_number'
 
 
+class QuantityOfMeasureAdmin(admin.ModelAdmin):
+    list_display = ('name', 'organization')
+    list_filter = ('organization',)
+
+
+class PartRevisionPropertyInline(admin.TabularInline):
+    model = PartRevisionProperty
+    extra = 1
+    raw_id_fields = ('property_definition', 'part_revision', 'unit_definition')
+
+
 class PartRevisionAdmin(admin.ModelAdmin):
     list_display = ('part', 'revision', 'description', 'get_assembly_size', 'timestamp',)
     raw_id_fields = ('assembly',)
     readonly_fields = ('timestamp',)
+    inlines = [PartRevisionPropertyInline]
 
     def get_assembly_size(self, obj):
         return None if obj.assembly is None else obj.assembly.subparts.count()
@@ -140,22 +162,37 @@ class AssemblyAdmin(admin.ModelAdmin):
     ]
 
 
-current_admin = admin.site._registry.get(User)
+class UnitDefinitionAdmin(admin.ModelAdmin):
+    list_display = ('name', 'symbol', 'quantity_of_measure', 'base_multiplier', 'organization')
+    list_filter = ('organization',)
+
+
+class PartRevisionPropertyDefinitionAdmin(admin.ModelAdmin):
+    list_display = ('code', 'name', 'type', 'organization', 'quantity_of_measure')
+    list_filter = ('organization',)
+
+
+if settings.BOM_USER_META_MODEL == 'bom.UserMeta':
+    current_user_admin = admin.site._registry.get(User)
+
+    if current_user_admin:
+        user_admin_class = current_user_admin.__class__
+        existing_inlines = list(user_admin_class.inlines or [])
+        if UserMetaInline not in existing_inlines:
+            existing_inlines.append(UserMetaInline)
+            user_admin_class.inlines = existing_inlines
+    else:
+        class BomUserAdmin(UserAdmin):
+            inlines = [UserMetaInline]
+
 
-if current_admin:
-    admin_class = current_admin.__class__
-    inlines = list(admin_class.inlines or [])
-    if UserMetaInline not in inlines:
-        inlines.append(UserMetaInline)
-        admin_class.inlines = inlines
-else:
-    class BomUserAdmin(UserAdmin):
-        inlines = [UserMetaInline]
+        admin.site.register(User, BomUserAdmin)
 
+if settings.BOM_ORGANIZATION_MODEL == 'bom.Organization':
+    from .models import Organization
 
-    admin.site.register(User, BomUserAdmin)
+    admin.site.register(Organization, OrganizationAdmin)
 
-admin.site.register(Organization, OrganizationAdmin)
 admin.site.register(Seller, SellerAdmin)
 admin.site.register(SellerPart, SellerPartAdmin)
 admin.site.register(ManufacturerPart, ManufacturerPartAdmin)
@@ -165,3 +202,6 @@ admin.site.register(PartRevision, PartRevisionAdmin)
 admin.site.register(Manufacturer, ManufacturerAdmin)
 admin.site.register(Assembly, AssemblyAdmin)
 admin.site.register(Subpart, SubpartAdmin)
+admin.site.register(UnitDefinition, UnitDefinitionAdmin)
+admin.site.register(PartRevisionPropertyDefinition, PartRevisionPropertyDefinitionAdmin)
+admin.site.register(QuantityOfMeasure, QuantityOfMeasureAdmin)

{django_bom-1.252 → django_bom-1.257}/bom/constants.py

@@ -34,6 +34,13 @@ DATA_SOURCES = (
     (DATA_SOURCE_MOUSER, 'mouser'),
 )
 
+PART_REVISION_PROPERTY_TYPE_STRING = 'S'
+PART_REVISION_PROPERTY_TYPE_DECIMAL = 'D'
+PART_REVISION_PROPERTY_TYPE_BOOLEAN = 'B'
+PART_REVISION_PROPERTY_TYPES = ((PART_REVISION_PROPERTY_TYPE_STRING, 'String'),
+                                (PART_REVISION_PROPERTY_TYPE_DECIMAL, 'Number'),
+                                (PART_REVISION_PROPERTY_TYPE_BOOLEAN, 'Boolean'),)
+
 VALUE_UNITS = (
     NO_CHOICE,
     ('Ohms', '\u03A9'),

{django_bom-1.252 → django_bom-1.257}/bom/csv_headers.py

@@ -35,8 +35,11 @@ class CSVHeader:
 class CSVHeaders(ABC):
     all_headers_defns = []
 
+    def __init__(self, *args, **kwargs):
+        self.headers_defns = list(self.all_headers_defns)
+
     def get_synoynms(self, hdr_name):
-        for defn in self.all_headers_defns:
+        for defn in self.headers_defns:
             if hdr_name in defn:
                 return defn.synonyms()
             else:
@@ -53,7 +56,7 @@ class CSVHeaders(ABC):
 
     # Preserves order of definitions as listed in all_header_defns:
     def get_default_all(self):
-        return [d.name for d in self.all_headers_defns]
+        return [d.name for d in self.headers_defns]
 
     # Given a list of header names returns the default name for each. The return list
     # matches the order of the input list. If a name is not recognized, then returns
@@ -151,6 +154,9 @@ class CSVHeaders(ABC):
                 return True
         raise CSVHeaderError(f'Missing column named {header}')
 
+    def add_header(self, header):
+        self.headers_defns.append(header)
+
 
 #
 # For each CSV header class, a static data member dictionary uses the key as the default name for the header while the
@@ -190,52 +196,25 @@ class PartClassesCSVHeaders(CSVHeaders):
     ]
 
 
-class PartsListCSVHeaders(CSVHeaders):
-    part_attributes = [
-        CSVHeader('value', name_options=['val', 'val.', ]),
-        CSVHeader('value_units', name_options=['value units', 'val. units', 'val units', ]),
-        CSVHeader('tolerance', name_options=[]),
-        CSVHeader('attribute', name_options=[]),
-        CSVHeader('package', name_options=[]),
-        CSVHeader('pin_count', name_options=[]),
-        CSVHeader('frequency', name_options=[]),
-        CSVHeader('frequency_units', name_options=[]),
-        CSVHeader('wavelength', name_options=[]),
-        CSVHeader('wavelength_units', name_options=[]),
-        CSVHeader('memory', name_options=[]),
-        CSVHeader('memory_units', name_options=[]),
-        CSVHeader('interface', name_options=[]),
-        CSVHeader('supply_voltage', name_options=[]),
-        CSVHeader('supply_voltage_units', name_options=[]),
-        CSVHeader('temperature_rating', name_options=[]),
-        CSVHeader('temperature_rating_units', name_options=[]),
-        CSVHeader('power_rating', name_options=[]),
-        CSVHeader('power_rating_units', name_options=[]),
-        CSVHeader('voltage_rating', name_options=[]),
-        CSVHeader('voltage_rating_units', name_options=[]),
-        CSVHeader('current_rating', name_options=[]),
-        CSVHeader('current_rating_units', name_options=[]),
-        CSVHeader('material', name_options=[]),
-        CSVHeader('color', name_options=[]),
-        CSVHeader('finish', name_options=[]),
-        CSVHeader('length', name_options=[]),
-        CSVHeader('length_units', name_options=[]),
-        CSVHeader('width', name_options=[]),
-        CSVHeader('width_units', name_options=[]),
-        CSVHeader('height', name_options=[]),
-        CSVHeader('height_units', name_options=[]),
-        CSVHeader('weight', name_options=[]),
-        CSVHeader('weight_units', name_options=[]),
-    ]
+class PartRevisionPropertyCSVHeaders(CSVHeaders):
+    def add_dynamic_headers(self, definitions):
+        for defn in definitions:
+            self.add_header(
+                CSVHeader(defn.form_field_name,
+                          name_options=[defn.name, f'property_{defn.code}', f'property_{defn.name}', 'p']))
+            if defn.quantity_of_measure:
+                self.add_header(
+                    CSVHeader(defn.form_unit_field_name, name_options=[f'{defn.name} Units', f'{defn.code}_units']))
+
 
+class PartsListCSVHeaders(PartRevisionPropertyCSVHeaders):
     all_headers_defns = [
         CSVHeader('description', name_options=['desc', 'desc.', ]),
         CSVHeader('manufacturer_name', name_options=['mfg_name', 'manufacturer_name', 'part_manufacturer', 'mfg', 'manufacturer', 'manufacturer name', ]),
         CSVHeader('manufacturer_part_number', name_options=['mpn', 'mfg_part_number', 'part_manufacturer_part_number', 'mfg part number', 'manufacturer part number']),
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('revision', name_options=['rev', 'part_revision', ]),
-    ] + part_attributes \
-      + SellerPartCSVHeaders.all_headers_defns
+                        ] + SellerPartCSVHeaders.all_headers_defns
 
 
 class PartsListCSVHeadersSemiIntelligent(PartsListCSVHeaders):
@@ -246,11 +225,10 @@ class PartsListCSVHeadersSemiIntelligent(PartsListCSVHeaders):
         CSVHeader('part_class', name_options=['class', 'part_category']),
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('revision', name_options=['rev', 'part_revision', ]),
-    ] + PartsListCSVHeaders.part_attributes \
-      + SellerPartCSVHeaders.all_headers_defns
+                        ] + SellerPartCSVHeaders.all_headers_defns
 
 
-class BOMFlatCSVHeaders(CSVHeaders):
+class BOMFlatCSVHeaders(PartRevisionPropertyCSVHeaders):
     all_headers_defns = [
         CSVHeader('part_number', name_options=['part number', 'part no', ]),
         CSVHeader('quantity', name_options=['count', 'qty', 'quantity', ]),