summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/forms.py23
-rw-r--r--archaeological_context_records/models.py20
-rw-r--r--archaeological_finds/forms.py7
-rw-r--r--archaeological_finds/models_finds.py4
-rw-r--r--archaeological_finds/views.py4
-rw-r--r--archaeological_operations/forms.py1
-rw-r--r--archaeological_operations/models.py5
-rw-r--r--ishtar_common/forms.py3
-rw-r--r--ishtar_common/views_item.py1
9 files changed, 60 insertions, 8 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 3a04567ba..55f27ddcd 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -154,11 +154,16 @@ class RecordSelect(GeoItemSelect, PeriodSelect):
ope_relation_types = forms.ChoiceField(
label=_("Search within related operations"), choices=[]
)
- unit = forms.ChoiceField(label=_("Unit type"), choices=[])
+ unit = forms.ChoiceField(label=_("Type"), choices=[])
activity = forms.ChoiceField(label=_("Activity"), choices=[])
identifications = forms.ChoiceField(label=_("Identification"), choices=[])
cultural_attributions = forms.ChoiceField(
label=_("Cultural attribution"), choices=[], required=False)
+ documentations = forms.ChoiceField(label=_("Documentation"))
+ description = forms.CharField(label=_("Description"))
+ comment = forms.CharField(label=_("General comment"))
+ filling = forms.CharField(label=_("Filling"))
+ interpretation = forms.CharField(label=_("Interpretation"))
parcel = forms.CharField(label=_("Parcel"))
has_finds = forms.NullBooleanField(label=_("Has finds"))
cr_relation_types = forms.ChoiceField(
@@ -174,6 +179,7 @@ class RecordSelect(GeoItemSelect, PeriodSelect):
FieldType("excavation_technics", models.ExcavationTechnicType),
FieldType("activity", models.ActivityType),
FieldType("identifications", models.IdentificationType),
+ FieldType("documentations", models.DocumentationType),
] + GeoItemSelect.TYPES
SITE_KEYS = {"archaeological_site": None}
@@ -685,11 +691,16 @@ class QAContextRecordFormMulti(QAForm):
"qa_relation_type": models.RelationType,
"qa_related_to": models.ContextRecord,
"qa_unit": models.Unit,
+ "qa_documentations": models.DocumentationType,
+ "qa_activity": models.ActivityType,
+ "qa_identifications": models.IdentificationType,
+ "qa_excavation_technics": models.ExcavationTechnicType,
"qa_town": models.Town,
"qa_parcel": models.Parcel,
}
REPLACE_FIELDS = [
"qa_unit",
+ "qa_activity",
"qa_town",
"qa_archaeological_site",
"qa_parcel",
@@ -717,6 +728,10 @@ class QAContextRecordFormMulti(QAForm):
),
required=False,
)
+ qa_documentations = forms.ChoiceField(label=_("Documentation"), required=False)
+ qa_excavation_technics = forms.ChoiceField(label=_("Excavation technic"), required=False)
+ qa_activity = forms.ChoiceField(label=_("Activity"), required=False)
+ qa_identifications = forms.ChoiceField(label=_("Identification"), required=False)
qa_archaeological_site = forms.IntegerField(
label=_("Archaeological site"),
widget=widgets.JQueryAutoComplete(
@@ -732,10 +747,14 @@ class QAContextRecordFormMulti(QAForm):
TYPES = [
FieldType("qa_relation_type", models.RelationType),
FieldType("qa_unit", models.Unit),
+ FieldType("qa_documentations", models.DocumentationType),
+ FieldType("qa_excavation_technics", models.ExcavationTechnicType),
+ FieldType("qa_activity", models.ActivityType),
+ FieldType("qa_identifications", models.IdentificationType),
]
def __init__(self, *args, **kwargs):
- super(QAContextRecordFormMulti, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.items = kwargs.pop("items")
disable = False
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 223037127..e13633d90 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -638,6 +638,26 @@ class ContextRecord(
pgettext_lazy("key for text search", "identification"),
"identifications__label__iexact"
),
+ "documentations": SearchAltName(
+ pgettext_lazy("key for text search", "documentation"),
+ "documentations__label__iexact"
+ ),
+ "description": SearchAltName(
+ pgettext_lazy("key for text search", "description"),
+ "description__iexact"
+ ),
+ "filling": SearchAltName(
+ pgettext_lazy("key for text search", "filling"),
+ "filling__iexact"
+ ),
+ "interpretation": SearchAltName(
+ pgettext_lazy("key for text search", "interpretation"),
+ "interpretation__iexact"
+ ),
+ "comment": SearchAltName(
+ pgettext_lazy("key for text search", "comment"),
+ "comment__iexact"
+ ),
}
ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
ALT_NAMES.update(DocumentItem.ALT_NAMES)
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"),
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 2340d36be..cf9df8594 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -553,6 +553,7 @@ class OperationSelect(GeoItemSelect):
reverse_lazy('autocomplete-archaeologicalsite'),
associated_model=models.ArchaeologicalSite),
validators=[valid_id(models.ArchaeologicalSite)])
+ associated_file__isnull = forms.NullBooleanField(label=_("Has an associated file?"))
history_creator = forms.IntegerField(
label=_("Created by"),
widget=widgets.JQueryAutoComplete(
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 50dcd20f3..e847429a0 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1020,6 +1020,7 @@ class Operation(
"documents__image__isnull",
"documents__associated_file__isnull",
"documents__associated_url__isnull",
+ "associated_file__isnull",
]
DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + [
"start_date",
@@ -1215,6 +1216,10 @@ class Operation(
"operator_reference": SearchAltName(
pgettext_lazy("key for text search", "operator-reference"), "operator_reference__iexact"
),
+ "associated_file__isnull": SearchAltName(
+ pgettext_lazy("key for text search", "has-archeo-file"),
+ "associated_file__isnull"
+ ),
"abstract": SearchAltName(
pgettext_lazy("key for text search", "abstract"), "abstract__iexact"
),
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 9ee241919..ad76d63cd 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -1036,8 +1036,7 @@ class DocumentItemSelect(ImportSelect):
def get_now():
- format = formats.get_format("DATE_INPUT_FORMATS")[0]
- return datetime.datetime.now().strftime(format)
+ return datetime.datetime.now().strftime(formats.get_format("DATE_INPUT_FORMATS")[0])
class ClosingDateFormSelection(IshtarForm):
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index fbe522b1c..2a35c85d2 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -598,6 +598,7 @@ LIST_FIELDS = { # key: hierarchic depth
"provider": 0,
"excavation_technics": 0,
"activity": 0,
+ "documentations": 0,
}
HIERARCHIC_FIELDS = list(LIST_FIELDS.keys())
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 13:07:50 +0000