summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-11 12:24:21 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-11 12:34:19 +0200
commit8b8cd541389412c4960f068848db7e45b71459b9 (patch)
treecb0f5c8d5ef419afc1d22f93cd8461a57f8cc653 /archaeological_finds
parent3ca42ee5280f3e1ee3f74ed6d61a4181188d0450 (diff)
downloadIshtar-8b8cd541389412c4960f068848db7e45b71459b9.tar.bz2
Ishtar-8b8cd541389412c4960f068848db7e45b71459b9.zip
✨ criteria searches: add missing criteria for operation, find and context records (refs #6020) - Context records bulk update: add fields
Criteria searches: - Finds: context record type - Operations: has an attached archeo file - Context records : - Type of documentation - Description - Filling - General comment Context records bulk update: - documentation - identification - excavation technic
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/forms.py7
-rw-r--r--archaeological_finds/models_finds.py4
-rw-r--r--archaeological_finds/views.py4
3 files changed, 11 insertions, 4 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 30dacf8f2..7bf5f8a18 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -35,11 +35,12 @@ from ishtar_common.utils import ugettext_lazy as _
from . import models
from archaeological_operations.models import CulturalAttributionType, RemainType
from archaeological_context_records.models import (
+ Dating,
DatingType,
DatingQuality,
ContextRecord,
RelationType as CRRelationType,
- Dating,
+ Unit,
)
from archaeological_finds.forms_treatments import (
TreatmentSelect,
@@ -54,7 +55,6 @@ from archaeological_finds.forms_treatments import (
TreatmentFileForm,
TreatmentFileModifyForm,
TreatmentFileDeletionForm,
- TreatmentFileFormSelectionMultiple,
AdministrativeActTreatmentFormSelection,
AdministrativeActTreatmentModifForm,
AdministrativeActTreatmentFileForm,
@@ -1584,6 +1584,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
"base_finds__context_record__operation__operator",
"base_finds__context_record__operation__address",
"base_finds__context_record__town__areas",
+ "base_finds__context_record__unit",
"archaeological_sites",
"archaeological_sites_context_record",
"base_finds__context_record",
@@ -1776,6 +1777,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
),
validators=[valid_id(ContextRecord)],
)
+ base_finds__context_record__unit = forms.ChoiceField(label=_("Context record - Type"))
ope_relation_types = forms.ChoiceField(
label=_("Search within related operations"), choices=[]
)
@@ -1970,6 +1972,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
FieldType(
"base_finds__context_record__operation__operation_type", OperationType
),
+ FieldType("base_finds__context_record__unit", Unit),
FieldType("checked_type", models.CheckedType),
FieldType("material_type_quality", models.MaterialTypeQualityType),
FieldType("object_type_quality", models.ObjectTypeQualityType),
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index f8a978b67..a5ff20773 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1366,6 +1366,10 @@ class Find(
pgettext_lazy("key for text search", "context-record"),
"base_finds__context_record__cached_label__icontains",
),
+ "base_finds__context_record__unit": SearchAltName(
+ pgettext_lazy("key for text search", "context-record-type"),
+ "base_finds__context_record__unit__label__iexact",
+ ),
"base_finds__comment": SearchAltName(
pgettext_lazy("key for text search", "discovery-comment"),
"base_finds__comment__iexact",
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index e6ab574c9..866349ce2 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -41,7 +41,7 @@ from archaeological_context_records.forms import (
RecordFormSelection as RecordFormSelectionTable,
)
from archaeological_operations.forms import FinalAdministrativeActDeleteForm
-from archaeological_finds import forms
+from archaeological_finds import forms, forms_treatments
from ishtar_common.views import (
get_autocomplete_generic,
@@ -1050,7 +1050,7 @@ def treatmentfile_add(request, basket_pk=None):
treatmentfile_deletion_wizard = wizards.TreatmentFileDeletionWizard.as_view(
[
- ("selec-treatmentfile_deletion", forms.TreatmentFileFormSelectionMultiple),
+ ("selec-treatmentfile_deletion", forms_treatments.TreatmentFileFormSelectionMultiple),
("final-treatmentfile_deletion", forms.TreatmentFileDeletionForm),
],
label=_("Treatment request deletion"),