improved virtual meter editor in admin ui
parent
cc5269fd18
commit
7459c37ea1
|
@ -86,10 +86,10 @@ class VirtualMeterCollection:
|
||||||
if meta_result["equation"] is not None:
|
if meta_result["equation"] is not None:
|
||||||
expression = {'equation': meta_result["equation"], 'variables': []}
|
expression = {'equation': meta_result["equation"], 'variables': []}
|
||||||
|
|
||||||
query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id, SUBSTRING(v.name,2) as name2"
|
query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id "
|
||||||
" FROM tbl_virtual_meters vm, tbl_variables v "
|
" FROM tbl_virtual_meters vm, tbl_variables v "
|
||||||
" WHERE vm.id = %s AND v.virtual_meter_id = vm.id "
|
" WHERE vm.id = %s AND v.virtual_meter_id = vm.id "
|
||||||
" ORDER BY name2+0 ")
|
" ORDER BY SUBSTRING(v.name,2) + 0 ")
|
||||||
cursor.execute(query_variables, (meta_result['id'],))
|
cursor.execute(query_variables, (meta_result['id'],))
|
||||||
rows_variables = cursor.fetchall()
|
rows_variables = cursor.fetchall()
|
||||||
if rows_variables is not None:
|
if rows_variables is not None:
|
||||||
|
|
Loading…
Reference in New Issue