diff --git a/atdb/taskdatabase/migrations/0001_initial.py b/atdb/taskdatabase/migrations/0001_initial.py
index 02d3f214e4dab9e7cf63cc2eabf718455546faec..c5b145fe93a8d4c37cc74eabb4d7de094e94cf81 100644
--- a/atdb/taskdatabase/migrations/0001_initial.py
+++ b/atdb/taskdatabase/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.13 on 2020-12-15 15:05
+# Generated by Django 3.1.4 on 2020-12-22 13:24
import datetime
from django.db import migrations, models
@@ -22,25 +22,23 @@ class Migration(migrations.Migration):
('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)),
+ ('data_location', models.CharField(blank=True, default='unknown', max_length=255, null=True)),
('my_status', models.CharField(db_index=True, default='defined', max_length=50)),
- ('node', models.CharField(max_length=10, null=True)),
+ ('node', models.CharField(blank=True, max_length=10, null=True)),
+ ('quality', models.CharField(default='unknown', max_length=30)),
],
),
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')),
+ ('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')),
('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')),
- ('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',),
@@ -51,19 +49,18 @@ class Migration(migrations.Migration):
('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')),
+ ('taskObject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='status_history', to='taskdatabase.taskobject')),
],
),
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')),
+ ('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')),
+ ('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/0002_remove_taskobject_irods_collection.py b/atdb/taskdatabase/migrations/0002_remove_taskobject_irods_collection.py
deleted file mode 100644
index d0e3625689d0f4270a366f00e1efff52c551d5ea..0000000000000000000000000000000000000000
--- a/atdb/taskdatabase/migrations/0002_remove_taskobject_irods_collection.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-18 12:18
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('taskdatabase', '0001_initial'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='taskobject',
- name='irods_collection',
- ),
- ]
diff --git a/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py b/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py
deleted file mode 100644
index 10f921a2b11ee3bda592efe77c1f9076fb522331..0000000000000000000000000000000000000000
--- a/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-18 14:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('taskdatabase', '0002_remove_taskobject_irods_collection'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='dataproduct',
- name='quality',
- ),
- migrations.RemoveField(
- model_name='observation',
- name='quality',
- ),
- migrations.AddField(
- model_name='taskobject',
- name='quality',
- field=models.CharField(default='unknown', max_length=30),
- ),
- migrations.AlterField(
- model_name='taskobject',
- name='data_location',
- field=models.CharField(blank=True, default='unknown', max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='taskobject',
- name='node',
- field=models.CharField(blank=True, max_length=10, null=True),
- ),
- ]
diff --git a/atdb/taskdatabase/migrations/0004_remove_observation_metadata.py b/atdb/taskdatabase/migrations/0004_remove_observation_metadata.py
deleted file mode 100644
index 4e21bb9797365ee92c1d35715584e1f6145d5886..0000000000000000000000000000000000000000
--- a/atdb/taskdatabase/migrations/0004_remove_observation_metadata.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.1.4 on 2020-12-22 10:31
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('taskdatabase', '0003_auto_20201218_1500'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='observation',
- name='metadata',
- ),
- ]
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 8fb0c22dfc69836dde3f7068536a1680132da756..bc53466731dfd5e02306ea3fcec47e766fbb7017 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -43,6 +43,7 @@ class TaskObject(models.Model):
my_status = models.CharField(db_index=True, max_length=50,default="defined")
node = models.CharField(max_length=10, null=True, blank=True)
quality = models.CharField(max_length=30, default="unknown")
+ # metadata = models.JSONField()
def __str__(self):
return str(self.id)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index acaf7e1048a18f7b0eec65bf287992c7da923e49..9bb6fcae4cc7a99604262c09290431e5708c0364 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 1.0.0 (22 dec 2020 - 11:30)
+ <p class="footer"> Version 1.0.0 (22 dec 2020 - 14:00)
<script type="text/javascript">
(function(seconds) {
var refresh,