From 2fa0652494c511a87516fd71e363600b3ef0a1a6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Sep 2015 11:22:56 +1200 Subject: Change model classes formatting --- web/app/model/Command.js | 14 +++++++---- web/app/model/Device.js | 15 ++++++++---- web/app/model/Parameter.js | 15 ++++++++---- web/app/model/Position.js | 58 +++++++++++++++++++++++++++++++++------------- web/app/model/Server.js | 47 ++++++++++++++++++++++++++----------- web/app/model/User.js | 51 +++++++++++++++++++++++++++++----------- 6 files changed, 142 insertions(+), 58 deletions(-) (limited to 'web') diff --git a/web/app/model/Command.js b/web/app/model/Command.js index 642e5d13d..45e0a6b96 100644 --- a/web/app/model/Command.js +++ b/web/app/model/Command.js @@ -18,9 +18,13 @@ Ext.define('Traccar.model.Command', { extend: 'Ext.data.Model', identifier: 'negative', - fields: [ - { name: 'deviceId', type: 'int' }, - { name: 'type', type: 'string' }, - { name: 'other' } - ] + fields: [{ + name: 'deviceId', + type: 'int' + }, { + name: 'type', + type: 'string' + }, { + name: 'other' + }] }); diff --git a/web/app/model/Device.js b/web/app/model/Device.js index 77dfa0f05..e9ed1f680 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -18,9 +18,14 @@ Ext.define('Traccar.model.Device', { extend: 'Ext.data.Model', identifier: 'negative', - fields: [ - { name: 'id', type: 'int' }, - { name: 'name', type: 'string' }, - { name: 'uniqueId', type: 'string' } - ] + fields: [{ + name: 'id', + type: 'int' + }, { + name: 'name', + type: 'string' + }, { + name: 'uniqueId', + type: 'string' + }] }); diff --git a/web/app/model/Parameter.js b/web/app/model/Parameter.js index b08156a2a..30aa67719 100644 --- a/web/app/model/Parameter.js +++ b/web/app/model/Parameter.js @@ -17,9 +17,14 @@ Ext.define('Traccar.model.Parameter', { extend: 'Ext.data.Model', - fields: [ - { name: 'priority', type: 'int' }, - { name: 'name', type: 'string' }, - { name: 'value', type: 'string' } - ] + fields: [{ + name: 'priority', + type: 'int' + }, { + name: 'name', + type: 'string' + }, { + name: 'value', + type: 'string' + }] }); diff --git a/web/app/model/Position.js b/web/app/model/Position.js index c2b83bb87..f070eb710 100644 --- a/web/app/model/Position.js +++ b/web/app/model/Position.js @@ -18,20 +18,46 @@ Ext.define('Traccar.model.Position', { extend: 'Ext.data.Model', identifier: 'negative', - fields: [ - { name: 'id', type: 'int' }, - { name: 'protocol', type: 'string' }, - { name: 'deviceId', type: 'int' }, - { name: 'serverTime', type: 'date' }, - { name: 'deviceTime', type: 'date' }, - { name: 'fixTime', type: 'date' }, - { name: 'valid', type: 'boolean' }, - { name: 'latitude', type: 'float' }, - { name: 'longitude', type: 'float' }, - { name: 'altitude', type: 'float' }, - { name: 'speed', type: 'float' }, - { name: 'course', type: 'float' }, - { name: 'address', type: 'string' }, - { name: 'other' } - ] + fields: [{ + name: 'id', + type: 'int' + }, { + name: 'protocol', + type: 'string' + }, { + name: 'deviceId', + type: 'int' + }, { + name: 'serverTime', + type: 'date' + }, { + name: 'deviceTime', + type: 'date' + }, { + name: 'fixTime', + type: 'date' + }, { + name: 'valid', + type: 'boolean' + }, { + name: 'latitude', + type: 'float' + }, { + name: 'longitude', + type: 'float' + }, { + name: 'altitude', + type: 'float' + }, { + name: 'speed', + type: 'float' + }, { + name: 'course', + type: 'float' + }, { + name: 'address', + type: 'string' + }, { + name: 'other' + }] }); diff --git a/web/app/model/Server.js b/web/app/model/Server.js index b21f28299..2ed2c456f 100644 --- a/web/app/model/Server.js +++ b/web/app/model/Server.js @@ -18,19 +18,40 @@ Ext.define('Traccar.model.Server', { extend: 'Ext.data.Model', identifier: 'negative', - fields: [ - { name: 'id', type: 'int' }, - { name: 'registration', type: 'boolean' }, - { name: 'map', type: 'string' }, - { name: 'bingKey', type: 'string' }, - { name: 'mapUrl', type: 'string' }, - { name: 'language', type: 'string' }, - { name: 'distanceUnit', type: 'string' }, - { name: 'speedUnit', type: 'string' }, - { name: 'latitude', type: 'float' }, - { name: 'longitude', type: 'float' }, - { name: 'zoom', type: 'int' } - ], + fields: [{ + name: 'id', + type: 'int' + }, { + name: 'registration', + type: 'boolean' + }, { + name: 'map', + type: 'string' + }, { + name: 'bingKey', + type: 'string' + }, { + name: 'mapUrl', + type: 'string' + }, { + name: 'language', + type: 'string' + }, { + name: 'distanceUnit', + type: 'string' + }, { + name: 'speedUnit', + type: 'string' + }, { + name: 'latitude', + type: 'float' + }, { + name: 'longitude', + type: 'float' + }, { + name: 'zoom', + type: 'int' + }], proxy: { type: 'ajax', diff --git a/web/app/model/User.js b/web/app/model/User.js index 5b38fb64a..d0a6e5e14 100644 --- a/web/app/model/User.js +++ b/web/app/model/User.js @@ -18,20 +18,43 @@ Ext.define('Traccar.model.User', { extend: 'Ext.data.Model', identifier: 'negative', - fields: [ - { name: 'id', type: 'int' }, - { name: 'name', type: 'string' }, - { name: 'email', type: 'string' }, - { name: 'password', type: 'string' }, - { name: 'admin', type: 'boolean' }, - { name: 'map', type: 'string' }, - { name: 'language', type: 'string' }, - { name: 'distanceUnit', type: 'string' }, - { name: 'speedUnit', type: 'string' }, - { name: 'latitude', type: 'float' }, - { name: 'longitude', type: 'float' }, - { name: 'zoom', type: 'int' } - ], + fields: [{ + name: 'id', + type: 'int' + }, { + name: 'name', + type: 'string' + }, { + name: 'email', + type: 'string' + }, { + name: 'password', + type: 'string' + }, { + name: 'admin', + type: 'boolean' + }, { + name: 'map', + type: 'string' + }, { + name: 'language', + type: 'string' + }, { + name: 'distanceUnit', + type: 'string' + }, { + name: 'speedUnit', + type: 'string' + }, { + name: 'latitude', + type: 'float' + }, { + name: 'longitude', + type: 'float' + }, { + name: 'zoom', + type: 'int' + }], proxy: { type: 'ajax', -- cgit v1.2.3