Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
tev
plugin_event
Commits
ba006866
Commit
ba006866
authored
Feb 19, 2015
by
LE GAC Renaud
Browse files
Bugs fixed.
parent
553e449d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
controllers/report.py
controllers/report.py
+1
-1
languages/fr-fr.py
languages/fr-fr.py
+1
-0
models/db0_lists.py
models/db0_lists.py
+3
-1
modules/report_objects.py
modules/report_objects.py
+3
-3
modules/selector.py
modules/selector.py
+2
-0
No files found.
controllers/report.py
View file @
ba006866
...
...
@@ -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
)
...
...
languages/fr-fr.py
View file @
ba006866
...
...
@@ -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'
,
...
...
models/db0_lists.py
View file @
ba006866
...
...
@@ -33,9 +33,11 @@ def_columns = \
def_features
=
\
"""[{
"ftype": "grouping",
"ftype": "grouping
summary
",
"groupHeaderTpl": "{name}",
"startCollapsed": false
}, {
"ftype": "summary"
}]"""
...
...
modules/report_objects.py
View file @
ba006866
...
...
@@ -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
]
el
if
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
...
...
modules/selector.py
View file @
ba006866
...
...
@@ -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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment