From 3e88f37d91d886e8e4935a2c604620655e57c904 Mon Sep 17 00:00:00 2001
From: Florian Bezannier <florian.bezannier@hotmail.fr>
Date: Fri, 14 May 2021 13:54:15 +0200
Subject: [PATCH] code style and fix negative value

---
 web/assets/clientside.js | 19 +++++++++----------
 web/figurefilter.py      |  1 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/web/assets/clientside.js b/web/assets/clientside.js
index 5e8a682..74ee447 100644
--- a/web/assets/clientside.js
+++ b/web/assets/clientside.js
@@ -70,7 +70,6 @@ function filterDataset (data, range) {
   return res
 }
 
-
 function filterShortTrip (data) {
   const longTrips = {
     trips: data.trips.filter(line => line.distance > 10),
@@ -157,7 +156,7 @@ function updateCardsValue (data) {
     res.avg_chg_speed = avgKw / avgTime.average()
   }
   if (data.trips.length > 0) {
-    const totalDistance = data.trips[data.trips.length - 1].mileage - data.trips[0].mileage
+    const totalDistance = Math.abs(data.trips[data.trips.length - 1].mileage - data.trips[0].mileage)
     res.avg_consum_kw = Avg.getAverageFromKey(data.trips, 'consumption_km')
     res.elec_consum_kw = totalDistance * res.avg_consum_kw / 100
   }
@@ -197,13 +196,13 @@ function sortDataset (ctx, data, tables) {
   }
 }
 
-function sort_multiple_table(sort_params, data, tables){
-  for ([prop_id, value] of Object.entries(sort_params)) {
-    let ctx = {}
-    ctx.prop_id = prop_id+".sort_by";
-    ctx.value = value
+function sortMultipleTable (sortParams, data, tables) {
+  for (const [propId, ctxValue] of Object.entries(sortParams)) {
+    const ctx = {}
+    ctx.prop_id = propId + '.sort_by'
+    ctx.value = ctxValue
     console.log(ctx)
-    sortDataset(ctx, data, tables);
+    sortDataset(ctx, data, tables)
   }
 }
 
@@ -216,7 +215,7 @@ function filterAndSort (data, range, figures, p, log, sort) { // eslint-disable-
   console.log('figures:', figures)
   console.log('data:', data)
   console.log('ctx', ctx)
-  console.log("sort", sort)
+  console.log('sort', sort)
   if (ctx.length > 0 && ctx[0].prop_id.endsWith('sort_by')) {
     dataFiltered = filterDataset(data, range)
     sortDataset(ctx[0], dataFiltered, p.table_src)
@@ -226,7 +225,7 @@ function filterAndSort (data, range, figures, p, log, sort) { // eslint-disable-
   } else {
     addLocaleDate(data, p.date_columns)
     dataFiltered = filterDataset(data, range)
-    sort_multiple_table(sort, dataFiltered, p.table_src)
+    sortMultipleTable(sort, dataFiltered, p.table_src)
     outFigures.push(...updateTables(dataFiltered, p.table_src))
     console.log(dataFiltered.trips.length)
     const longTrips = filterShortTrip(dataFiltered)
diff --git a/web/figurefilter.py b/web/figurefilter.py
index 62eef7b..319741c 100644
--- a/web/figurefilter.py
+++ b/web/figurefilter.py
@@ -118,7 +118,6 @@ class FigureFilter:
             else:
                 log_level = 20
             fct_def = f"""function(data,range, figures, {self.gen_sort_variable()}) {{
-                            console.log("=============")
                             const params={self.get_params()}
                             const logLevel={log_level}
                             return filterAndSort(data, range, figures, params, logLevel, {self.__gen_sort_dict()})