diff --git a/.idea/atdb-ldv.iml b/.idea/atdb-ldv.iml index 2ab3c03993ecfb0732bf60b1d5b642f09a14154a..26367b62b8dda837033b17f2c43bdc9b28c74773 100644 --- a/.idea/atdb-ldv.iml +++ b/.idea/atdb-ldv.iml @@ -3,8 +3,9 @@ <component name="NewModuleRootManager"> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/venv" /> + <excludeFolder url="file://$MODULE_DIR$/venv310" /> </content> - <orderEntry type="jdk" jdkName="Python 3.9 (atdb-ldv)" jdkType="Python SDK" /> + <orderEntry type="jdk" jdkName="Python 3.10 (atdb-ldv)" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> <component name="PyDocumentationSettings"> diff --git a/.idea/misc.xml b/.idea/misc.xml index b69afdb89884dd81772c071f7da9af8a4225b6de..5ce0e771c301eeecd4c0bce0b4d5586fe622754d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (atdb-ldv)" project-jdk-type="Python SDK" /> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (atdb-ldv)" project-jdk-type="Python SDK" /> <component name="PyCharmProfessionalAdvertiser"> <option name="shown" value="true" /> </component> diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py index 32433ae2ce74beb62caaf4806f14d2cd8a6e570d..840632e94242e51880032bdeb394a60ae70f1b1f 100644 --- a/atdb/atdb/settings/dev.py +++ b/atdb/atdb/settings/dev.py @@ -13,7 +13,7 @@ DATABASES = { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'USER': 'atdb_admin', 'PASSWORD': 'atdb123', - 'NAME': 'atdb_ldv_12jan2024', + 'NAME': 'atdb_ldv_19jan2024', 'HOST': 'localhost', 'PORT': '5432', }, diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 30f8afe3ed76e284906c861c50d04fbc41a822cf..01d9a97d5327579722782d4dae8636cd456bb717 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -95,6 +95,34 @@ def convert_summary_to_list_for_template(task): +class Activity(models.Model): + """ + update when tasks status changes from ??? to ???: + - to '???' : check for incoming 'archive' json from archiver + - to 'stored' : calculate qualities + - to ??? : calculate finished_fraction + - to ??? : calculate ingested_fraction + + """ + + # fields used in overview pages + sas_id = models.CharField(db_index=True, verbose_name="SAS_ID", max_length=15, blank=True, null=True) + workflow = models.ForeignKey(Workflow, related_name='tasks', on_delete=models.CASCADE, null=True, blank=True) + project = models.CharField(max_length=100, blank=True, null=True, default="unknown") + filter = models.CharField(max_length=30, blank=True, null=True) + + status = models.CharField(db_index=True, default="unknown", max_length=50, blank=True, null=True) + calculated_qualities = models.JSONField(null=True, blank=True) + archive = models.JSONField(null=True, blank=True) + + # output sas_id at LTA + output_sas_id = models.CharField(max_length=15, blank=True, null=True) + has_summary = models.BooleanField(default=False) + is_verified = models.BooleanField(default=False) + finished_fraction = models.FloatField(blank=True, null=True) + ingested_fraction = models.FloatField(blank=True, null=True) + + class Task(models.Model): # Task control properties diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 7dfdd6467d02ab84e0820a59f9e21fd061a7b79b..f66028be5102df9eb21f2628b393c22ba763b5a6 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -31,7 +31,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 18 Jan 2024 + <p class="footer"> Version 2 Feb 2024 </div> {% include 'taskdatabase/refresh.html' %}