aboutsummaryrefslogtreecommitdiff
path: root/web/app/model
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-09-06 23:56:08 +1200
committerGitHub <noreply@github.com>2017-09-06 23:56:08 +1200
commit019fccd1bd4a123fe93228462b33f14889b23394 (patch)
tree5323e6bed0fcf18caa4847b47a2acecc9b060198 /web/app/model
parentf819f04cc8fbc85c299ca647707364a2436d8987 (diff)
parentae877a48698f28beae82753feae9b4a8e0993ca2 (diff)
downloadtrackermap-web-019fccd1bd4a123fe93228462b33f14889b23394.tar.gz
trackermap-web-019fccd1bd4a123fe93228462b33f14889b23394.tar.bz2
trackermap-web-019fccd1bd4a123fe93228462b33f14889b23394.zip
Merge pull request #573 from Abyss777/units_attributes
Move units to attributes and add volume units
Diffstat (limited to 'web/app/model')
-rw-r--r--web/app/model/ReportStop.js4
-rw-r--r--web/app/model/ReportSummary.js4
-rw-r--r--web/app/model/ReportTrip.js4
-rw-r--r--web/app/model/Server.js9
-rw-r--r--web/app/model/User.js9
5 files changed, 12 insertions, 18 deletions
diff --git a/web/app/model/ReportStop.js b/web/app/model/ReportStop.js
index c0ca4004..1867f73b 100644
--- a/web/app/model/ReportStop.js
+++ b/web/app/model/ReportStop.js
@@ -46,5 +46,9 @@ Ext.define('Traccar.model.ReportStop', {
}, {
name: 'positionId',
type: 'int'
+ }, {
+ name: 'spentFuel',
+ type: 'float',
+ convert: Traccar.AttributeFormatter.getConverter('spentFuel')
}]
});
diff --git a/web/app/model/ReportSummary.js b/web/app/model/ReportSummary.js
index 5cfbdcd7..4bc78731 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -41,5 +41,9 @@ Ext.define('Traccar.model.ReportSummary', {
}, {
name: 'engineHours',
type: 'int'
+ }, {
+ name: 'spentFuel',
+ type: 'float',
+ convert: Traccar.AttributeFormatter.getConverter('spentFuel')
}]
});
diff --git a/web/app/model/ReportTrip.js b/web/app/model/ReportTrip.js
index edff02b5..9004b86d 100644
--- a/web/app/model/ReportTrip.js
+++ b/web/app/model/ReportTrip.js
@@ -56,6 +56,10 @@ Ext.define('Traccar.model.ReportTrip', {
name: 'endAddress',
type: 'string'
}, {
+ name: 'spentFuel',
+ type: 'float',
+ convert: Traccar.AttributeFormatter.getConverter('spentFuel')
+ }, {
name: 'driverUniqueId',
type: 'string'
}, {
diff --git a/web/app/model/Server.js b/web/app/model/Server.js
index 286f9da3..b8a88756 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -41,12 +41,6 @@ Ext.define('Traccar.model.Server', {
name: 'mapUrl',
type: 'string'
}, {
- name: 'distanceUnit',
- type: 'string'
- }, {
- name: 'speedUnit',
- type: 'string'
- }, {
name: 'latitude',
type: 'float'
}, {
@@ -65,9 +59,6 @@ Ext.define('Traccar.model.Server', {
name: 'coordinateFormat',
type: 'string'
}, {
- name: 'timezone',
- type: 'string'
- }, {
name: 'attributes'
}],
diff --git a/web/app/model/User.js b/web/app/model/User.js
index a77deebf..c47a8d16 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -44,12 +44,6 @@ Ext.define('Traccar.model.User', {
name: 'map',
type: 'string'
}, {
- name: 'distanceUnit',
- type: 'string'
- }, {
- name: 'speedUnit',
- type: 'string'
- }, {
name: 'latitude',
type: 'float'
}, {
@@ -84,9 +78,6 @@ Ext.define('Traccar.model.User', {
name: 'token',
type: 'string'
}, {
- name: 'timezone',
- type: 'string'
- }, {
name: 'attributes'
}],