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

added 2 fields to workflow

added filter for description
added description to GUI
added migration file
updated documentation in README.md
parent 7d99dbc8
Branches
No related tags found
1 merge request!262added 2 fields to workflow
Pipeline #37958 passed
......@@ -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">
......
<?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>
......
atdb/docs/ATDB-LDV Data Model.png

91.1 KiB | W: | H:

atdb/docs/ATDB-LDV Data Model.png

95.3 KiB | W: | H:

atdb/docs/ATDB-LDV Data Model.png
atdb/docs/ATDB-LDV Data Model.png
atdb/docs/ATDB-LDV Data Model.png
atdb/docs/ATDB-LDV Data Model.png
  • 2-up
  • Swipe
  • Onion skin
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
python manage.py migrate --settings=atdb.settings.dev
\ No newline at end of file
# 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),
),
]
......@@ -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)
......
......@@ -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>
......
......@@ -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>
......
......@@ -97,6 +97,7 @@ class WorkflowFilter(filters.FilterSet):
model = Workflow
fields = {
'description': ['icontains'],
'repository': ['exact', 'icontains'],
'commit_id': ['exact', 'icontains'],
'path': ['exact', 'icontains'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment