diff options
author | Abyss777 <abyss@fox5.ru> | 2016-08-12 11:19:34 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-08-12 11:19:34 +0500 |
commit | 8fa931a45755b14f61bcc699296337efefc46160 (patch) | |
tree | 8c7e35ccf1ec4accb2d08254c0696a418876e2bb /src/org/traccar/reports/Summary.java | |
parent | f934efecd57261a88efa122f7db5defc6adc43f1 (diff) | |
download | traccar-server-8fa931a45755b14f61bcc699296337efefc46160.tar.gz traccar-server-8fa931a45755b14f61bcc699296337efefc46160.tar.bz2 traccar-server-8fa931a45755b14f61bcc699296337efefc46160.zip |
- 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
Diffstat (limited to 'src/org/traccar/reports/Summary.java')
-rw-r--r-- | src/org/traccar/reports/Summary.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java index 2c777b9bb..5c6fa8423 100644 --- a/src/org/traccar/reports/Summary.java +++ b/src/org/traccar/reports/Summary.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.math.BigDecimal; @@ -38,7 +53,7 @@ public final class Summary { && previousPosition.getAttributes().get(Position.KEY_IGNITION) != null && Boolean.parseBoolean(previousPosition.getAttributes() .get(Position.KEY_IGNITION).toString())) { - result.addMotorHours(position.getFixTime().getTime() + result.addEngineHours(position.getFixTime().getTime() - previousPosition.getFixTime().getTime()); } } |