From 8fa931a45755b14f61bcc699296337efefc46160 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 12 Aug 2016 11:19:34 +0500 Subject: - Fixed casting ignition object to boolean - Renamed motorHours to engineHours - Changed engine hours formatter to just hours - Added previously missed license headers to reports - Added Andrey Kunitsyn to some license headers --- src/org/traccar/reports/Route.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/org/traccar/reports/Route.java') diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java index 9622151e7..282a6e3f3 100644 --- a/src/org/traccar/reports/Route.java +++ b/src/org/traccar/reports/Route.java @@ -1,3 +1,18 @@ +/* + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.traccar.reports; import java.sql.SQLException; -- cgit v1.2.3 From 9a55f2b000956717d5caf6fb53793264c0376ce7 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 12 Aug 2016 11:40:03 +0500 Subject: - Removed decimal part - Fixed license header --- src/org/traccar/events/IgnitionEventHandler.java | 3 ++- src/org/traccar/reports/Events.java | 3 ++- src/org/traccar/reports/ReportUtils.java | 3 ++- src/org/traccar/reports/Route.java | 3 ++- src/org/traccar/reports/Summary.java | 3 ++- src/org/traccar/reports/model/SummaryReport.java | 3 ++- web/app/AttributeFormatter.js | 4 ++-- 7 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/org/traccar/reports/Route.java') diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java index ae813f77b..e241e450b 100644 --- a/src/org/traccar/events/IgnitionEventHandler.java +++ b/src/org/traccar/events/IgnitionEventHandler.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java index c8233e4eb..ed7e9e411 100644 --- a/src/org/traccar/reports/Events.java +++ b/src/org/traccar/reports/Events.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 76f0ed631..9f6d34860 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java index 282a6e3f3..45b81cd8c 100644 --- a/src/org/traccar/reports/Route.java +++ b/src/org/traccar/reports/Route.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java index 5c6fa8423..68733ded6 100644 --- a/src/org/traccar/reports/Summary.java +++ b/src/org/traccar/reports/Summary.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java index dfab2f3b8..271d0c7c2 100644 --- a/src/org/traccar/reports/model/SummaryReport.java +++ b/src/org/traccar/reports/model/SummaryReport.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com), Andrey Kunitsyn (abyss@fox5.ru) + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 2e0edb6d6..274b8d028 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -35,8 +35,8 @@ Ext.define('Traccar.AttributeFormatter', { }, hoursFormatter: function (value) { - var hours = value / 3600000; - return (hours.toFixed(2) + ' ' + Strings.sharedHourAbbreviation); + var hours = Math.round(value / 3600000); + return (hours + ' ' + Strings.sharedHourAbbreviation); }, defaultFormatter: function (value) { -- cgit v1.2.3