diff options
| -rw-r--r-- | ishtar/furnitures/admin.py | 4 | ||||
| -rw-r--r-- | ishtar/furnitures/forms.py | 14 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 9 |
3 files changed, 16 insertions, 11 deletions
diff --git a/ishtar/furnitures/admin.py b/ishtar/furnitures/admin.py index c3408b387..ee355c159 100644 --- a/ishtar/furnitures/admin.py +++ b/ishtar/furnitures/admin.py @@ -102,7 +102,7 @@ class DatingAdmin(admin.ModelAdmin): admin.site.register(models.Dating, DatingAdmin) class ContextRecordAdmin(HistorizedObjectAdmin): - list_display = ('label', 'lenght', 'width', + list_display = ('label', 'length', 'width', 'thickness', 'depth') list_filter = ('has_furniture',) search_fields = ('parcel__operation__name', "datings__period__label") @@ -151,7 +151,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin): admin.site.register(models.AdministrativeAct, AdministrativeActAdmin) class ContainerTypeAdmin(admin.ModelAdmin): - list_display = ('label', 'reference', 'lenght', 'width', 'height', + list_display = ('label', 'reference', 'length', 'width', 'height', 'volume') model = models.ContainerType diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 3487dbb94..c6d10787e 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1793,9 +1793,11 @@ class RecordSelect(forms.Form): widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ 'autocomplete-town', associated_model=models.Town), validators=[models.valid_id(models.Town)]) - parcel__operation__operation_type = forms.ChoiceField( - label=_("Operation type"), choices=models.OperationType.get_types()) - parcel__year = forms.IntegerField(label=_("Year")) + parcel__operation__year = forms.IntegerField(label=_("Year")) + datings__period = forms.ChoiceField(label=_("Period"), + choices=models.Period.get_types()) + unit = forms.ChoiceField(label=_("Unit type"), + choices=models.Unit.get_types()) class RecordFormSelection(forms.Form): form_label = _("Context record") @@ -1816,13 +1818,13 @@ class RecordFormSelection(forms.Form): class RecordFormGeneral(forms.Form): form_label = _("General") - associated_models = {'parcel':models.Parcel,} + associated_models = {'parcel':models.Parcel, 'unit':models.Unit} parcel = forms.ChoiceField(label=_("Parcel"), choices=[]) label = forms.CharField(label=_(u"Label"), validators=[validators.MaxLengthValidator(200)]) description = forms.CharField(label=_(u"Description"), widget=forms.Textarea, required=False) - lenght = forms.IntegerField(label=_(u"Lenght"), required=False) + length = forms.IntegerField(label=_(u"Length"), required=False) width = forms.IntegerField(label=_(u"Width"), required=False) thickness = forms.IntegerField(label=_(u"Thickness"), required=False) depth = forms.IntegerField(label=_(u"Depth"), required=False) @@ -1909,7 +1911,7 @@ record_modification_wizard = RecordModifWizard([ class RecordDeletionWizard(DeletionWizard): model = models.ContextRecord - fields = ['label', 'parcel', 'description', 'lenght', 'width', 'thickness', + fields = ['label', 'parcel', 'description', 'length', 'width', 'thickness', 'depth', 'location', 'datings', 'units', 'has_furniture', 'filling', 'interpretation', 'taq', 'taq_estimated', 'tpq', 'tpq_estimated'] diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index b32948709..d3269a69d 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -572,8 +572,11 @@ class Unit(GeneralType): return self.label class ContextRecord(BaseHistorizedItem, OwnPerms): - TABLE_COLS = ['parcel.town', 'parcel.section', 'parcel.parcel_number', - 'label',] + TABLE_COLS = ['parcel.town', 'parcel.operation.year', + 'parcel.operation.operation_code', + 'label', 'unit'] + if settings.COUNTRY == 'fr': + TABLE_COLS.insert(1, 'parcel.operation.code_patriarche') parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"), related_name='context_record') label = models.CharField(_(u"Label"), max_length=200) @@ -787,7 +790,7 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) if item]) class ContainerType(GeneralType): - lenght = models.IntegerField(_(u"Lenght")) + length = models.IntegerField(_(u"Length")) width = models.IntegerField(_(u"Width")) height = models.IntegerField(_(u"Height")) volume = models.IntegerField(_(u"Volume")) |