From 3fa3ce1a12b809d0d5e802425b096ef0bccefa85 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 6 Jan 2016 14:27:10 -0800 Subject: [PATCH] Fixing resampling options --- panoramix/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panoramix/forms.py b/panoramix/forms.py index d95ee8b192a..f94fd83ee4b 100644 --- a/panoramix/forms.py +++ b/panoramix/forms.py @@ -187,11 +187,11 @@ class FormFactory(object): "column in the table editor")), 'resample_rule': FreeFormSelectField( 'Resample Rule', default='', - choices=self.choicify(('1M', '1H', '1D', '7D', '1M', '1Y')), + choices=self.choicify(('1T', '1H', '1D', '7D', '1M', '1AS')), description=("Pandas resample rule")), 'resample_how': FreeFormSelectField( 'Resample How', default='', - choices=self.choicify(('', 'avg', 'sum',)), + choices=self.choicify(('', 'mean', 'sum', 'median')), description=("Pandas resample how")), 'resample_fillmethod': FreeFormSelectField( 'Resample Fill Method', default='',