Skip to content

Commit

Permalink
For #168 - fixed drawing of sensors without intervals
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalidze committed Jun 9, 2015
1 parent 3547d8d commit 53a8a18
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ public void show(int x, int y, final Position position) {
parameterName = sensor.getName();
if (valueText.matches("^[-+]?\\d+(\\.\\d+)?$")) {
double value = Double.parseDouble(valueText);
valueText = intervalText(value, SensorsEditor.intervals(sensor));
List<SensorInterval> intervals = SensorsEditor.intervals(sensor);
if (!intervals.isEmpty()) {
valueText = intervalText(value, intervals);
}
}
} else if (parameterName.equals("protocol")) {
parameterName = i18n.protocol();
Expand Down
16 changes: 9 additions & 7 deletions src/main/webapp/m/js/traccar-mobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,17 @@ function parseOther(position) {
name = sensor.name;
if (sensor.intervals != null && !isNaN(valueText)) {
var intervals = JSON.parse(sensor.intervals);
var valueText = null;
for (var j = 0; j < intervals.length; j++) {
if (valueText == null) {
if (intervals.length > 0) {
var valueText = null;
for (var j = 0; j < intervals.length; j++) {
if (valueText == null) {
valueText = intervals[j].text;
}
if (value < intervals[j].value) {
break;
}
valueText = intervals[j].text;
}
if (value < intervals[j].value) {
break;
}
valueText = intervals[j].text;
}
}
break;
Expand Down

0 comments on commit 53a8a18

Please sign in to comment.