diff --git a/.idea/atdb-ldv.iml b/.idea/atdb-ldv.iml
index 50cd9802969dbff18202a1559545995747dc6f91..8d67a40199701e8fed64d5f21ee3b3cbe4abe317 100644
--- a/.idea/atdb-ldv.iml
+++ b/.idea/atdb-ldv.iml
@@ -4,7 +4,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
- <orderEntry type="jdk" jdkName="Python 3.7 (atdb-ldv) (2)" jdkType="Python SDK" />
+ <orderEntry type="jdk" jdkName="Python 3.10 (atdb-ldv) (2)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 85a13228f61fdf15b7da46a1323a30d1df6bcb2c..768602abafa0c378b357473d5ea65e29e7328b35 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.7 (atdb-ldv) (2)" project-jdk-type="Python SDK" />
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (atdb-ldv) (2)" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
diff --git a/atdb/docs/ATDB-LDV Data Model.png b/atdb/docs/ATDB-LDV Data Model.png
index 89ebe52d1c524c368bba0b81c9d2816342805c5a..63080e2b4a8ee77fde265f7c52d8c3d0402d8da7 100644
Binary files a/atdb/docs/ATDB-LDV Data Model.png and b/atdb/docs/ATDB-LDV Data Model.png differ
diff --git a/atdb/makemigrations.bat b/atdb/makemigrations.bat
new file mode 100644
index 0000000000000000000000000000000000000000..7f7d2616bc339244b7acf14d3755fc31ec036873
--- /dev/null
+++ b/atdb/makemigrations.bat
@@ -0,0 +1,2 @@
+python manage.py makemigrations --settings=atdb.settings.dev
+REM don't forget to add the new migration file to the repo (right click on the migration file, choose git -> add).
\ No newline at end of file
diff --git a/atdb/migrate.bat b/atdb/migrate.bat
new file mode 100644
index 0000000000000000000000000000000000000000..e628eead5a55dde18ea017e173c32b219dba76d2
--- /dev/null
+++ b/atdb/migrate.bat
@@ -0,0 +1 @@
+python manage.py migrate --settings=atdb.settings.dev
\ No newline at end of file
diff --git a/atdb/taskdatabase/migrations/0018_auto_20221021_1109.py b/atdb/taskdatabase/migrations/0018_auto_20221021_1109.py
new file mode 100644
index 0000000000000000000000000000000000000000..6be942457ac10f47911c4577802509d40f4d5991
--- /dev/null
+++ b/atdb/taskdatabase/migrations/0018_auto_20221021_1109.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.4 on 2022-10-21 09:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('taskdatabase', '0017_auto_20220412_1944'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='workflow',
+ name='default_parameters',
+ field=models.JSONField(blank=True, null=True),
+ ),
+ migrations.AddField(
+ model_name='workflow',
+ name='description',
+ field=models.CharField(blank=True, max_length=500, null=True),
+ ),
+ ]
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 60ede446eadfeb294007b3cdbd8f417fcb457fc1..cb0443b006a03e48a1e5e905520e595b30017e51 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -8,12 +8,14 @@ from django.conf import settings
datetime_format_string = '%Y-%m-%dT%H:%M:%SZ'
class Workflow(models.Model):
+ description = models.CharField(max_length=500, blank=True, null=True)
workflow_uri = models.CharField(unique=True, max_length=30, blank=True, null=True)
repository = models.CharField(max_length=100, blank=True, null=True)
commit_id = models.CharField(max_length=15, blank=True, null=True)
path = models.CharField(max_length=100, blank=True, null=True)
oi_size_fraction = models.FloatField(blank=True, null=True)
meta_scheduling = models.JSONField(null=True, blank=True)
+ default_parameters = models.JSONField(null=True, blank=True)
def __str__(self):
return str(self.id)
diff --git a/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html b/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html
index 175df6102bafb1d115d55dc3c6437b868420c5f7..ecc7517ebed14fe429d0426114b49d8630fb3370 100644
--- a/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html
+++ b/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html
@@ -8,6 +8,7 @@
<table class="table table-striped">
<tbody>
<tr><td><b>id</b></td><td><a href="{% url 'workflow-detail-view-api' workflow.pk %}" target="_blank">{{ workflow.id }} </a></td></tr>
+ <tr><td><b>description</b></td><td>{{ workflow.description }}</td></tr>
<tr><td><b>uri</b></td><td>{{ workflow.workflow_uri }}</td></tr>
<tr><td><b>repository</b></td><td><a href="{{ workflow.repository }}" target="_blank">{{ workflow.repository }} </a></td></tr>
<tr><td><b>commit_id</b></td><td>{{ workflow.commit_id }}</td></tr>
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index f9759a5f1c0032f8405af881963e820c7af3c41d..03ea0b632aba5d6fa59dd6bb7ee91371531f407a 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (20 oct 2022 - 14:00)
+ <p class="footer"> Version 1.0.0 (21 oct 2022 - 11:00)
</div>
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index ea2984755e4993479cc2568e8b61b4bbd49d7bb7..1e910a146e61bfba1510db17fa1c352c5fce81cf 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -97,6 +97,7 @@ class WorkflowFilter(filters.FilterSet):
model = Workflow
fields = {
+ 'description': ['icontains'],
'repository': ['exact', 'icontains'],
'commit_id': ['exact', 'icontains'],
'path': ['exact', 'icontains'],