diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-09-09 12:25:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | eb44d76df31c2ba612b4c1fb41bdf43d01fa7e22 (patch) | |
| tree | 0eaed830f776d8d6dee3af1776e701bef1a1f27d /archaeological_finds/forms.py | |
| parent | 5a0c6185ac0e8facc3386d48d056cc537617271c (diff) | |
| download | Ishtar-eb44d76df31c2ba612b4c1fb41bdf43d01fa7e22.tar.bz2 Ishtar-eb44d76df31c2ba612b4c1fb41bdf43d01fa7e22.zip | |
Find search: hierarchical search by container
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 46c388a13..eabe25fa0 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -50,7 +50,7 @@ from archaeological_finds.forms_treatments import TreatmentSelect, \ from archaeological_operations.models import Period, ArchaeologicalSite, \ RelationType as OpeRelationType from archaeological_operations.widgets import OAWidget -from archaeological_warehouse.models import Warehouse +from archaeological_warehouse.models import Warehouse, Container from bootstrap_datepicker.widgets import DatePicker from ishtar_common import widgets @@ -1268,36 +1268,52 @@ class FindSelectWarehouseModule(FindSelect): reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse), validators=[valid_id(Warehouse)]) - container_ref__location = forms.IntegerField( - label=_(u"Reference container - Warehouse (location)"), + container = forms.IntegerField( + label=_("Current container"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-container'), + associated_model=Container), + validators=[valid_id(Container)]) + container__location = forms.IntegerField( + label=_("Current container - Warehouse (location)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse), validators=[valid_id(Warehouse)]) - container_ref__responsible = forms.IntegerField( - label=_(u"Reference container - Warehouse (responsible)"), + """ + container__responsible = forms.IntegerField( + label=_(u"Current container - Warehouse (responsible)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse), validators=[valid_id(Warehouse)]) - container_ref__index = forms.IntegerField( - label=_(u"Reference container ID")) - container_ref__reference = forms.CharField( - label=_(u"Reference container ref.")) - container__location = forms.IntegerField( - label=_(u"Current container - Warehouse (location)"), + container__index = forms.IntegerField(label=_(u"Current container ID")) + container__reference = forms.CharField(label=_(u"Current container ref.")) + """ + container_ref = forms.IntegerField( + label=_("Reference container"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-container'), + associated_model=Container), + validators=[valid_id(Container)]) + container_ref__location = forms.IntegerField( + label=_("Reference container - Warehouse (location)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse), validators=[valid_id(Warehouse)]) - container__responsible = forms.IntegerField( - label=_(u"Current container - Warehouse (responsible)"), + """ + container_ref__responsible = forms.IntegerField( + label=_("Reference container - Warehouse (responsible)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=Warehouse), validators=[valid_id(Warehouse)]) - container__index = forms.IntegerField(label=_(u"Current container ID")) - container__reference = forms.CharField(label=_(u"Current container ref.")) + container_ref__index = forms.IntegerField( + label=_(u"Reference container ID")) + container_ref__reference = forms.CharField( + label=_(u"Reference container ref.")) + """ class FindFormSelection(LockForm, CustomFormSearch): |