Skip to content
Snippets Groups Projects
Commit 0d5e74b0 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

clean migrations

parent e31df2ef
No related branches found
No related tags found
No related merge requests found
Pipeline #7270 passed
# 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 import datetime
from django.db import migrations, models from django.db import migrations, models
...@@ -22,25 +22,23 @@ class Migration(migrations.Migration): ...@@ -22,25 +22,23 @@ class Migration(migrations.Migration):
('taskID', models.CharField(blank=True, db_index=True, max_length=30, null=True, verbose_name='runId')), ('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)), ('creationTime', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)),
('new_status', models.CharField(default='defined', max_length=50, null=True)), ('new_status', models.CharField(default='defined', max_length=50, null=True)),
('data_location', models.CharField(default='unknown', max_length=255, null=True)), ('data_location', models.CharField(blank=True, default='unknown', max_length=255, null=True)),
('irods_collection', models.CharField(default='unknown', max_length=255, null=True)),
('my_status', models.CharField(db_index=True, default='defined', max_length=50)), ('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( migrations.CreateModel(
name='Observation', name='Observation',
fields=[ 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')), ('starttime', models.DateTimeField(null=True, verbose_name='start time')),
('endtime', models.DateTimeField(null=True, verbose_name='end time')), ('endtime', models.DateTimeField(null=True, verbose_name='end time')),
('observing_mode', models.CharField(default='imaging', max_length=50)), ('observing_mode', models.CharField(default='imaging', max_length=50)),
('field_name', models.CharField(max_length=50, null=True)), ('field_name', models.CharField(max_length=50, null=True)),
('field_ra', models.FloatField(null=True, verbose_name='field_ra')), ('field_ra', models.FloatField(null=True, verbose_name='field_ra')),
('field_dec', models.FloatField(null=True, verbose_name='field_dec')), ('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)), ('skip_auto_ingest', models.BooleanField(default=False)),
('quality', models.CharField(default='unknown', max_length=30)),
('progress', models.CharField(default='', max_length=40, null=True)), ('progress', models.CharField(default='', max_length=40, null=True)),
], ],
bases=('taskdatabase.taskobject',), bases=('taskdatabase.taskobject',),
...@@ -51,19 +49,18 @@ class Migration(migrations.Migration): ...@@ -51,19 +49,18 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(default='unknown', max_length=50)), ('name', models.CharField(default='unknown', max_length=50)),
('timestamp', models.DateTimeField(blank=True, default=datetime.datetime.utcnow)), ('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( migrations.CreateModel(
name='DataProduct', name='DataProduct',
fields=[ 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)), ('filename', models.CharField(default='unknown', max_length=200)),
('description', models.CharField(default='unknown', max_length=255)), ('description', models.CharField(default='unknown', max_length=255)),
('dataproduct_type', models.CharField(default='visibility', max_length=50, verbose_name='type')), ('dataproduct_type', models.CharField(default='visibility', max_length=50, verbose_name='type')),
('size', models.BigIntegerField(default=0)), ('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',), bases=('taskdatabase.taskobject',),
), ),
......
# 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',
),
]
# 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),
),
]
# 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',
),
]
...@@ -43,6 +43,7 @@ class TaskObject(models.Model): ...@@ -43,6 +43,7 @@ class TaskObject(models.Model):
my_status = models.CharField(db_index=True, max_length=50,default="defined") my_status = models.CharField(db_index=True, max_length=50,default="defined")
node = models.CharField(max_length=10, null=True, blank=True) node = models.CharField(max_length=10, null=True, blank=True)
quality = models.CharField(max_length=30, default="unknown") quality = models.CharField(max_length=30, default="unknown")
# metadata = models.JSONField()
def __str__(self): def __str__(self):
return str(self.id) return str(self.id)
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </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"> <script type="text/javascript">
(function(seconds) { (function(seconds) {
var refresh, var refresh,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment