diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/models.py | 23 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 25 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/views.py | 8 |
4 files changed, 56 insertions, 4 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 4b7201bcc..a8a38c34d 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -31,6 +31,7 @@ from django.db.models.signals import post_save, post_delete, m2m_changed from django.template.defaultfilters import slugify from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy +from django.apps import apps from ishtar_common.data_importer import post_importer_action from ishtar_common.model_managers import ExternalIdManager, UUIDModelManager from ishtar_common.models import Document, GeneralType, get_external_id, \ @@ -155,6 +156,28 @@ class Warehouse(Address, DocumentItem, GeoItem, QRCodeItem, DashboardFormItem, return self.name @property + def number_divisions(self): + return Container.objects.filter( + location=self.pk, container_type__stationary=True).count() + + @property + def number_containers(self): + return Container.objects.filter( + location=self.pk, container_type__stationary=False).count() + + @property + def number_finds(self): + Find = apps.get_model("archaeological_finds", "Find") + return Find.objects.filter( + container__location_id=self.pk).count() + + @property + def number_owned_finds(self): + Find = apps.get_model("archaeological_finds", "Find") + return Find.objects.filter( + container_ref__location_id=self.pk).count() + + @property def short_label(self): return self.name diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index aec248b07..8e143aae9 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -60,12 +60,28 @@ <div class='row'> - {% include "ishtar/blocks/sheet_creation_section.html" %} + <dl class="col-6 col-md-3 flex-wrap"> + <dt>{% trans "Number of container" %}</dt> + <dd>{{item.number_containers}}</dd> + </dl> + <dl class="col-6 col-md-3 flex-wrap"> + <dt>{% trans "Number of divisions" %}</dt> + <dd>{{item.number_divisions}}</dd> + </dl> + <dl class="col-6 col-md-3 flex-wrap"> + <dt>{% trans "Number of finds" %}</dt> + <dd>{{item.number_finds}}</dd> + </dl> + <dl class="col-6 col-md-3 flex-wrap"> + <dt>{% trans "Number of owned finds" %}</dt> + <dd>{{item.number_owned_finds}}</dd> + </dl> {% field_flex_detail "Person in charge" item.person_in_charge %} {% field_flex_detail "Organization" item.organization %} - {% trans "Default divisions" as def_div_label %} + {% trans "Default divisions (imports)" as def_div_label %} {% field_flex def_div_label item.default_location_types|join:", " %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} + {% include "ishtar/blocks/sheet_creation_section.html" %} {% include "ishtar/blocks/sheet_json.html" %} </div> @@ -87,10 +103,11 @@ <div class="tab-pane fade" id="{{window_id}}-content" role="tabpanel" aria-labelledby="{{window_id}}-content-tab"> {% if item.containers.count %} + <h4>{% trans "Divisions" %}</h4> + {% dynamic_table_document '' 'divisions' 'location_id' item.pk 'TABLE_COLS' output %} <h4>{% trans "Containers" %}</h4> - {% dynamic_table_document '' 'containers' 'location_id' item.pk 'TABLE_COLS' output %} + {% dynamic_table_document '' 'non-divisions' 'location_id' item.pk 'TABLE_COLS' output %} {% else %} - <div class="alert alert-info"> <i class="fa fa-exclamation-triangle"></i> {% trans "No container inside this warehouse" %} diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index c1b589315..2f43d74a6 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -46,6 +46,10 @@ urlpatterns = [ views.new_container, name='new-container'), url(r'get-container/(?P<type>.+)?$', views.get_container, name='get-container'), + url(r'get-divisions-container/(?P<type>.+)?$', + views.get_divisions_container, name='get-divisions-container'), + url(r'get-non-divisions-container/(?P<type>.+)?$', + views.get_non_divisions_container, name='get-non-divisions-container'), url(r'get-warehouse/(?P<type>.+)?$', views.get_warehouse, name='get-warehouse'), url(r'get-warehouse-shortcut/(?P<type>.+)?$', diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 3a11c0e05..34def58cf 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -46,6 +46,14 @@ from archaeological_warehouse.wizards import PackagingWizard, WarehouseSearch, \ get_container = get_item(models.Container, 'get_container', 'container', search_form=forms.ContainerSelect) +get_divisions_container = get_item( + models.Container, 'get_container', 'container', + search_form=forms.ContainerSelect, + base_request={"container_type__stationary": 'True'}) +get_non_divisions_container = get_item( + models.Container, 'get_container', 'container', + search_form=forms.ContainerSelect, + base_request={"container_type__stationary": 'False'}) show_container = show_item(models.Container, 'container') get_warehouse = get_item(models.Warehouse, 'get_warehouse', 'warehouse', |