IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

addded mass units, #9265 (#9273)

Browse Source
This commit is contained in:
Andrew Prokhorenkov 2017-09-18 11:13:56 +02:00 committed by Torkel Ödegaard
parent a20c419583
commit 00b18a8aea
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/core/utils/kbn.js
View File

@ -478,6 +478,12 @@ function($, _) {
kbn.valueFormats.lengthkm = kbn.formatBuilders.decimalSIPrefix('m', 1); kbn.valueFormats.lengthkm = kbn.formatBuilders.decimalSIPrefix('m', 1);
kbn.valueFormats.lengthmi = kbn.formatBuilders.fixedUnit('mi'); kbn.valueFormats.lengthmi = kbn.formatBuilders.fixedUnit('mi');
// Mass
kbn.valueFormats.massmg = kbn.formatBuilders.decimalSIPrefix('g', -1);
kbn.valueFormats.massg = kbn.formatBuilders.decimalSIPrefix('g');
kbn.valueFormats.masskg = kbn.formatBuilders.decimalSIPrefix('g', 1);
kbn.valueFormats.masst = kbn.formatBuilders.fixedUnit('t');
// Velocity // Velocity
kbn.valueFormats.velocityms = kbn.formatBuilders.fixedUnit('m/s'); kbn.valueFormats.velocityms = kbn.formatBuilders.fixedUnit('m/s');
kbn.valueFormats.velocitykmh = kbn.formatBuilders.fixedUnit('km/h'); kbn.valueFormats.velocitykmh = kbn.formatBuilders.fixedUnit('km/h');
@ -797,6 +803,15 @@ function($, _) {
{text: 'mile (mi)', value: 'lengthmi'}, {text: 'mile (mi)', value: 'lengthmi'},
] ]
}, },
{
text: 'mass',
submenu: [
{text: 'milligram (mg)', value: 'massmg'},
{text: 'gram (g)', value: 'massg' },
{text: 'kilogram (kg)', value: 'masskg'},
{text: 'metric ton (t)', value: 'masst' },
]
},
{ {
text: 'velocity', text: 'velocity',
submenu: [ submenu: [