diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-01 14:44:38 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-01 14:44:38 +0100 |
| commit | 6e76724c700da8a77cc64c96262c6a685ad5382b (patch) | |
| tree | 2f72b6a7238cb9ca83fa7675b3ee27f747a05628 /ishtar/furnitures/forms.py | |
| parent | 989c625b2b4f580822c0e59146d36e66342accea (diff) | |
| download | Ishtar-6e76724c700da8a77cc64c96262c6a685ad5382b.tar.bz2 Ishtar-6e76724c700da8a77cc64c96262c6a685ad5382b.zip | |
Better management of CSV files (refs #159) and grids
Diffstat (limited to 'ishtar/furnitures/forms.py')
| -rw-r--r-- | ishtar/furnitures/forms.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index e436d0664..d73f3e849 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -668,12 +668,14 @@ class FileWizard(Wizard): return res class FileSelect(forms.Form): - town = forms.IntegerField(label=_(u"Town"), + towns = forms.IntegerField(label=_(u"Town"), widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ 'autocomplete-town', associated_model=models.Town), validators=[models.valid_id(models.Town)]) file_type = forms.ChoiceField(label=_("File type"), choices=models.FileType.get_types()) + saisine_type = forms.ChoiceField(label=_("Saisine type"), + choices=models.SaisineType.get_types()) year = forms.IntegerField(label=_("Year")) class FileFormSelection(forms.Form): @@ -682,7 +684,7 @@ class FileFormSelection(forms.Form): currents = {'pk':models.File} pk = forms.IntegerField(label="", required=False, widget=widgets.JQueryJqGrid(reverse_lazy('get-file'), - FileSelect(), ['file_type', 'year']), + FileSelect(), models.File), validators=[models.valid_id(models.File)]) def clean(self): @@ -1161,6 +1163,8 @@ class OperationSelect(forms.Form): validators=[models.valid_id(models.Town)]) operation_type = forms.ChoiceField(label=_("Operation type"), choices=models.OperationType.get_types()) + remains = forms.ChoiceField(label=_("Remains"), + choices=models.RemainType.get_types()) year = forms.IntegerField(label=_("Year")) class OperationFormSelection(forms.Form): @@ -1169,7 +1173,7 @@ class OperationFormSelection(forms.Form): currents = {'pk':models.Operation} pk = forms.IntegerField(label="", required=False, widget=widgets.JQueryJqGrid(reverse_lazy('get-operation'), - OperationSelect(), ['operation_type', 'year']), + OperationSelect(), models.Operation), validators=[models.valid_id(models.Operation)]) def clean(self): |