summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2021-11-03 14:33:55 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-07-08 09:58:49 +0200
commita328d42060b01d87919d9048d00097a5d9f934fb (patch)
treef93e11c680c46c8883b516b32f60d87fb2eaec05
parent1878345992d0272c146cbeec2e62f3ed24907f1e (diff)
downloadIshtar-a328d42060b01d87919d9048d00097a5d9f934fb.tar.bz2
Ishtar-a328d42060b01d87919d9048d00097a5d9f934fb.zip
Context record: change field order
-rw-r--r--CHANGES-DEV.md1
-rw-r--r--archaeological_context_records/forms.py8
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES-DEV.md b/CHANGES-DEV.md
index 8ada64dca..2607374c9 100644
--- a/CHANGES-DEV.md
+++ b/CHANGES-DEV.md
@@ -3,6 +3,7 @@ Ishtar changelog
### Features ###
- Context record: bulk update relation - type
+- Context record: change field order
- JSON types: multi valued choices
### Bugs ###
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 157da64e1..c11afd1da 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -299,6 +299,7 @@ class RecordFormGeneral(CustomForm, ManageOldType):
description = forms.CharField(
label=_("Description"), widget=forms.Textarea, required=False
)
+ filling = forms.CharField(label=_("Filling"), widget=forms.Textarea, required=False)
comment = forms.CharField(
label=_("General comment"), widget=forms.Textarea, required=False
)
@@ -525,10 +526,6 @@ class RecordFormInterpretation(CustomForm, ManageOldType, forms.Form):
"activity": models.ActivityType,
"identification": models.IdentificationType,
}
- datings_comment = forms.CharField(
- label=_("Comments on dating"), required=False, widget=forms.Textarea
- )
- filling = forms.CharField(label=_("Filling"), widget=forms.Textarea, required=False)
interpretation = forms.CharField(
label=_("Interpretation"), widget=forms.Textarea, required=False
)
@@ -540,6 +537,9 @@ class RecordFormInterpretation(CustomForm, ManageOldType, forms.Form):
taq_estimated = forms.IntegerField(label=_("Estimated TAQ"), required=False)
tpq = forms.IntegerField(label=_("TPQ"), required=False)
tpq_estimated = forms.IntegerField(label=_("Estimated TPQ"), required=False)
+ datings_comment = forms.CharField(
+ label=_("Comments on dating"), required=False, widget=forms.Textarea
+ )
TYPES = [
FieldType("activity", models.ActivityType),