Issue 8124 8126 fix 7660 7682 2 6266 after review

config/common/global_picklists.json

@@ -448,6 +448,85 @@
         { "title": "Fossil record", "value": "Fossil record" },
         { "title": "Radiometric (adjacent)", "value": "Radiometric (adjacent)" }
       ]
+    },
+    {
+      "name": "DisciplineType",
+      "formatter": null,
+      "issystem": true,
+      "readonly": true,
+      "sizelimit": -1,
+      "sorttype": 1,
+      "tablename": null,
+      "type": 0,
+      "version": 0,
+      "items": [
+        {
+          "ordinal": 1,
+          "title": "Ichthyology",
+          "value": "fish",
+          "version": 0
+        },
+        {
+          "ordinal": 2,
+          "title": "Herpetology",
+          "value": "herpetology",
+          "version": 0
+        },
+        {
+          "ordinal": 3,
+          "title": "Paleobotany",
+          "value": "paleobotany",
+          "version": 0
+        },
+        {
+          "ordinal": 4,
+          "title": "Invertebrate Paleontology",
+          "value": "invertpaleo",
+          "version": 0
+        },
+        {
+          "ordinal": 5,
+          "title": "Vertebrate Paleontology",
+          "value": "vertpaleo",
+          "version": 0
+        },
+        {
+          "ordinal": 6,
+          "title": "Ornithology",
+          "value": "bird",
+          "version": 0
+        },
+        {
+          "ordinal": 7,
+          "title": "Mammalogy",
+          "value": "mammal",
+          "version": 0
+        },
+        {
+          "ordinal": 8,
+          "title": "Entomology",
+          "value": "insect",
+          "version": 0
+        },
+        {
+          "ordinal": 9,
+          "title": "Botany",
+          "value": "botany",
+          "version": 0
+        },
+        {
+          "ordinal": 10,
+          "title": "Invertebrate Zoology",
+          "value": "invertebrate",
+          "version": 0
+        },
+        {
+          "ordinal": 11,
+          "title": "Geology",
+          "value": "geology",
+          "version": 0
+        }
+      ]
     }
   ]
 }

config/common/schema_localization_en.json

@@ -10,6 +10,7 @@
       "ageuncertainty": {"name": "Age Uncertainty", "desc": "Age Uncertainty", "format": null, "ishidden": false, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null},
       "collectiondate": {"name": "Collection Date", "desc": "Collection Date", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},
       "collectionobject": {"name": "Collection Object", "desc": "Collection Object", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": true, "weblinkname": null},
+      "component": {"name": "Component", "desc": "Component", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null},
       "createdbyagent": {"name": "Created By Agent", "desc": "Created By Agent", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null},
       "date1": {"name": "Date1", "desc": "Date1", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},
       "date2": {"name": "Date2", "desc": "Date2", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},
@@ -2062,6 +2063,60 @@
     "name": "Common Name Tx Citation",
     "desc": "Common Name Tx Citation"
   },
+  "component": {
+    "items": {
+      "absoluteages": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "OneToMany", "isrequired": false, "weblinkname": null, "name": "Absolute Ages", "desc": "Absolute Ages"},
+      "catalognumber": {"format": null, "ishidden": false, "isuiformatter": null, "picklistname": null, "type": "java.lang.String", "isrequired": false, "weblinkname": null, "name": "Catalog Number", "desc": "User-assigned identifier for the component"},
+      "collectionobject": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": true, "weblinkname": null, "name": "Collection Object", "desc": "Collection Object"},
+      "createdbyagent": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null, "name": "Created By Agent", "desc": "Created By Agent"},
+      "identifiedby": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null, "name": "Identified By", "desc": "Identified By"},
+      "identifieddate": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Calendar", "isrequired": false, "weblinkname": null, "name": "Identified Date", "desc": "Identified Date"},
+      "integer1": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer1", "desc": "Integer1"},
+      "integer2": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer2", "desc": "Integer2"},
+      "integer3": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer3", "desc": "Integer3"},
+      "integer4": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer4", "desc": "Integer4"},
+      "integer5": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer5", "desc": "Integer5"},
+      "integer6": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Integer6", "desc": "Integer6"},
+      "modifiedbyagent": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null, "name": "Modified By Agent", "desc": "Modified By Agent"},
+      "name": {"format": null, "ishidden": false, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null, "name": "Name", "desc": "The name from a taxon tree corresponding to the chosen type."},
+      "number1": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number1", "desc": "Number1"},
+      "number2": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number2", "desc": "Number2"},
+      "number3": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number3", "desc": "Number3"},
+      "number4": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number4", "desc": "Number4"},
+      "number5": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number5", "desc": "Number5"},
+      "number6": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null, "name": "Number6", "desc": "Number6"},
+      "proportion": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Proportion", "desc": "Specify the proportion of the component relative to the whole."},
+      "relativeages": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "OneToMany", "isrequired": false, "weblinkname": null, "name": "Relative Ages", "desc": "Relative Ages"},
+      "role": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.String", "isrequired": false, "weblinkname": null, "name": "Role", "desc": "Define the role or purpose of the component in the overall collection."},
+      "text1": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text1", "desc": "Text1"},
+      "text2": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text2", "desc": "Text2"},
+      "text3": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text3", "desc": "Text3"},
+      "text4": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text4", "desc": "Text4"},
+      "text5": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text5", "desc": "Text5"},
+      "text6": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Text6", "desc": "Text6"},
+      "timestampcreated": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.sql.Timestamp", "isrequired": true, "weblinkname": null, "name": "Timestamp Created", "desc": "Timestamp Created"},
+      "timestampmodified": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.sql.Timestamp", "isrequired": false, "weblinkname": null, "name": "Timestamp Modified", "desc": "Timestamp Modified"},
+      "type": {"format": null, "ishidden": false, "isuiformatter": null, "picklistname": "CollectionObjectType", "type": "ManyToOne", "isrequired": true, "weblinkname": null, "name": "Type", "desc": "Determines the valid options for component names."},
+      "uniqueidentifier": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.String", "isrequired": false, "weblinkname": null, "name": "Unique Identifier", "desc": "Uniquely identifies each component record"},
+      "verbatimname": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null, "name": "Verbatim Name", "desc": "The original name printed or associated with the component."},
+      "version": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Integer", "isrequired": false, "weblinkname": null, "name": "Version", "desc": "Version"},
+      "yesno1": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No1", "desc": "Yes No1"},
+      "yesno2": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No2", "desc": "Yes No2"},
+      "yesno3": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No3", "desc": "Yes No3"},
+      "yesno4": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No4", "desc": "Yes No4"},
+      "yesno5": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No5", "desc": "Yes No5"},
+      "yesno6": {"format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.lang.Boolean", "isrequired": false, "weblinkname": null, "name": "Yes No6", "desc": "Yes No6"}
+    },
+    "format": null,
+    "ishidden": false,
+    "isuiformatter": null,
+    "picklistname": null,
+    "type": null,
+    "aggregator": null,
+    "defaultui": null,
+    "name": "Component",
+    "desc": "Component"
+  },
   "conservdescription": {
     "items": {
       "backgroundinfo": {"name": "Background Info", "desc": "Any background information on the object.", "format": null, "ishidden": false, "isuiformatter": false, "picklistname": null, "type": "text", "isrequired": false, "weblinkname": null},
@@ -2497,7 +2552,7 @@
       "taxontreedef": {"name": "Taxon Tree Def", "desc": "Taxon Tree Def", "format": null, "ishidden": true, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null},
       "timestampcreated": {"name": "Timestamp Created", "desc": "Timestamp Created", "format": null, "ishidden": true, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null},
       "timestampmodified": {"name": "Timestamp Modified", "desc": "Timestamp Modified", "format": null, "ishidden": true, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null},
-      "type": {"name": "Type", "desc": "Type", "format": null, "ishidden": false, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null},
+      "type": {"name": "Type", "desc": "Type", "format": null, "ishidden": false, "isuiformatter": false, "picklistname": "DisciplineType", "type": null, "isrequired": false, "weblinkname": null},
       "usergroups": {"name": "User Groups", "desc": "User Groups", "format": null, "ishidden": true, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null},
       "version": {"name": "Version", "desc": "Version", "format": null, "ishidden": true, "isuiformatter": false, "picklistname": null, "type": null, "isrequired": false, "weblinkname": null}
     },
@@ -5288,6 +5343,7 @@
       "ageuncertainty": {"name": "Age Uncertainty", "desc": "Age Uncertainty", "format": null, "ishidden": false, "isuiformatter": null, "picklistname": null, "type": "java.math.BigDecimal", "isrequired": false, "weblinkname": null},
       "collectiondate": {"name": "Collection Date", "desc": "Collection Date", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},
       "collectionobject": {"name": "Collection Object", "desc": "Collection Object", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": true, "weblinkname": null},
+      "component": {"name": "Component", "desc": "Component", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null},
       "createdbyagent": {"name": "Created By Agent", "desc": "Created By Agent", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "ManyToOne", "isrequired": false, "weblinkname": null},
       "date1": {"name": "Date1", "desc": "Date1", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},
       "date2": {"name": "Date2", "desc": "Date2", "format": null, "ishidden": true, "isuiformatter": null, "picklistname": null, "type": "java.util.Date", "isrequired": false, "weblinkname": null},

specifyweb/backend/businessrules/migration_utils.py

@@ -1,71 +1,31 @@
-from typing import Tuple, List
-
-from specifyweb.backend.businessrules.uniqueness_rules import create_uniqueness_rule
-
-
 def catnum_rule_editable(apps, schema_editor=None):
     """ Find any CollectionObject catalogNumber must be unique to Collection 
     rules which are readonly on the frontend (have isDatabaseConstraint=True)
     and set their isDatabaseConstraint=False.
-    
+
     Generally should be run only after migration businessrules/0003 has been 
     applied
     """
     UniquenessRule = apps.get_model("businessrules", "UniquenessRule")
-
-    model_rules = UniquenessRule.objects.filter(modelName="Collectionobject", isDatabaseConstraint=True)
 
-    catalog_number_rules: List[int] = []
-    for rule in model_rules: 
+    model_rules = UniquenessRule.objects.filter(
+        modelName="Collectionobject",
+        isDatabaseConstraint=True
+    )
+
+    catalog_number_rules: list[int] = []
+    for rule in model_rules:
         rule_fields = rule.uniquenessrulefield_set.all()
 
         fields = rule_fields.filter(isScope=False)
         scopes = rule_fields.filter(isScope=True)
 
-        # We're only interested in the rule "CollectionObject catalogNumber 
+        # We're only interested in the rule "CollectionObject catalogNumber
         # must be unique to Collection"
-        # We check for length of fields and scopes because get() raises an 
+        # We check for length of fields and scopes because get() raises an
         # exception if more than one result is returned
         if (len(fields) == 1 and len(scopes) == 1) and (fields.get().fieldPath.lower() == "catalognumber" and scopes.get().fieldPath.lower() == "collection"):
             catalog_number_rules.append(rule.id)
-    
+
     rules_to_update = UniquenessRule.objects.filter(id__in=catalog_number_rules)
     rules_to_update.update(isDatabaseConstraint=False)
-
-
-def catnum_rule_uneditable(apps, schema_editor=None):
-    """ Find any CollectionObject catalogNumber must be unique to Collection 
-    rules which are editable on the frontend (have isDatabaseConstraint=False)
-    and set their isDatabaseConstraint=True.
-
-    Generally should be run when migration businessrules/0003 is being reverted
-    """
-    Discipline = apps.get_model("specify", "Discipline")
-    UniquenessRule = apps.get_model("businessrules", "UniquenessRule")
-
-    for discipline in Discipline.objects.all():
-        model_rules = UniquenessRule.objects.filter(modelName="Collectionobject", discipline_id=discipline.id, isDatabaseConstraint=False)
-
-        has_catalognumber_rule = False
-        for rule in model_rules: 
-            rule_fields = rule.uniquenessrulefield_set.all()
-
-            fields = rule_fields.filter(isScope=False)
-            scopes = rule_fields.filter(isScope=True)
-
-            # We're only interested in the rule "CollectionObject catalogNumber 
-            # must be unique to Collection"
-            # We check for length of fields and scopes because get() raises an 
-            # exception if more than one result is returned
-            if (len(fields) == 1 and len(scopes) == 1) and (fields.get().fieldPath.lower() == "catalognumber" and scopes.get().fieldPath.lower() == "collection"):
-                has_catalognumber_rule = True
-
-        if not has_catalognumber_rule:
-            create_uniqueness_rule(
-                model_name="Collectionobject",
-                discipline=discipline,
-                is_database_constraint=True,
-                fields=["catalogNumber"],
-                scopes=["collection"],
-                registry=apps,
-            )