From 11e467f0b6ed5757a4638fbdc4aec26c4cec8b64 Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Tue, 15 Dec 2020 16:07:08 +0100 Subject: [PATCH] create new database --- .../0001_initial.py | 69 +++++------ .../__init__.py | 0 .../migrations_xxx/0002_auto_20181106_1204.py | 38 ------- .../migrations_xxx/0003_auto_20181108_0811.py | 90 --------------- .../migrations_xxx/0004_auto_20181125_1254.py | 23 ---- .../migrations_xxx/0005_auto_20181203_1014.py | 24 ---- .../migrations_xxx/0006_auto_20181203_1122.py | 26 ----- .../migrations_xxx/0007_auto_20190415_1015.py | 34 ------ .../0008_observation_delay_center_offset.py | 18 --- .../migrations_xxx/0009_auto_20190726_1534.py | 98 ---------------- .../migrations_xxx/0010_auto_20190902_1543.py | 23 ---- .../migrations_xxx/0011_auto_20191015_1431.py | 18 --- .../migrations_xxx/0012_auto_20191125_1543.py | 18 --- ...013_remove_observation_process_triggers.py | 17 --- .../migrations_xxx/0014_auto_20201215_1350.py | 107 ------------------ .../migrations_xxx/0015_auto_20201215_1423.py | 39 ------- .../templates/taskdatabase/index.html | 2 +- 17 files changed, 31 insertions(+), 613 deletions(-) rename atdb/taskdatabase/{migrations_xxx => migrations}/0001_initial.py (66%) rename atdb/taskdatabase/{migrations_xxx => migrations}/__init__.py (100%) delete mode 100644 atdb/taskdatabase/migrations_xxx/0002_auto_20181106_1204.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0003_auto_20181108_0811.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0004_auto_20181125_1254.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0005_auto_20181203_1014.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0006_auto_20181203_1122.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0007_auto_20190415_1015.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0008_observation_delay_center_offset.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0009_auto_20190726_1534.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0010_auto_20190902_1543.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0011_auto_20191015_1431.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0012_auto_20191125_1543.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0013_remove_observation_process_triggers.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0014_auto_20201215_1350.py delete mode 100644 atdb/taskdatabase/migrations_xxx/0015_auto_20201215_1423.py diff --git a/atdb/taskdatabase/migrations_xxx/0001_initial.py b/atdb/taskdatabase/migrations/0001_initial.py similarity index 66% rename from atdb/taskdatabase/migrations_xxx/0001_initial.py rename to atdb/taskdatabase/migrations/0001_initial.py index 459c4613..02d3f214 100644 --- a/atdb/taskdatabase/migrations_xxx/0001_initial.py +++ b/atdb/taskdatabase/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1 on 2018-09-13 12:08 +# Generated by Django 2.2.13 on 2020-12-15 15:05 import datetime from django.db import migrations, models @@ -13,67 +13,58 @@ class Migration(migrations.Migration): ] operations = [ - migrations.CreateModel( - name='Status', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='unknown', max_length=20)), - ('timestamp', models.DateTimeField(blank=True, default=datetime.datetime.now, verbose_name='Timestamp of creation in the database.')), - ], - ), migrations.CreateModel( name='TaskObject', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(default='unknown', max_length=100)), ('task_type', models.CharField(default='dataproduct', max_length=20)), - ('taskID', models.CharField(blank=True, max_length=30, null=True, verbose_name='runId')), - ('creationTime', models.DateTimeField(blank=True, default=datetime.datetime.now)), - ('new_status', models.CharField(default='defined', max_length=20, null=True)), + ('taskID', models.CharField(blank=True, db_index=True, max_length=30, null=True, verbose_name='runId')), + ('creationTime', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)), + ('new_status', models.CharField(default='defined', max_length=50, null=True)), ('data_location', models.CharField(default='unknown', max_length=255, null=True)), ('irods_collection', models.CharField(default='unknown', max_length=255, null=True)), - ('my_status', models.CharField(default='defined', max_length=20)), + ('my_status', models.CharField(db_index=True, default='defined', max_length=50)), ('node', models.CharField(max_length=10, null=True)), ], ), - migrations.CreateModel( - name='DataProduct', - fields=[ - ('taskobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='taskdatabase.TaskObject')), - ('filename', models.CharField(default='unknown', max_length=200)), - ('description', models.CharField(default='unknown', max_length=255)), - ('dataproduct_type', models.CharField(default='visibility', max_length=50, verbose_name='type')), - ('size', models.BigIntegerField(default=0)), - ('quality', models.CharField(default='unknown', max_length=30)), - ], - bases=('taskdatabase.taskobject',), - ), migrations.CreateModel( name='Observation', fields=[ ('taskobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='taskdatabase.TaskObject')), ('starttime', models.DateTimeField(null=True, verbose_name='start time')), ('endtime', models.DateTimeField(null=True, verbose_name='end time')), - ('beamPattern', models.CharField(max_length=50, null=True)), - ('process_type', models.CharField(default='observation', max_length=50)), + ('observing_mode', models.CharField(default='imaging', max_length=50)), ('field_name', models.CharField(max_length=50, null=True)), ('field_ra', models.FloatField(null=True, verbose_name='field_ra')), ('field_dec', models.FloatField(null=True, verbose_name='field_dec')), - ('field_beam', models.IntegerField(default=0, verbose_name='field_beam')), - ('integration_factor', models.FloatField(null=True, verbose_name='integration_factor')), - ('central_frequency', models.FloatField(null=True, verbose_name='central_frequency')), - ('control_parameters', models.CharField(default='unknown', max_length=255, null=True)), + ('metadata', models.CharField(default='unknown', max_length=255, null=True)), + ('skip_auto_ingest', models.BooleanField(default=False)), + ('quality', models.CharField(default='unknown', max_length=30)), + ('progress', models.CharField(default='', max_length=40, null=True)), ], bases=('taskdatabase.taskobject',), ), - migrations.AddField( - model_name='status', - name='taskObject', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='status_history', to='taskdatabase.TaskObject'), + migrations.CreateModel( + name='Status', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(default='unknown', max_length=50)), + ('timestamp', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)), + ('taskObject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='status_history', to='taskdatabase.TaskObject')), + ], ), - migrations.AddField( - model_name='dataproduct', - name='parent', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='generated_dataproducts', to='taskdatabase.Observation'), + migrations.CreateModel( + name='DataProduct', + fields=[ + ('taskobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='taskdatabase.TaskObject')), + ('filename', models.CharField(default='unknown', max_length=200)), + ('description', models.CharField(default='unknown', max_length=255)), + ('dataproduct_type', models.CharField(default='visibility', max_length=50, verbose_name='type')), + ('size', models.BigIntegerField(default=0)), + ('quality', models.CharField(default='unknown', max_length=30)), + ('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='generated_dataproducts', to='taskdatabase.Observation')), + ], + bases=('taskdatabase.taskobject',), ), ] diff --git a/atdb/taskdatabase/migrations_xxx/__init__.py b/atdb/taskdatabase/migrations/__init__.py similarity index 100% rename from atdb/taskdatabase/migrations_xxx/__init__.py rename to atdb/taskdatabase/migrations/__init__.py diff --git a/atdb/taskdatabase/migrations_xxx/0002_auto_20181106_1204.py b/atdb/taskdatabase/migrations_xxx/0002_auto_20181106_1204.py deleted file mode 100644 index 6fb42ed1..00000000 --- a/atdb/taskdatabase/migrations_xxx/0002_auto_20181106_1204.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 2.1 on 2018-11-06 11:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='taskobject', - name='auto_ingest', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='taskobject', - name='observing_mode', - field=models.CharField(default='imaging', max_length=40), - ), - migrations.AddField( - model_name='taskobject', - name='parset_location', - field=models.CharField(default='/opt/apertif/share/parsets/parset_start_observation_atdb.template', max_length=255, null=True), - ), - migrations.AlterField( - model_name='taskobject', - name='my_status', - field=models.CharField(default='defined', max_length=40), - ), - migrations.AlterField( - model_name='taskobject', - name='new_status', - field=models.CharField(default='defined', max_length=40, null=True), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0003_auto_20181108_0811.py b/atdb/taskdatabase/migrations_xxx/0003_auto_20181108_0811.py deleted file mode 100644 index 45c69f5c..00000000 --- a/atdb/taskdatabase/migrations_xxx/0003_auto_20181108_0811.py +++ /dev/null @@ -1,90 +0,0 @@ -# Generated by Django 2.1 on 2018-11-08 07:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0002_auto_20181106_1204'), - ] - - operations = [ - migrations.RemoveField( - model_name='taskobject', - name='auto_ingest', - ), - migrations.RemoveField( - model_name='taskobject', - name='observing_mode', - ), - migrations.RemoveField( - model_name='taskobject', - name='parset_location', - ), - migrations.AddField( - model_name='observation', - name='end_band', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='observation', - name='number_of_bins', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='observation', - name='observing_mode', - field=models.CharField(default='imaging', max_length=50), - ), - migrations.AddField( - model_name='observation', - name='par_file_name', - field=models.CharField(default='source.par', max_length=255, null=True), - ), - migrations.AddField( - model_name='observation', - name='parset_location', - field=models.CharField(default='/opt/apertif/share/parsets/parset_start_observation_atdb.template', max_length=255, null=True), - ), - migrations.AddField( - model_name='observation', - name='science_mode', - field=models.CharField(default='', max_length=50, null=True), - ), - migrations.AddField( - model_name='observation', - name='skip_auto_ingest', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='observation', - name='start_band', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='observation', - name='telescopes', - field=models.CharField(default='all', max_length=100, null=True), - ), - migrations.AlterField( - model_name='observation', - name='integration_factor', - field=models.IntegerField(null=True, verbose_name='integration_factor'), - ), - migrations.AlterField( - model_name='status', - name='name', - field=models.CharField(default='unknown', max_length=50), - ), - migrations.AlterField( - model_name='taskobject', - name='my_status', - field=models.CharField(default='defined', max_length=50), - ), - migrations.AlterField( - model_name='taskobject', - name='new_status', - field=models.CharField(default='defined', max_length=50, null=True), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0004_auto_20181125_1254.py b/atdb/taskdatabase/migrations_xxx/0004_auto_20181125_1254.py deleted file mode 100644 index 1dd792ce..00000000 --- a/atdb/taskdatabase/migrations_xxx/0004_auto_20181125_1254.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1 on 2018-11-25 11:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0003_auto_20181108_0811'), - ] - - operations = [ - migrations.AlterField( - model_name='taskobject', - name='my_status', - field=models.CharField(db_index=True, default='defined', max_length=50), - ), - migrations.AlterField( - model_name='taskobject', - name='taskID', - field=models.CharField(blank=True, db_index=True, max_length=30, null=True, verbose_name='runId'), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0005_auto_20181203_1014.py b/atdb/taskdatabase/migrations_xxx/0005_auto_20181203_1014.py deleted file mode 100644 index 3b5ead96..00000000 --- a/atdb/taskdatabase/migrations_xxx/0005_auto_20181203_1014.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1 on 2018-12-03 09:14 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0004_auto_20181125_1254'), - ] - - operations = [ - migrations.AlterField( - model_name='status', - name='timestamp', - field=models.DateTimeField(blank=True, default=datetime.datetime.utcnow, verbose_name='Timestamp of creation in the database.'), - ), - migrations.AlterField( - model_name='taskobject', - name='creationTime', - field=models.DateTimeField(blank=True, default=datetime.datetime.utcnow), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0006_auto_20181203_1122.py b/atdb/taskdatabase/migrations_xxx/0006_auto_20181203_1122.py deleted file mode 100644 index 549bafc5..00000000 --- a/atdb/taskdatabase/migrations_xxx/0006_auto_20181203_1122.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.1 on 2018-12-03 10:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0005_auto_20181203_1014'), - ] - - operations = [ - migrations.AlterField( - model_name='dataproduct', - name='parent', - field=models.ForeignKey(default=286, on_delete=django.db.models.deletion.CASCADE, related_name='generated_dataproducts', to='taskdatabase.Observation'), - preserve_default=False, - ), - migrations.AlterField( - model_name='status', - name='taskObject', - field=models.ForeignKey(default=286, on_delete=django.db.models.deletion.CASCADE, related_name='status_history', to='taskdatabase.TaskObject'), - preserve_default=False, - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0007_auto_20190415_1015.py b/atdb/taskdatabase/migrations_xxx/0007_auto_20190415_1015.py deleted file mode 100644 index d49b0ca3..00000000 --- a/atdb/taskdatabase/migrations_xxx/0007_auto_20190415_1015.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.1 on 2019-04-15 08:15 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0006_auto_20181203_1122'), - ] - - operations = [ - migrations.AddField( - model_name='observation', - name='beams', - field=models.CharField(default='0..39', max_length=255), - ), - migrations.AddField( - model_name='observation', - name='field_ha', - field=models.FloatField(null=True, verbose_name='field_ha'), - ), - migrations.AddField( - model_name='observation', - name='process_triggers', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='status', - name='timestamp', - field=models.DateTimeField(blank=True, default=datetime.datetime.utcnow), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0008_observation_delay_center_offset.py b/atdb/taskdatabase/migrations_xxx/0008_observation_delay_center_offset.py deleted file mode 100644 index 73837b4c..00000000 --- a/atdb/taskdatabase/migrations_xxx/0008_observation_delay_center_offset.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1 on 2019-05-07 10:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0007_auto_20190415_1015'), - ] - - operations = [ - migrations.AddField( - model_name='observation', - name='delay_center_offset', - field=models.CharField(max_length=50, null=True), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0009_auto_20190726_1534.py b/atdb/taskdatabase/migrations_xxx/0009_auto_20190726_1534.py deleted file mode 100644 index 9af73c48..00000000 --- a/atdb/taskdatabase/migrations_xxx/0009_auto_20190726_1534.py +++ /dev/null @@ -1,98 +0,0 @@ -# Generated by Django 2.1 on 2019-07-26 13:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0008_observation_delay_center_offset'), - ] - - operations = [ - migrations.CreateModel( - name='Times', - fields=[ - ], - options={ - 'proxy': True, - 'indexes': [], - }, - bases=('taskdatabase.observation',), - ), - migrations.CreateModel( - name='TimeUsed', - fields=[ - ], - options={ - 'proxy': True, - 'indexes': [], - }, - bases=('taskdatabase.observation',), - ), - migrations.AddField( - model_name='observation', - name='filler', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='observation', - name='ingest_progress', - field=models.CharField(default='', max_length=40, null=True), - ), - migrations.AddField( - model_name='observation', - name='science_observation', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='observation', - name='timestamp_aborted', - field=models.DateTimeField(null=True, verbose_name='timestamp_aborted'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_archived', - field=models.DateTimeField(null=True, verbose_name='timestamp_archived'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_completing', - field=models.DateTimeField(null=True, verbose_name='timestamp_completing'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_ingest_error', - field=models.DateTimeField(null=True, verbose_name='timestamp_ingest_error'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_ingesting', - field=models.DateTimeField(null=True, verbose_name='timestamp_ingesting'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_running', - field=models.DateTimeField(null=True, verbose_name='timestamp_running'), - ), - migrations.AddField( - model_name='observation', - name='timestamp_starting', - field=models.DateTimeField(null=True, verbose_name='timestamp_starting'), - ), - migrations.AddField( - model_name='taskobject', - name='locality_policy', - field=models.CharField(default='locality_policy', max_length=100), - ), - migrations.AddField( - model_name='taskobject', - name='max_lifetime_on_disk', - field=models.IntegerField(default=0, verbose_name='max_lifetime_on_disk'), - ), - migrations.AddField( - model_name='observation', - name='quality', - field=models.CharField(default='quality', max_length=30), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0010_auto_20190902_1543.py b/atdb/taskdatabase/migrations_xxx/0010_auto_20190902_1543.py deleted file mode 100644 index d5b29002..00000000 --- a/atdb/taskdatabase/migrations_xxx/0010_auto_20190902_1543.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1 on 2019-09-02 13:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0009_auto_20190726_1534'), - ] - - operations = [ - migrations.AlterField( - model_name='observation', - name='quality', - field=models.CharField(default='unknown', max_length=30), - ), - migrations.AlterField( - model_name='taskobject', - name='locality_policy', - field=models.CharField(default='archive', max_length=100), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0011_auto_20191015_1431.py b/atdb/taskdatabase/migrations_xxx/0011_auto_20191015_1431.py deleted file mode 100644 index 026a47a5..00000000 --- a/atdb/taskdatabase/migrations_xxx/0011_auto_20191015_1431.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1 on 2019-10-15 12:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0010_auto_20190902_1543'), - ] - - operations = [ - migrations.AlterField( - model_name='taskobject', - name='max_lifetime_on_disk', - field=models.IntegerField(default=86400, verbose_name='max_lifetime_on_disk'), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0012_auto_20191125_1543.py b/atdb/taskdatabase/migrations_xxx/0012_auto_20191125_1543.py deleted file mode 100644 index e8adf81d..00000000 --- a/atdb/taskdatabase/migrations_xxx/0012_auto_20191125_1543.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1 on 2019-11-25 14:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0011_auto_20191015_1431'), - ] - - operations = [ - migrations.AlterField( - model_name='taskobject', - name='locality_policy', - field=models.CharField(default='cold_tape', max_length=100), - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0013_remove_observation_process_triggers.py b/atdb/taskdatabase/migrations_xxx/0013_remove_observation_process_triggers.py deleted file mode 100644 index 4a86ed69..00000000 --- a/atdb/taskdatabase/migrations_xxx/0013_remove_observation_process_triggers.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.13 on 2020-12-15 07:42 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0012_auto_20191125_1543'), - ] - - operations = [ - migrations.RemoveField( - model_name='observation', - name='process_triggers', - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0014_auto_20201215_1350.py b/atdb/taskdatabase/migrations_xxx/0014_auto_20201215_1350.py deleted file mode 100644 index d3570ef1..00000000 --- a/atdb/taskdatabase/migrations_xxx/0014_auto_20201215_1350.py +++ /dev/null @@ -1,107 +0,0 @@ -# Generated by Django 2.2.13 on 2020-12-15 12:50 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0013_remove_observation_process_triggers'), - ] - - operations = [ - migrations.DeleteModel( - name='Times', - ), - migrations.DeleteModel( - name='TimeUsed', - ), - migrations.RemoveField( - model_name='observation', - name='central_frequency', - ), - migrations.RemoveField( - model_name='observation', - name='delay_center_offset', - ), - migrations.RemoveField( - model_name='observation', - name='end_band', - ), - migrations.RemoveField( - model_name='observation', - name='field_beam', - ), - migrations.RemoveField( - model_name='observation', - name='field_ha', - ), - migrations.RemoveField( - model_name='observation', - name='filler', - ), - migrations.RemoveField( - model_name='observation', - name='integration_factor', - ), - migrations.RemoveField( - model_name='observation', - name='number_of_bins', - ), - migrations.RemoveField( - model_name='observation', - name='par_file_name', - ), - migrations.RemoveField( - model_name='observation', - name='parset_location', - ), - migrations.RemoveField( - model_name='observation', - name='science_mode', - ), - migrations.RemoveField( - model_name='observation', - name='science_observation', - ), - migrations.RemoveField( - model_name='observation', - name='start_band', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_aborted', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_archived', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_completing', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_ingest_error', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_ingesting', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_running', - ), - migrations.RemoveField( - model_name='observation', - name='timestamp_starting', - ), - migrations.RemoveField( - model_name='taskobject', - name='locality_policy', - ), - migrations.RemoveField( - model_name='taskobject', - name='max_lifetime_on_disk', - ), - ] diff --git a/atdb/taskdatabase/migrations_xxx/0015_auto_20201215_1423.py b/atdb/taskdatabase/migrations_xxx/0015_auto_20201215_1423.py deleted file mode 100644 index adceaef0..00000000 --- a/atdb/taskdatabase/migrations_xxx/0015_auto_20201215_1423.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 2.2.13 on 2020-12-15 13:23 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('taskdatabase', '0014_auto_20201215_1350'), - ] - - operations = [ - migrations.RenameField( - model_name='observation', - old_name='control_parameters', - new_name='metadata', - ), - migrations.RenameField( - model_name='observation', - old_name='ingest_progress', - new_name='progress', - ), - migrations.RemoveField( - model_name='observation', - name='beamPattern', - ), - migrations.RemoveField( - model_name='observation', - name='beams', - ), - migrations.RemoveField( - model_name='observation', - name='process_type', - ), - migrations.RemoveField( - model_name='observation', - name='telescopes', - ), - ] diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 6c8f2875..461211b2 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -46,7 +46,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 2.0.0 (15 dec 2020 - 15:00)</p> + <p class="footer"> Version 2.0.0 (15 dec 2020 - 16:00)</p> <script type="text/javascript"> (function(seconds) { -- GitLab