Merge pull request #573 from Abyss777/units_attributes

Move units to attributes and add volume units

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'
     }],