From 962b8fd05606c8187b33e9c2bf1e88985f548802 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 30 Apr 2018 15:21:25 +0200 Subject: Relation graph: add logical fields in relations --- archaeological_operations/admin.py | 3 ++- .../migrations/0026_auto_20180430_1318.py | 31 ++++++++++++++++++++++ archaeological_operations/models.py | 11 +++++++- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 archaeological_operations/migrations/0026_auto_20180430_1318.py (limited to 'archaeological_operations') diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 874311978..d906b9faf 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -171,7 +171,8 @@ admin_site.register(models.RecordRelations, RecordRelationsAdmin) class RelationTypeAdmin(GeneralTypeAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', - 'symmetrical', 'inverse_relation', 'comment') + 'symmetrical', 'logical_relation', 'inverse_relation', + 'order', 'comment') admin_site.register(models.RelationType, RelationTypeAdmin) diff --git a/archaeological_operations/migrations/0026_auto_20180430_1318.py b/archaeological_operations/migrations/0026_auto_20180430_1318.py new file mode 100644 index 000000000..52218f089 --- /dev/null +++ b/archaeological_operations/migrations/0026_auto_20180430_1318.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-04-30 13:18 +from __future__ import unicode_literals + +from django.db import migrations, models +import ishtar_common.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0025_auto_20180413_1604'), + ] + + operations = [ + migrations.AddField( + model_name='historicaloperation', + name='relation_image', + field=models.TextField(blank=True, max_length=100, null=True, verbose_name='Generated relation image (SVG)'), + ), + migrations.AddField( + model_name='operation', + name='relation_image', + field=models.FileField(blank=True, null=True, upload_to=ishtar_common.models.get_image_path, verbose_name='Generated relation image (SVG)'), + ), + migrations.AddField( + model_name='relationtype', + name='logical_relation', + field=models.CharField(blank=True, choices=[(b'above', 'Above'), (b'bellow', 'Bellow'), (b'equal', 'Equal')], max_length=10, null=True, verbose_name='Logical relation'), + ), + ] diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index b52477995..87ec89870 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -38,7 +38,7 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \ SourceType, Person, Organization, Town, Dashboard, IshtarUser, ValueGetter,\ DocumentTemplate, ShortMenuItem, DashboardFormItem, GeneralRelationType,\ GeneralRecordRelations, post_delete_record_relation, OperationType, \ - ImageModel, post_save_cache, PersonType, IshtarImage + ImageModel, post_save_cache, PersonType, IshtarImage, get_image_path class RemainType(GeneralType): @@ -477,6 +477,11 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, finds_received = models.NullBooleanField( _(u"Finds received"), blank=True, null=True) + relation_image = models.FileField( + _(u"Generated relation image (SVG)"), null=True, blank=True, + upload_to=get_image_path + ) + # judiciary seizure_name = models.TextField(_(u"Seizure name"), blank=True, null=True) official_report_number = models.TextField(_(u"Official report number"), @@ -540,6 +545,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, return self.reference return unicode(self) + @property + def relation_label(self): + return self.short_label + @property def name(self): return self.common_name -- cgit v1.2.3