diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py index d6a1a2125348b0fd37933ed1138203cc1f90bd98..bcfb2259938d4afb9128bb1b94500e8b2a97b4a3 100644 --- a/atdb/atdb/settings/dev.py +++ b/atdb/atdb/settings/dev.py @@ -9,12 +9,12 @@ CORS_ORIGIN_ALLOW_ALL = True DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': os.environ['DATABASE_NAME'], - 'HOST': os.environ['DATABASE_HOST'], - 'PORT': os.environ['DATABASE_PORT'], - 'USER': os.environ['DATABASE_USER'], - 'PASSWORD': os.environ['DATABASE_PASSWORD'], + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'USER': 'atdb_admin', + 'PASSWORD': 'atdb123', + 'NAME': 'atdb_ldv', + 'HOST': 'localhost', + 'PORT': '', }, } diff --git a/atdb/taskdatabase/migrations/0002_auto_20210225_0715.py b/atdb/taskdatabase/migrations/0002_auto_20210225_0715.py new file mode 100644 index 0000000000000000000000000000000000000000..2fff4de0ddafcbe2eda05ed39b46c793c991ffef --- /dev/null +++ b/atdb/taskdatabase/migrations/0002_auto_20210225_0715.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.4 on 2021-02-25 06:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='task', + name='priority', + field=models.IntegerField(default=1, null=True), + ), + migrations.AlterField( + model_name='task', + name='size_processed', + field=models.PositiveBigIntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='task', + name='size_to_process', + field=models.PositiveBigIntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='task', + name='total_processing_time', + field=models.IntegerField(blank=True, default=0, null=True), + ), + ] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 735e280411c26448f3967e40e55f4e1d9e264965..4488ef687be2e0880b944c0b11e008f0c37c3977 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -27,7 +27,7 @@ class Task(models.Model): resume = models.BooleanField(default=True) creationTime = models.DateTimeField(default=datetime.utcnow, blank=True) - priority = models.IntegerField(null=True) + priority = models.IntegerField(default=1, null=True) purge_policy = models.CharField(max_length=5, default="no", blank=True, null=True) stage_request_id = models.IntegerField(null=True) @@ -38,9 +38,9 @@ class Task(models.Model): outputs = models.JSONField(null=True, blank=True) metrics = models.JSONField(null=True, blank=True) - size_to_process = models.PositiveBigIntegerField(null=True) - size_processed = models.PositiveBigIntegerField(null=True) - total_processing_time = models.IntegerField(null=True) + size_to_process = models.PositiveBigIntegerField(default=0, null=True, blank=True) + size_processed = models.PositiveBigIntegerField(default=0, null=True, blank=True) + total_processing_time = models.IntegerField(default=0, null=True, blank=True) # relationships diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 99eddad8254df40420c3adc3c077349024775661..cad86fdcc0ef714be513d4b284d96918396f17f3 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -45,7 +45,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 1.0.0 (20 feb 2021 - 19:00) + <p class="footer"> Version 1.0.0 (25 feb 2021 - 7:00) <script type="text/javascript"> (function(seconds) { var refresh,