Create new component table

specifyweb/businessrules/rules/__init__.py

@@ -25,4 +25,5 @@
     workbench_rules,
     cojo_rules,
     cogtype_rules,
+    component_rules
 )

specifyweb/businessrules/rules/component_rules.py

@@ -0,0 +1,16 @@
+
+from specifyweb.businessrules.exceptions import BusinessRuleException
+from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
+from specifyweb.specify.models import Component
+
+@orm_signal_handler('pre_save', 'Component')
+def component_pre_save(component):
+     if component.parentcomponent is not None and not hasattr(component, "collectionobject"):
+         component.collectionobject =  component.parentcomponent.collectionobject
+         component.save()
+         component.parentcomponent.children.add(component)
+         component.parentcomponent.save()
+         component.parentcomponent.collectionobject.components.add(component)
+         component.parentcomponent.collectionobject.save()
+
+

specifyweb/frontend/js_src/lib/components/DataModel/types.ts

@@ -69,6 +69,7 @@ export type Tables = {
   readonly Collector: Collector;
   readonly CommonNameTx: CommonNameTx;
   readonly CommonNameTxCitation: CommonNameTxCitation;
+  readonly Component: Component;
   readonly ConservDescription: ConservDescription;
   readonly ConservDescriptionAttachment: ConservDescriptionAttachment;
   readonly ConservEvent: ConservEvent;
@@ -1470,6 +1471,7 @@ export type CollectionObject = {
     readonly rightSideRels: RA<CollectionRelationship>;
     readonly treatmentEvents: RA<TreatmentEvent>;
     readonly voucherRelationships: RA<VoucherRelationship>;
+    readonly components: RA<Component>;
   };
   readonly toManyIndependent: { readonly projects: RA<Project> };
 };
@@ -1966,6 +1968,58 @@ export type CommonNameTxCitation = {
   readonly toManyDependent: RR<never, never>;
   readonly toManyIndependent: RR<never, never>;
 };
+export type Component = {
+  readonly tableName: 'Component';
+  readonly fields: {
+    readonly verbatimName: string | null;
+    readonly role: string | null;
+    readonly proportion: number | null;
+    readonly uniqueIdentifier: string | null;
+    readonly text1: string | null;
+    readonly text2: string | null;
+    readonly text3: string | null;
+    readonly text4: string | null;
+    readonly text5: string | null;
+    readonly text6: string | null;
+    readonly yesNo1: boolean | null;
+    readonly yesNo2: boolean | null;
+    readonly yesNo3: boolean | null;
+    readonly yesNo4: boolean | null;
+    readonly yesNo5: boolean | null;
+    readonly yesNo6: boolean | null;
+    readonly integer1: number | null;
+    readonly integer2: number | null;
+    readonly integer3: number | null;
+    readonly integer4: number | null;
+    readonly integer5: number | null;
+    readonly integer6: number | null;
+    readonly number1: number | null;
+    readonly number2: number | null;
+    readonly number3: number | null;
+    readonly number4: number | null;
+    readonly number5: number | null;
+    readonly number6: number | null;
+    readonly version: number | null;
+    readonly timestampCreated: string;
+    readonly timestampModified: string | null;
+  };
+  readonly toOneDependent: {
+    readonly collectionObject: CollectionObject | null;
+  };
+  readonly toOneIndependent: {
+    readonly type: CollectionObjectType;
+    readonly name: Taxon | null;
+    readonly createdByAgent: Agent | null;
+    readonly modifiedByAgent: Agent | null;
+    readonly parentComponent: Component | null;
+  };
+  readonly toManyDependent: {
+    readonly absoluteAges: RA<AbsoluteAge>;
+    readonly relativeAges: RA<RelativeAge>;
+    readonly children: RA<Component>;
+  };
+  readonly toManyIndependent: RR<never, never>;
+};
 export type ConservDescription = {
   readonly tableName: 'ConservDescription';
   readonly fields: {
@@ -5736,6 +5790,7 @@ export type Taxon = {
     readonly hybridChildren2: RA<Taxon>;
     readonly preferredTaxonOf: RA<Determination>;
     readonly acceptedChildren: RA<Taxon>;
+    readonly components: RA<Component>;
   };
 };
 export type TaxonAttachment = {
@@ -6602,6 +6657,7 @@ export type AbsoluteAge = {
     readonly collectionObject: CollectionObject;
     readonly createdByAgent: Agent | null;
     readonly modifiedByAgent: Agent | null;
+    readonly component: Component;
   };
   readonly toManyDependent: {
     readonly absoluteAgeAttachments: RA<AbsoluteAgeAttachment>;
@@ -6642,6 +6698,7 @@ export type RelativeAge = {
     readonly collectionObject: CollectionObject;
     readonly createdByAgent: Agent | null;
     readonly modifiedByAgent: Agent | null;
+    readonly component: Component;
   };
   readonly toManyDependent: {
     readonly relativeAgeAttachments: RA<RelativeAgeAttachment>;

specifyweb/specify/datamodel.py

@@ -1601,6 +1601,7 @@ def is_tree_table(table: Table):
             Relationship(name='cojo', type='one-to-one', required=False, relatedModelName='CollectionObjectGroupJoin', otherSideName='childco', dependent=True),
             Relationship(name='absoluteAges', type='one-to-many', required=False, relatedModelName='AbsoluteAge', otherSideName='collectionObject', dependent=True),
             Relationship(name='relativeAges', type='one-to-many', required=False, relatedModelName='RelativeAge', otherSideName='collectionObject', dependent=True),
+            Relationship(name='components', type='one-to-many',required=False, relatedModelName='Component', otherSideName='collectionObject', dependent=True)
         ],
         fieldAliases=[
 
@@ -2197,6 +2198,60 @@ def is_tree_table(table: Table):
 
         ]
     ),
+    Table(
+        classname='edu.ku.brc.specify.datamodel.Component',
+        table='component',
+        tableId=1028,
+        idColumn='ComponentID',
+        idFieldName='componentId',
+        idField=IdField(name='componentId', column='ComponentID', type='java.lang.Integer'),
+        fields=[
+            Field(name='verbatimName', column='VerbatimName', indexed=False, unique=False, required=False, type='text'),
+            Field(name='role', column='Role', indexed=False, unique=False, required=False, type='java.lang.String', length=64),
+            Field(name='proportion', column='Proportion', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='uniqueIdentifier', column='UniqueIdentifier', indexed=True, unique=False, required=False, type='java.lang.String', length=128),
+            Field(name='text1', column='Text1', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='text2', column='Text2', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='text3', column='Text3', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='text4', column='Text4', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='text5', column='Text5', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='text6', column='Text6', indexed=False, unique=False, required=False, type='text', length=65535),
+            Field(name='yesNo1', column='YesNo1', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='yesNo2', column='YesNo2', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='yesNo3', column='YesNo3', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='yesNo4', column='YesNo4', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='yesNo5', column='YesNo5', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='yesNo6', column='YesNo6', indexed=False, unique=False, required=False, type='java.lang.Boolean'),
+            Field(name='integer1', column='Integer1', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='integer2', column='Integer2', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='integer3', column='Integer3', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='integer4', column='Integer4', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='integer5', column='Integer5', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='integer6', column='Integer6', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='number1', column='Number1', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='number2', column='Number2', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='number3', column='Number3', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='number4', column='Number4', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='number5', column='Number5', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='number6', column='Number6', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
+            Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
+            Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
+            Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
+        ],
+        indexes=[],
+        relationships=[
+            Relationship(name='collectionObject', type='many-to-one',required=True, relatedModelName='CollectionObject', column='CollectionObjectID', otherSideName='components'),
+            Relationship(name='name', type='many-to-one',required=False, relatedModelName='Taxon', column='TaxonID', otherSideName='components'),
+            Relationship(name='type', type='many-to-one', required=True, relatedModelName='CollectionObjectType', column='CollectionObjectTypeID'),
+            Relationship(name='parentComponent', type='many-to-one', required=False, relatedModelName='Component', column='ParentComponentID', otherSideName='children'),
+            Relationship(name='children', type='one-to-many', required=False, relatedModelName='Component', otherSideName='parentComponent', dependent=True),
+            Relationship(name='absoluteAges', type='one-to-many', required=False, relatedModelName='AbsoluteAge', otherSideName='component', dependent=True),
+            Relationship(name='relativeAges', type='one-to-many', required=False, relatedModelName='RelativeAge', otherSideName='component', dependent=True),
+            Relationship(name='createdByAgent', type='many-to-one',required=False, relatedModelName='Agent', column='CreatedByAgentID'),
+            Relationship(name='modifiedByAgent', type='many-to-one',required=False, relatedModelName='Agent', column='ModifiedByAgentID'),
+        ],
+        fieldAliases=[]
+    ),
     Table(
         classname='edu.ku.brc.specify.datamodel.ConservDescription',
         table='conservdescription',
@@ -7151,7 +7206,8 @@ def is_tree_table(table: Table):
             Relationship(name='taxonAttachments', type='one-to-many',required=False, relatedModelName='TaxonAttachment', otherSideName='taxon', dependent=True),
             Relationship(name='taxonAttribute', type='many-to-one',required=False, relatedModelName='TaxonAttribute', column='TaxonAttributeID', otherSideName='taxons', dependent=True),
             Relationship(name='taxonCitations', type='one-to-many',required=False, relatedModelName='TaxonCitation', otherSideName='taxon', dependent=True),
-            Relationship(name='visibilitySetBy', type='many-to-one',required=False, relatedModelName='SpecifyUser', column='VisibilitySetByID')
+            Relationship(name='visibilitySetBy', type='many-to-one',required=False, relatedModelName='SpecifyUser', column='VisibilitySetByID'),
+            Relationship(name='components', type='one-to-many',required=False, relatedModelName='Component', otherSideName='taxon'),
         ],
         fieldAliases=[
             {'vname':'acceptedParent', 'aname':'acceptedTaxon'}
@@ -8416,7 +8472,8 @@ def is_tree_table(table: Table):
             Relationship(name='collectionObject', type='many-to-one', required=True, relatedModelName='CollectionObject', column='CollectionObjectID', otherSideName='absoluteAges'),
             Relationship(name='absoluteAgeCitations', type='one-to-many',required=False, relatedModelName='AbsoluteAgeCitation', otherSideName='absoluteAge', dependent=True),
             Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
-            Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID')
+            Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID'),
+            Relationship(name='component', type='many-to-one', required=False, relatedModelName='Component', column='ComponentID', otherSideName='absoluteAges'),
         ],
         fieldAliases=[
 
@@ -8465,7 +8522,8 @@ def is_tree_table(table: Table):
             Relationship(name='collectionObject', type='many-to-one', required=True, relatedModelName='CollectionObject', column='CollectionObjectID', otherSideName='relativeAges'),
             Relationship(name='relativeAgeCitations', type='one-to-many',required=False, relatedModelName='RelativeAgeCitation', otherSideName='relativeAge', dependent=True),
             Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
-            Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID')
+            Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID'),
+            Relationship(name='component', type='many-to-one', required=False, relatedModelName='Component', column='ComponentID', otherSideName='relativeAges'),
         ],
         fieldAliases=[
 

specifyweb/specify/migration_utils/sp7_schemaconfig.py

@@ -167,4 +167,27 @@
 
 MIGRATION_0024_FIELDS = {
     'Storage': ['uniqueIdentifier'],
+}
+
+MIGRATION_0027_TABLES = [
+    ('Component', None),
+]
+
+MIGRATION_0027_FIELDS = {
+    'CollectionObject': ['components'],
+    'Taxon': ['components'],
+    'RelativeAge': ['component'],
+    'AbsoluteAge': ['component'],
+}
+
+
+MIGRATION_0027_UPDATE_FIELDS = {
+    'Component': [
+        ('type', 'Component Type', 'This type determines the valid options for component names.'), 
+        ('name', 'Component Name', 'The name from a taxon tree corresponding to the chosen type.'),
+        ('verbatimName', 'Verbatim Name', 'The original name printed or associated with the component.'),
+        ('role', 'Component Role', 'Define the role or purpose of the component in the overall collection.'), 
+        ('proportion', 'Component Proportion', 'Specify the proportion of the component relative to the whole.'),
+        ('uniqueIdentifier', 'Unique Identifier', 'Unique Identifier [/+][-]Unique Identifier'),
+        ],
 }