summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-18 13:34:38 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-18 13:34:38 +0200
commit400ba5269e95efddcfee0b676792a1b7b7a7f53d (patch)
tree3fca444033cd21327c7ca36277fe6c48cf1f7f79
parent0c6c694b743cef4517df63ad93c6af4f7dc757cb (diff)
downloadIshtar-400ba5269e95efddcfee0b676792a1b7b7a7f53d.tar.bz2
Ishtar-400ba5269e95efddcfee0b676792a1b7b7a7f53d.zip
Operation: in charge -> scientific monitor
-rw-r--r--archaeological_operations/forms.py2
-rw-r--r--archaeological_operations/models.py12
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html2
3 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 288a4f074..17b975c34 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -508,7 +508,7 @@ class OperationSelect(DocumentItemSelect):
args=[person_type_pks_lazy(['sra_agent'])]
),
associated_model=Person),
- label=_("In charge"))
+ label=_("Scientific monitor"))
scientist = forms.IntegerField(
widget=widgets.JQueryAutoComplete(
reverse_lazy(
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 4de3a78e5..05c1d6336 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -880,10 +880,10 @@ class Operation(
"scientist__surname": _("Scientist (surname)"),
"scientist__name": _("Scientist (name)"),
"scientist__attached_to__name": _("Scientist - Organization (name)"),
- "in_charge__title": _("In charge (title)"),
- "in_charge__surname": _("In charge (surname)"),
- "in_charge__name": _("In charge (name)"),
- "in_charge__attached_to__name": _("In charge - Organization (name)"),
+ "in_charge__title": _("Scientific monitor (title)"),
+ "in_charge__surname": _("Scientific monitor (surname)"),
+ "in_charge__name": _("Scientific monitor (name)"),
+ "in_charge__attached_to__name": _("Scientific monitor - Organization (name)"),
"cira_rapporteur__surname": "Rapporteur CTRA/CIRA (prénom)",
"cira_rapporteur__name": "Rapporteur CTRA/CIRA (nom)",
"cira_rapporteur__attached_to__name": "Rapporteur CTRA/CIRA - "
@@ -978,7 +978,7 @@ class Operation(
pgettext_lazy("key for text search", "is-open"), "end_date__isnull"
),
"in_charge": SearchAltName(
- pgettext_lazy("key for text search", "in-charge"),
+ pgettext_lazy("key for text search", "scientific-monitor"),
"in_charge__cached_label__iexact",
),
"scientist": SearchAltName(
@@ -2444,7 +2444,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter)
blank=True,
null=True,
related_name="adminact_operation_in_charge",
- verbose_name=_("Person in charge of the operation"),
+ verbose_name=_("Scientific monitor"),
on_delete=models.SET_NULL,
)
index = models.IntegerField(verbose_name=_("Index"), blank=True, null=True)
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 0afeee078..e3076d3e9 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -174,7 +174,7 @@
{% field_flex "Type" item.operation_type %}
{% field_flex_detail "Head scientist" item.scientist has_image %}
- {% field_flex_detail "In charge" item.in_charge has_image %}
+ {% field_flex_detail "Scientific monitor" item.in_charge has_image %}
{% field_flex_multiple "Collaborators" item.collaborators has_image %}
{% field_flex_detail "Operator" item.operator has_image %}
{% if item.closing.date %}