|
@@ -95,7 +95,7 @@ class Dataset(poobrains.auth.Protected):
|
95
|
95
|
|
96
|
96
|
|
97
|
97
|
@name.setter
|
98
|
|
- def set_name(self, value):
|
|
98
|
+ def name(self, value):
|
99
|
99
|
self._name = value
|
100
|
100
|
|
101
|
101
|
|
|
@@ -634,7 +634,9 @@ class EditorNewSessionFieldset(poobrains.form.Fieldset):
|
634
|
634
|
'plot_kind': 'scatter',
|
635
|
635
|
'action': None,
|
636
|
636
|
'action_data': None,
|
637
|
|
- 'data': None
|
|
637
|
+ 'title': None,
|
|
638
|
+ 'description': None,
|
|
639
|
+ 'data': None,
|
638
|
640
|
}
|
639
|
641
|
|
640
|
642
|
return redirect(DataEditor.url(handle=handle, mode='full'))
|
|
@@ -708,8 +710,10 @@ class EditorLoadFieldset(poobrains.form.Fieldset):
|
708
|
710
|
dataset = StoredDataset.load(dataset_name)
|
709
|
711
|
dataset.permissions['read'].check(g.user)
|
710
|
712
|
instance.dataset = dataset
|
711
|
|
- session['editor-sessions'][instance.handle_string]['data'] = instance.dataset.data.to_dict()
|
712
|
713
|
session['editor-sessions'][instance.handle_string]['action'] = None
|
|
714
|
+ session['editor-sessions'][instance.handle_string]['title'] = instance.dataset.title
|
|
715
|
+ session['editor-sessions'][instance.handle_string]['description'] = instance.dataset.description
|
|
716
|
+ session['editor-sessions'][instance.handle_string]['data'] = instance.dataset.data.to_dict()
|
713
|
717
|
except StoredDataset.DoesNotExist:
|
714
|
718
|
flash('Unknown stored dataset: %s' % dataset_name, 'error')
|
715
|
719
|
|
|
@@ -738,8 +742,10 @@ class EditorLoadFieldset(poobrains.form.Fieldset):
|
738
|
742
|
|
739
|
743
|
dataset.permissions['read'].check(g.user)
|
740
|
744
|
instance.dataset = dataset
|
741
|
|
- session['editor-sessions'][instance.handle_string]['data'] = instance.dataset.data.to_dict()
|
742
|
745
|
session['editor-sessions'][instance.handle_string]['action'] = None
|
|
746
|
+ session['editor-sessions'][instance.handle_string]['title'] = instance.dataset.title
|
|
747
|
+ session['editor-sessions'][instance.handle_string]['description'] = instance.dataset.description
|
|
748
|
+ session['editor-sessions'][instance.handle_string]['data'] = instance.dataset.data.to_dict()
|
743
|
749
|
del(self.fields['dynamic'])
|
744
|
750
|
self.fields['dataset'].readonly = False
|
745
|
751
|
|
|
@@ -787,7 +793,10 @@ class DataEditor(poobrains.auth.ProtectedForm):
|
787
|
793
|
editor_session = session['editor-sessions'][self.handle_string]
|
788
|
794
|
|
789
|
795
|
self.dataset = Dataset()
|
|
796
|
+ self.dataset.name = self.handle_string
|
790
|
797
|
self.dataset.plot_kind = editor_session['plot_kind'] or 'scatter'
|
|
798
|
+ self.dataset.title = editor_session['title']
|
|
799
|
+ self.dataset.description = editor_session['description']
|
791
|
800
|
self.dataset.data = pandas.DataFrame.from_dict(editor_session['data'])
|
792
|
801
|
|
793
|
802
|
if len(self.dataset.data):
|
|
@@ -805,20 +814,6 @@ class DataEditor(poobrains.auth.ProtectedForm):
|
805
|
814
|
self.save_dataset = poobrains.form.Button(type='submit', label='Save dataset')
|
806
|
815
|
|
807
|
816
|
|
808
|
|
- #@poobrains.helpers.themed
|
809
|
|
- #def view(self, mode='full', **kwargs):
|
810
|
|
-
|
811
|
|
- #if not self.handle_string:
|
812
|
|
- # return redirect(type(self)(handle=new_editor_handle()).url('full'))
|
813
|
|
-
|
814
|
|
- #if self.handle_string and self.handle_string in session:
|
815
|
|
- # #self.dataset = session[self.handle_string]
|
816
|
|
- # self.dataset = Dataset()
|
817
|
|
- # self.dataset.data = pandas.DataFrame.from_dict(session['editor-sessions'][self.handle_string])
|
818
|
|
-
|
819
|
|
- #return poobrains.helpers.ThemedPassthrough(super(DataEditor, self).view(mode=mode, **kwargs))
|
820
|
|
-
|
821
|
|
-
|
822
|
817
|
def process(self, submit):
|
823
|
818
|
|
824
|
819
|
if submit.startswith('new.'):
|
|
@@ -826,6 +821,8 @@ class DataEditor(poobrains.auth.ProtectedForm):
|
826
|
821
|
|
827
|
822
|
elif submit.startswith('load.'):
|
828
|
823
|
self.fields['load'].process(submit, self)
|
|
824
|
+ if len(self.dataset.data):
|
|
825
|
+ self.plot_kind = PlotKindFieldset(self.handle_string)
|
829
|
826
|
#session[self.handle_string] = self.data
|
830
|
827
|
|
831
|
828
|
elif submit.startswith('plot_kind.'):
|