Commit 83e8d66c authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

separate metrics in two parts: 1d , 2d

parent f0812128
......@@ -319,8 +319,10 @@
'The lists': 'Les listes',
'the lists': 'les listes',
'The metrics': 'Les métriques',
'The metrics 1d': 'Les métriques 1d',
'the metrics 1d': 'les métriques 1d',
'the metrics 2d': 'les métriques 2d',
'The metrics 2d': 'Les métriques 2d',
"The report id '%s' is unknown.": "The report id '%s' is unknown.",
'Time': 'Temps',
'Timestamp': 'Timestamp',
......
......@@ -111,10 +111,10 @@ for row in db(db.lists.id > 0).select(orderby=db.lists.name):
#-------------------------------------------------------------------------------
#
# METRIC
# METRIC 1D
#
#-------------------------------------------------------------------------------
metricNode = Node(T('The metrics'))
metric1dNode = Node(T('The metrics 1d'))
for row in db(db.metrics1d.id > 0).select(orderby=db.metrics1d.name):
......@@ -122,7 +122,16 @@ for row in db(db.metrics1d.id > 0).select(orderby=db.metrics1d.name):
baseUrl=URL('report', 'grid'),
baseParams={'id_metrics1d': row.id})
metricNode.add_child(row.name, leaf)
metric1dNode.add_child(row.name, leaf)
metric1dNode.sort_children()
#-------------------------------------------------------------------------------
#
# METRIC 2D
#
#-------------------------------------------------------------------------------
metric2dNode = Node(T('The metrics 2d'))
for row in db(db.metrics2d.id > 0).select(orderby=db.metrics2d.name):
......@@ -130,9 +139,9 @@ for row in db(db.metrics2d.id > 0).select(orderby=db.metrics2d.name):
baseUrl=URL('report', 'grid'),
baseParams={'id_metrics2d': row.id})
metricNode.add_child(row.name, leaf)
metric2dNode.add_child(row.name, leaf)
metricNode.sort_children()
metric2dNode.sort_children()
#-------------------------------------------------------------------------------
#
......@@ -161,7 +170,8 @@ nodes = [helpNode,
metaNode,
eventNode,
listNode,
metricNode,
metric1dNode,
metric2dNode,
graphNode]
viewportModifier = dbui.ViewportModifier()
......
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