From 3a28507dc154907ecdc637a948fed41f8dd89ff0 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sat, 28 Jun 2014 17:14:29 +0200 Subject: HTML: Show nice values when pressure is not available Show nice values instead of the undefined when the pressure is not available. Signed-off-by: Gehad elrobey Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- save-html.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/save-html.c b/save-html.c index 451a3dab9..d459b0e6e 100644 --- a/save-html.c +++ b/save-html.c @@ -41,13 +41,23 @@ static void put_cylinder_HTML(struct membuffer *b, struct dive *dive) write_attribute(b, "Size", "--"); } put_pressure(b, cylinder->type.workingpressure, "\"WPressure\":\"", " bar\","); - put_pressure(b, cylinder->start, "\"SPressure\":\"", " bar\","); - put_pressure(b, cylinder->end, "\"EPressure\":\"", " bar\","); + + if (cylinder->start.mbar) { + put_milli(b, "\"EPressure\":\"", cylinder->start.mbar, " bar\","); + } else { + write_attribute(b, "EPressure", "--"); + } + + if (cylinder->end.mbar) { + put_milli(b, "\"SPressure\":\"", cylinder->end.mbar, " bar\","); + } else { + write_attribute(b, "SPressure", "--"); + } if (cylinder->gasmix.o2.permille) { - put_format(b, "\"O₂\":\"%u.%u%%\",", FRACTION(cylinder->gasmix.o2.permille, 10)); + put_format(b, "\"O2\":\"%u.%u%%\",", FRACTION(cylinder->gasmix.o2.permille, 10)); } else { - write_attribute(b, "O₂", "--"); + write_attribute(b, "O2", "--"); } put_string(b, "},"); } -- cgit v1.2.3-70-g09d2