summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/admin.py2
-rw-r--r--archaeological_finds/forms.py6
-rw-r--r--archaeological_finds/migrations/0009_auto_20171010_1644.py23
-rw-r--r--archaeological_finds/models.py6
-rw-r--r--archaeological_finds/models_finds.py32
-rw-r--r--archaeological_finds/models_treatments.py26
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html2
-rw-r--r--archaeological_finds/urls.py4
-rw-r--r--archaeological_finds/views.py3
9 files changed, 58 insertions, 46 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 6e354211f..b8ed15865 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -182,7 +182,7 @@ admin_site.register(models.TreatmentType, TreatmentTypeAdmin)
general_models = [
models.ConservatoryState, models.RemarkabilityType,
- models.PreservationType, models.IntegrityType,
+ models.IntegrityType,
models.TreatmentFileType, models.TreatmentState,
models.BatchType, models.AlterationCauseType, models.AlterationType,
models.TreatmentEmergencyType
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 39d97c927..66ea273cf 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -293,7 +293,7 @@ class PreservationForm(ManageOldType, forms.Form):
'alteration_cause': models.AlterationCauseType,
'treatment_emergency': models.TreatmentEmergencyType,
'conservatory_state': models.ConservatoryState,
- 'preservation_to_consider': models.PreservationType,
+ 'preservation_to_consider': models.TreatmentType,
}
conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"),
choices=[], required=False)
@@ -304,7 +304,7 @@ class PreservationForm(ManageOldType, forms.Form):
label=_(u"Alteration cause"), choices=[],
widget=widgets.Select2Multiple, required=False)
preservation_to_consider = forms.MultipleChoiceField(
- label=_(u"Preservation type"), choices=[],
+ label=_(u"Recommended treatments"), choices=[],
widget=widgets.Select2Multiple, required=False)
treatment_emergency = forms.ChoiceField(label=_("Treatment emergency"),
choices=[], required=False)
@@ -318,7 +318,7 @@ class PreservationForm(ManageOldType, forms.Form):
TYPES = [
('conservatory_state', models.ConservatoryState, False),
('treatment_emergency', models.TreatmentEmergencyType, False),
- ('preservation_to_consider', models.PreservationType, True),
+ ('preservation_to_consider', models.TreatmentType, True),
('alteration', models.AlterationType, True),
('alteration_cause', models.AlterationCauseType, True),
]
diff --git a/archaeological_finds/migrations/0009_auto_20171010_1644.py b/archaeological_finds/migrations/0009_auto_20171010_1644.py
new file mode 100644
index 000000000..882e9ae86
--- /dev/null
+++ b/archaeological_finds/migrations/0009_auto_20171010_1644.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-10 16:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_finds', '0008_auto_20171004_1327'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='PreservationType',
+ ),
+ migrations.AlterField(
+ model_name='find',
+ name='preservation_to_considers',
+ field=models.ManyToManyField(blank=True, related_name='finds_recommended', to='archaeological_finds.TreatmentType', verbose_name='Recommended treatments'),
+ ),
+ ]
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index ab3686f08..f0dcf96c4 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -1,9 +1,9 @@
from archaeological_finds.models_finds import MaterialType, ConservatoryState,\
- PreservationType, IntegrityType, RemarkabilityType, ObjectType, BaseFind, \
+ IntegrityType, RemarkabilityType, ObjectType, BaseFind, \
FindBasket, Find, FindSource, Property, CHECK_CHOICES, BatchType, \
BFBulkView, FBulkView, FirstBaseFindView, AlterationType, \
- AlterationCauseType, TreatmentEmergencyType
-from archaeological_finds.models_treatments import TreatmentType, Treatment, \
+ AlterationCauseType, TreatmentEmergencyType, TreatmentType
+from archaeological_finds.models_treatments import Treatment, \
AbsFindTreatments, FindUpstreamTreatments, FindDownstreamTreatments, \
FindTreatments, TreatmentSource, TreatmentFile, TreatmentFileType, \
TreatmentFileSource, TreatmentState
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 3d379d2a7..5f4183f0c 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -69,15 +69,28 @@ post_save.connect(post_save_cache, sender=ConservatoryState)
post_delete.connect(post_save_cache, sender=ConservatoryState)
-class PreservationType(GeneralType):
+class TreatmentType(GeneralType):
+ order = models.IntegerField(_(u"Order"), default=10)
+ parent = models.ForeignKey("TreatmentType", verbose_name=_(u"Parent type"),
+ blank=True, null=True)
+ virtual = models.BooleanField(_(u"Virtual"))
+ upstream_is_many = models.BooleanField(
+ _(u"Upstream is many"), default=False,
+ help_text=_(
+ u"Check this if for this treatment from many finds you'll get "
+ u"one."))
+ downstream_is_many = models.BooleanField(
+ _(u"Downstream is many"), default=False,
+ help_text=_(
+ u"Check this if for this treatment from one find you'll get "
+ u"many."))
+
class Meta:
- verbose_name = _(u"Preservation type")
- verbose_name_plural = _(u"Preservation types")
+ verbose_name = _(u"Treatment type")
+ verbose_name_plural = _(u"Treatment types")
ordering = ('label',)
-
-
-post_save.connect(post_save_cache, sender=PreservationType)
-post_delete.connect(post_save_cache, sender=PreservationType)
+post_save.connect(post_save_cache, sender=TreatmentType)
+post_delete.connect(post_save_cache, sender=TreatmentType)
class IntegrityType(GeneralType):
@@ -714,8 +727,9 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
conservatory_comment = models.TextField(_(u"Conservatory comment"),
blank=True, null=True)
preservation_to_considers = models.ManyToManyField(
- PreservationType, verbose_name=_(u"Type of preservation to consider"),
- related_name='finds', blank=True)
+ TreatmentType,
+ verbose_name=_(u"Recommended treatments"),
+ related_name='finds_recommended', blank=True)
alterations = models.ManyToManyField(
AlterationType, verbose_name=_(u"Alteration"), blank=True,
related_name='finds'
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 866e218aa..0ffcd87fa 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -32,34 +32,10 @@ from ishtar_common.models import GeneralType, ImageModel, BaseHistorizedItem, \
OwnPerms, HistoricalRecords, Person, Organization, Source, \
ValueGetter, post_save_cache, ShortMenuItem, DashboardFormItem
from archaeological_warehouse.models import Warehouse, Container
-from archaeological_finds.models_finds import Find, FindBasket
+from archaeological_finds.models_finds import Find, FindBasket, TreatmentType
from archaeological_operations.models import ClosedItem, Operation
-class TreatmentType(GeneralType):
- order = models.IntegerField(_(u"Order"), default=10)
- parent = models.ForeignKey("TreatmentType", verbose_name=_(u"Parent type"),
- blank=True, null=True)
- virtual = models.BooleanField(_(u"Virtual"))
- upstream_is_many = models.BooleanField(
- _(u"Upstream is many"), default=False,
- help_text=_(
- u"Check this if for this treatment from many finds you'll get "
- u"one."))
- downstream_is_many = models.BooleanField(
- _(u"Downstream is many"), default=False,
- help_text=_(
- u"Check this if for this treatment from one find you'll get "
- u"many."))
-
- class Meta:
- verbose_name = _(u"Treatment type")
- verbose_name_plural = _(u"Treatment types")
- ordering = ('label',)
-post_save.connect(post_save_cache, sender=TreatmentType)
-post_delete.connect(post_save_cache, sender=TreatmentType)
-
-
class TreatmentState(GeneralType):
class Meta:
verbose_name = _(u"Treatment state type")
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 0657b2741..c05c221e3 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -64,7 +64,7 @@
{% field_li "Conservatory state" item.conservatory_state %}
{% field_li_multiple "Alteration" item.alterations %}
{% field_li_multiple "Alteration cause" item.alteration_causes %}
- {% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %}
+ {% field_li_multiple "Recommended treatments" item.preservation_to_considers %}
{% field_li "Treatment emergency" item.treatment_emergency %}
{% field_li "Insurance value" item.insurance_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %}
{% field_li "Appraisal date" item.appraisal_date %}
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 317afcb91..c9aaae2a2 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -227,8 +227,8 @@ urlpatterns = [
name='autocomplete-objecttype'),
url(r'autocomplete-materialtype/$', views.autocomplete_materialtype,
name='autocomplete-materialtype'),
- url(r'autocomplete-preservationtype/$', views.autocomplete_preservationtype,
- name='autocomplete-preservationtype'),
+ url(r'autocomplete-treatmenttype/$', views.autocomplete_treatmenttype,
+ name='autocomplete-treatmenttype'),
url(r'autocomplete-integritytype/$', views.autocomplete_integritytype,
name='autocomplete-integritytype'),
url(r'autocomplete-treatmentfile/$', views.autocomplete_treatmentfile,
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index f2be734e7..53758f24a 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -245,8 +245,7 @@ find_source_deletion_wizard = FindSourceDeletionWizard.as_view([
autocomplete_objecttype = get_autocomplete_generic(models.ObjectType)
autocomplete_materialtype = get_autocomplete_generic(models.MaterialType)
-autocomplete_preservationtype = get_autocomplete_generic(
- models.PreservationType)
+autocomplete_treatmenttype = get_autocomplete_generic(models.TreatmentType)
autocomplete_integritytype = get_autocomplete_generic(models.IntegrityType)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 21:56:59 +0000