Remove controlledVocab field

specify · Sep 19, 2024 · 9f9aae3 · 9f9aae3
1 parent 4bf5759
commit 9f9aae3
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/DataModel/types.ts b/specifyweb/frontend/js_src/lib/components/DataModel/types.ts
@@ -6563,7 +6563,6 @@ export type AbsoluteAge = {
  readonly agetype: string | null;
  readonly ageuncertainty: number | null;
  readonly collectiondate: string | null;
- readonly controlledvocab: string | null;
  readonly date1: string | null;
  readonly date2: string | null;
  readonly datingmethod: string | null;
@@ -6593,7 +6592,6 @@ export type RelativeAge = {
  readonly agetype: string | null;
  readonly ageuncertainty: number | null;
  readonly collectiondate: string | null;
- readonly controlledvocab: string | null;
  readonly date1: string | null;
  readonly date2: string | null;
  readonly datingmethod: string | null;

diff --git a/specifyweb/specify/datamodel.py b/specifyweb/specify/datamodel.py
@@ -8381,7 +8381,6 @@
  Field(name='agetype', column='AgeType', indexed=False, unique=False, required=False, type='java.lang.String', length=64),
  Field(name='ageuncertainty', column='AgeUncertainty', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
  Field(name='collectiondate', column='CollectionDate', indexed=False, unique=False, required=False, type='java.util.Date'),
- Field(name='controlledvocab', column='ControlledVocab', indexed=False, unique=False, required=False, type='text'),
  Field(name='date1', column='Date1', indexed=False, unique=False, required=False, type='java.util.Date'),
  Field(name='date2', column='Date2', indexed=False, unique=False, required=False, type='java.util.Date'),
  Field(name='datingmethod', column='DatingMethod', indexed=False, unique=False, required=False, type='java.lang.String', length=64),
@@ -8421,7 +8420,6 @@
  Field(name='agetype', column='AgeType', indexed=False, unique=False, required=False, type='java.lang.String', length=64),
  Field(name='ageuncertainty', column='AgeUncertainty', indexed=False, unique=False, required=False, type='java.math.BigDecimal'),
  Field(name='collectiondate', column='CollectionDate', indexed=False, unique=False, required=False, type='java.util.Date'),
- Field(name='controlledvocab', column='ControlledVocab', indexed=False, unique=False, required=False, type='text'),
  Field(name='date1', column='Date1', indexed=False, unique=False, required=False, type='java.util.Date'),
  Field(name='date2', column='Date2', indexed=False, unique=False, required=False, type='java.util.Date'),
  Field(name='datingmethod', column='DatingMethod', indexed=False, unique=False, required=False, type='java.lang.String', length=64),

diff --git a/specifyweb/specify/migrations/0005_stratigraphy_age.py b/specifyweb/specify/migrations/0005_stratigraphy_age.py
@@ -49,7 +49,6 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
  ('agetype', models.CharField(blank=True, db_column='AgeType', max_length=64, null=True)),
  ('ageuncertainty', models.DecimalField(blank=True, db_column='AgeUncertainty', decimal_places=10, max_digits=22, null=True)),
  ('collectiondate', models.DateField(blank=True, db_column='CollectionDate', null=True)),
- ('controlledvocab', models.TextField(blank=True, db_column='ControlledVocab', null=True)),
  ('date1', models.DateField(blank=True, db_column='Date1', null=True)),
  ('date2', models.DateField(blank=True, db_column='Date2', null=True)),
  ('datingmethod', models.CharField(blank=True, db_column='DatingMethod', max_length=64, null=True)),
@@ -77,7 +76,6 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
  ('agetype', models.CharField(blank=True, db_column='AgeType', max_length=64, null=True)),
  ('ageuncertainty', models.DecimalField(blank=True, db_column='AgeUncertainty', decimal_places=10, max_digits=22, null=True)),
  ('collectiondate', models.DateField(blank=True, db_column='CollectionDate', null=True)),
- ('controlledvocab', models.TextField(blank=True, db_column='ControlledVocab', null=True)),
  ('date1', models.DateField(blank=True, db_column='Date1', null=True)),
  ('date2', models.DateField(blank=True, db_column='Date2', null=True)),
  ('datingmethod', models.CharField(blank=True, db_column='DatingMethod', max_length=64, null=True)),

diff --git a/specifyweb/specify/models.py b/specifyweb/specify/models.py
@@ -7626,7 +7626,6 @@ class AbsoluteAge(models.Model):
  agetype = models.CharField(blank=True, max_length=64, null=True, unique=False, db_column='AgeType', db_index=False) # sedimentation, metamorphic, inclusion, original, fall, etc.
  ageuncertainty = models.DecimalField(blank=True, max_digits=22, decimal_places=10, null=True, unique=False, db_column='AgeUncertainty', db_index=False)
  collectiondate = models.DateField(blank=True, null=True, unique=False, db_column='CollectionDate', db_index=False)
- controlledvocab = models.TextField(blank=True, null=True, unique=False, db_column='ControlledVocab', db_index=False) # 'normal' or 'reverse'
  date1 = models.DateField(blank=True, null=True, unique=False, db_column='Date1', db_index=False)
  date2 = models.DateField(blank=True, null=True, unique=False, db_column='Date2', db_index=False)
  datingmethod = models.CharField(blank=True, max_length=64, null=True, unique=False, db_column='DatingMethod', db_index=False)
@@ -7661,7 +7660,6 @@ class RelativeAge(models.Model):
  agetype = models.CharField(blank=True, max_length=64, null=True, unique=False, db_column='AgeType', db_index=False)
  ageuncertainty = models.DecimalField(blank=True, max_digits=22, decimal_places=10, null=True, unique=False, db_column='AgeUncertainty', db_index=False)
  collectiondate = models.DateField(blank=True, null=True, unique=False, db_column='CollectionDate', db_index=False)
- controlledvocab = models.TextField(blank=True, null=True, unique=False, db_column='ControlledVocab', db_index=False) # 'normal' or 'reverse'
  date1 = models.DateField(blank=True, null=True, unique=False, db_column='Date1', db_index=False)
  date2 = models.DateField(blank=True, null=True, unique=False, db_column='Date2', db_index=False)
  datingmethod = models.CharField(blank=True, max_length=64, null=True, unique=False, db_column='DatingMethod', db_index=False)