Commit ba006866 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Bugs fixed.

parent 553e449d
......@@ -95,7 +95,7 @@ def graph_mpl():
if 'index' in kwargs:
index = kwargs['index']
del kwargs['index']
ax = df[index].plot(**kwargs)
ax = df.ix[:,index].plot(**kwargs)
else:
ax = df.T.plot(**kwargs)
......
......@@ -184,6 +184,7 @@
'Labels': 'Etiquettes',
'Last Name': 'Nom de famille',
'Last name': 'Nom de famille',
'Last_Name': 'Last_Name',
'less or equal to': 'inférieur ou égal à',
'Level': 'Niveau',
'levels': 'niveaux',
......
......@@ -33,9 +33,11 @@ def_columns = \
def_features = \
"""[{
"ftype": "grouping",
"ftype": "groupingsummary",
"groupHeaderTpl": "{name}",
"startCollapsed": false
}, {
"ftype": "summary"
}]"""
......
......@@ -718,11 +718,11 @@ class Metric2D(BaseReport):
if config.group_field_y == 'year':
df = df.T
# transform year MultiIndex into Index (only for year pseudo field)
if config.group_field_x == 'year':
# transform year MultiIndex into Index
if isinstance(df.columns, pd.core.index.MultiIndex):
df.columns = [el[1] for el in df.columns]
elif config.group_field_y == 'year':
if isinstance(df.index, pd.core.index.MultiIndex):
df.index = [el[1] for el in df.index]
# data frame is persistent
......
......@@ -146,7 +146,9 @@ class MySelector(SelectorActiveItems):
db.history.coverage = Field.Virtual('coverage', self._coverage, ftype='double')
db.history.duration = Field.Virtual('duration', self._duration, ftype='double')
db.history.fte = Field.Virtual('fte', self._fte, ftype='double')
db.history.is_end = Field.Virtual('is_end', self._is_end, ftype='boolean')
db.history.is_over = Field.Virtual('is_over', self._is_over, ftype='boolean')
db.history.is_start = Field.Virtual('is_start', self._is_start, ftype='boolean')
def _age(self, row):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment