diff options
Diffstat (limited to 'archaeological_operations')
3 files changed, 9 insertions, 6 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 7bc50d0b0..802751963 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -2773,14 +2773,15 @@ class Parcel(LightHistorizedItem): class Meta: verbose_name = _("Parcel") verbose_name_plural = _("Parcels") - ordering = ("year", "section", "parcel_number") + ordering = ("town", "year", "section", "parcel_number") indexes = [ GinIndex(fields=["data"]), ] @property def short_label(self): - items = [str(item) for item in [self.section, self.parcel_number] if item] + items = [str(item) for item in [self.section, self.parcel_number, self.address] + if item] if self.public_domain: items.append(str(_("Public domain"))) return settings.JOINT.join(items) diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html index 6e7929ab5..c748b1530 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html @@ -6,17 +6,19 @@ <th>{% trans "Town" %}</th> <th>{% trans "Year" %}</th> <th>{% trans "Section" %}</th> - <th>{% trans "Parcels" %}</th> + <th>{% trans "Parcel" %}</th> + <th>{% trans "Address" %}</th> {#<th>{% trans "Owner" %}</th>#} </tr> </thead> <tbody> - {% for parcel in item.grouped_parcels %} + {% for parcel in item.parcels.all %} <tr> <td class='string'>{{parcel.town}}</td> <td>{{parcel.year|default_if_none:"-"}}</td> <td>{{parcel.section|default_if_none:"-"}}</td> - <td>{{parcel.parcel_numbers|join:", "}}</td> + <td>{{parcel.parcel_number|default_if_none:"-"}}</td> + <td>{{parcel.address|default_if_none:"-"}}</td> {#<td class='string'>{{operation.parcel.owner}}</td>#} </tr> {% empty %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 2afdb6c4c..88fa2356a 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -302,7 +302,7 @@ {% dynamic_table_document archaeologicalsites_label 'sites' 'operations' item.pk '' output %} {% endif %} - {% if item.grouped_parcels %} + {% if item.parcels.count %} {% trans "Associated parcels" as parcels_label %} {% include "ishtar/blocks/window_tables/parcels.html" %} {% endif %} |