summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_finds/forms_treatments.py38
-rw-r--r--archaeological_finds/ishtar_menu.py2
-rw-r--r--archaeological_finds/models_treatments.py33
-rw-r--r--archaeological_finds/templates/ishtar/sheet_treatment.html2
-rw-r--r--archaeological_finds/templates/ishtar/sheet_treatmentfile.html2
-rw-r--r--archaeological_finds/wizards.py4
6 files changed, 44 insertions, 37 deletions
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 12d25dfdb..6627a3658 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -243,11 +243,11 @@ class TreatmentModifyForm(BaseTreatmentForm):
class TreatmentFormFileChoice(forms.Form):
- form_label = _(u"Associated file")
+ form_label = _(u"Associated request")
associated_models = {'file': models.TreatmentFile, }
currents = {'file': models.TreatmentFile}
file = forms.IntegerField(
- label=_(u"Treatment file"),
+ label=_(u"Treatment request"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-treatmentfile'),
associated_model=models.TreatmentFile),
@@ -339,7 +339,7 @@ class TreatmentFileSelect(TableSelect):
internal_reference = forms.CharField(label=_(u"Internal ref."))
year = forms.IntegerField(label=_(u"Year"))
index = forms.IntegerField(label=_(u"Index"))
- type = forms.ChoiceField(label=_(u"Treatment file type"), choices=[])
+ type = forms.ChoiceField(label=_(u"Type"), choices=[])
in_charge = forms.IntegerField(
label=_(u"In charge"),
widget=widgets.JQueryAutoComplete(
@@ -366,7 +366,7 @@ class TreatmentFileSelect(TableSelect):
class TreatmentFileFormSelection(forms.Form):
- form_label = _("Treatment file search")
+ form_label = _("Treatment request search")
associated_models = {'pk': models.TreatmentFile}
currents = {'pk': models.TreatmentFile}
pk = forms.IntegerField(
@@ -378,7 +378,7 @@ class TreatmentFileFormSelection(forms.Form):
class TreatmentFileForm(ManageOldType, forms.Form):
- form_label = _(u"Treatment file")
+ form_label = _(u"Treatment request")
base_models = ['treatment_type_type']
associated_models = {
'type': models.TreatmentFileType, 'in_charge': Person,
@@ -396,7 +396,7 @@ class TreatmentFileForm(ManageOldType, forms.Form):
external_id = forms.CharField(
label=_(u"External ref."), max_length=200, required=False)
type = forms.ChoiceField(
- label=_(u"Treatment file type"), choices=[])
+ label=_(u"Type"), choices=[])
in_charge = forms.IntegerField(
label=_(u"Responsible"),
widget=widgets.JQueryAutoComplete(
@@ -482,12 +482,14 @@ class AdministrativeActTreatmentFileSelect(TableSelect):
signature_date_before = forms.DateField(
label=_(u"Signature date before"), widget=widgets.JQueryDate)
treatment_file__name = forms.CharField(
- label=_(u"Treatment file name"), max_length=200)
- treatment_file__year = forms.IntegerField(label=_(u"Treatment file year"))
- treatment_file__index = forms.IntegerField(label=_(u"Treatment file index"))
+ label=_(u"Treatment request name"), max_length=200)
+ treatment_file__year = forms.IntegerField(
+ label=_(u"Treatment request year"))
+ treatment_file__index = forms.IntegerField(
+ label=_(u"Treatment request index"))
treatment_file__internal_reference = forms.CharField(
- max_length=200, label=_(u"Treatment file internal reference"))
- treatment_file__type = forms.ChoiceField(label=_(u"Treatment file type"),
+ max_length=200, label=_(u"Treatment request internal reference"))
+ treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"),
choices=[])
history_modifier = forms.IntegerField(
label=_(u"Modified by"),
@@ -544,7 +546,7 @@ SourceTreatmentFormSelection = get_form_selection(
_(u"You should select a treatment."))
SourceTreatmentFileFormSelection = get_form_selection(
- 'SourceTreatmentFileFormSelection', _(u"Treatment file search"),
+ 'SourceTreatmentFileFormSelection', _(u"Treatment request search"),
'treatment_file',
models.TreatmentFile, TreatmentFileSelect, 'get-treatmentfile',
_(u"You should select a treatment file."))
@@ -576,12 +578,14 @@ TreatmentSourceFormSelection = get_form_selection(
class TreatmentFileSourceSelect(SourceSelect):
treatment_file__name = forms.CharField(
- label=_(u"Treatment file name"), max_length=200)
- treatment_file__year = forms.IntegerField(label=_(u"Treatment file year"))
- treatment_file__index = forms.IntegerField(label=_(u"Treatment file index"))
+ label=_(u"Treatment request name"), max_length=200)
+ treatment_file__year = forms.IntegerField(
+ label=_(u"Treatment request year"))
+ treatment_file__index = forms.IntegerField(
+ label=_(u"Treatment request index"))
treatment_file__internal_reference = forms.CharField(
- max_length=200, label=_(u"Treatment file internal reference"))
- treatment_file__type = forms.ChoiceField(label=_(u"Treatment file type"),
+ max_length=200, label=_(u"Treatment request internal reference"))
+ treatment_file__type = forms.ChoiceField(label=_(u"Treatment request type"),
choices=[])
def __init__(self, *args, **kwargs):
diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py
index 4b530363b..12bcfc19d 100644
--- a/archaeological_finds/ishtar_menu.py
+++ b/archaeological_finds/ishtar_menu.py
@@ -104,7 +104,7 @@ MENU_SECTIONS = [
])),
(60,
SectionItem(
- 'treatmentfle_management', _(u"Treatment file"),
+ 'treatmentfle_management', _(u"Treatment request"),
profile_restriction='warehouse',
childs=[
MenuItem('treatmentfle_search',
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index b903a8997..7586c7eca 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -98,8 +98,9 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
year = models.IntegerField(_(u"Year"),
default=lambda: datetime.datetime.now().year)
index = models.IntegerField(_(u"Index"), default=1)
- file = models.ForeignKey('TreatmentFile', related_name='treatments',
- blank=True, null=True)
+ file = models.ForeignKey(
+ 'TreatmentFile', related_name='treatments', blank=True, null=True,
+ verbose_name=_(u"Associated request"))
treatment_types = models.ManyToManyField(
TreatmentType, verbose_name=_(u"Treatment type"))
treatment_state = models.ForeignKey(
@@ -420,8 +421,8 @@ class FindTreatments(AbsFindTreatments):
class TreatmentFileType(GeneralType):
class Meta:
- verbose_name = _(u"Treatment file type")
- verbose_name_plural = _(u"Treatment file types")
+ verbose_name = _(u"Treatment request type")
+ verbose_name_plural = _(u"Treatment request types")
ordering = ('label',)
post_save.connect(post_save_cache, sender=TreatmentFileType)
post_delete.connect(post_save_cache, sender=TreatmentFileType)
@@ -468,19 +469,20 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
history = HistoricalRecords()
class Meta:
- verbose_name = _(u"Treatment file")
- verbose_name_plural = _(u"Treatment files")
+ verbose_name = _(u"Treatment request")
+ verbose_name_plural = _(u"Treatment requests")
unique_together = ('year', 'index')
permissions = (
- ("view_filetreatement", ugettext(u"Can view all Treatment files")),
+ ("view_filetreatement",
+ ugettext(u"Can view all Treatment requests")),
("view_own_filetreatement",
- ugettext(u"Can view own Treatment file")),
+ ugettext(u"Can view own Treatment request")),
("add_own_filetreatement",
- ugettext(u"Can add own Treatment file")),
+ ugettext(u"Can add own Treatment request")),
("change_own_filetreatement",
- ugettext(u"Can change own Treatment file")),
+ ugettext(u"Can change own Treatment request")),
("delete_own_filetreatement",
- ugettext(u"Can delete own Treatment file")),
+ ugettext(u"Can delete own Treatment request")),
)
ordering = ('cached_label',)
@@ -489,7 +491,7 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
@property
def short_class_name(self):
- return _(u"Treatment file")
+ return _(u"Treatment request")
@classmethod
def get_query_owns(cls, user):
@@ -550,14 +552,15 @@ class TreatmentSource(Source):
class TreatmentFileSource(Source):
treatment_file = models.ForeignKey(
- TreatmentFile, verbose_name=_(u"Treatment file"), related_name="source")
+ TreatmentFile, verbose_name=_(u"Treatment request"),
+ related_name="source")
BOOL_FIELDS = ['duplicate']
TABLE_COLS = ['treatment_file__cached_label'] + Source.TABLE_COLS
SHOW_URL = 'show-treatmentfilesource'
class Meta:
- verbose_name = _(u"Treatment file documentation")
- verbose_name_plural = _(u"Treament file documentations")
+ verbose_name = _(u"Treatment request documentation")
+ verbose_name_plural = _(u"Treatment request documentations")
@property
def owner(self):
diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html
index a06c10b3c..1bf5209fb 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatment.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatment.html
@@ -25,7 +25,7 @@
<ul class='form-flex'>
{% field_li_multiple "Treatment type" item.treatment_types %}
{% field_li "State" item.treatment_state %}
- {% field_li_detail "Associated file" item.file %}
+ {% field_li_detail "Associated request" item.file %}
{% field_li "Location" item.location %}
{% field_li "Container" item.container %}
{% field_li "Responsible" item.person %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index 8988d9595..7159493c5 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -2,7 +2,7 @@
{% load i18n window_field from_dict link_to_window window_tables window_header humanize %}
{% load url from future %}
-{% block head_title %}{% trans "Treatment file" %}{% endblock %}
+{% block head_title %}{% trans "Treatment request" %}{% endblock %}
{% block content %}
{% window_nav item window_id 'show-treatmentfile' 'treatmentfile_modify' %}
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index d7e3dbac0..dab4a76d4 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -180,8 +180,8 @@ class TreatmentFileAdministrativeActWizard(
pk = self.session_get_value(form_key, "pk")
try:
return (
- (_(u"Treatment file"),
- unicode(models.Operation.objects.get(pk=pk))),
+ (_(u"Treatment request"),
+ unicode(models.TreatmentFile.objects.get(pk=pk))),
)
except models.TreatmentFile.DoesNotExist:
return
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 00:07:15 +0000