From 1edfec60e54b26f3cd7970075b58bb69920b37f7 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 6 Sep 2017 13:28:48 +0500
Subject: Move units to attributes and add volume units

---
 web/app/model/ReportStop.js    | 4 ++++
 web/app/model/ReportSummary.js | 4 ++++
 web/app/model/ReportTrip.js    | 4 ++++
 web/app/model/Server.js        | 9 ---------
 web/app/model/User.js          | 9 ---------
 5 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'web/app/model')

diff --git a/web/app/model/ReportStop.js b/web/app/model/ReportStop.js
index c0ca400..1867f73 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 5cfbdcd..4bc7873 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 edff02b..9004b86 100644
--- a/web/app/model/ReportTrip.js
+++ b/web/app/model/ReportTrip.js
@@ -55,6 +55,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 286f9da..b8a8875 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -40,12 +40,6 @@ Ext.define('Traccar.model.Server', {
     }, {
         name: 'mapUrl',
         type: 'string'
-    }, {
-        name: 'distanceUnit',
-        type: 'string'
-    }, {
-        name: 'speedUnit',
-        type: 'string'
     }, {
         name: 'latitude',
         type: 'float'
@@ -64,9 +58,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 a77deeb..c47a8d1 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -43,12 +43,6 @@ Ext.define('Traccar.model.User', {
     }, {
         name: 'map',
         type: 'string'
-    }, {
-        name: 'distanceUnit',
-        type: 'string'
-    }, {
-        name: 'speedUnit',
-        type: 'string'
     }, {
         name: 'latitude',
         type: 'float'
@@ -83,9 +77,6 @@ Ext.define('Traccar.model.User', {
     }, {
         name: 'token',
         type: 'string'
-    }, {
-        name: 'timezone',
-        type: 'string'
     }, {
         name: 'attributes'
     }],
-- 
cgit v1.2.3