[UPD] handle 15 minutes steps in cdc

models/acc_enedis_cdc.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 from dateutil.relativedelta import relativedelta
-
+from ..tools.export_cdc import get_divider_from_row
 from odoo import _, api, models
 from odoo.exceptions import ValidationError
 from odoo.osv import expression
@@ -36,10 +36,10 @@ class AccEnedisCdc(models.Model):
         step_display_curve = "hour"
         # Calculate delta between 2 dates
         delta = (end_date - start_date).days
-        if delta > 1 and delta <= 31:
+        if 1 < delta <= 31:
             step_display_curve = "day"
             display_hourly_curves = True
-        elif delta > 31 and delta <= 366:
+        elif 31 < delta <= 366:
             step = "month"
             step_display_curve = "month"
         elif delta > 366:
@@ -389,7 +389,7 @@ class AccEnedisCdc(models.Model):
             # use KW here, divider depend of the timestep
             # only use 30 or 15 minutes, by default its 30 minutes
 
-            divider = self._get_divider_from_row(row)
+            divider = get_divider_from_row(row)
             label.append(row[0])
             data_cons.append({"x": row[0], "y": round(row[1] / divider, 2)})
             data_autocons.append({"x": row[0], "y": round(row[2] / divider, 2)})
@@ -448,7 +448,7 @@ class AccEnedisCdc(models.Model):
         self.env.cr.execute(query)
         raw_data = self.env.cr.fetchall()
         for row in raw_data:
-            divider = self._get_divider_from_row(row)
+            divider = get_divider_from_row(row)
             data_autocons_histo.append(round(row[1]/divider, 2))
             data_allocons_histo.append(round(row[2]/divider, 2))
             label_histo.append(row[0])
@@ -536,7 +536,7 @@ class AccEnedisCdc(models.Model):
         )
 
         for row in raw_data:
-            divider = self._get_divider_from_row(row)
+            divider = get_divider_from_row(row)
             label.append(row[0])
             data_autocons.append({"x": row[0], "y": round(row[1]/divider, 2)})
             data_surplus.append({"x": row[0], "y": round(row[2]/divider, 2)})
@@ -583,7 +583,7 @@ class AccEnedisCdc(models.Model):
         self.env.cr.execute(query)
         raw_data = self.env.cr.fetchall()
         for row in raw_data:
-            divider = self._get_divider_from_row(row)
+            divider = get_divider_from_row(row)
             label_histo.append(row[0])
             data_autocons_prod_histo.append(round(row[1]/divider, 2))
             data_surplus_histo.append(round(row[2]/divider, 2))
@@ -595,17 +595,6 @@ class AccEnedisCdc(models.Model):
         }
         return cdc_jour
 
-    def _get_divider_from_row(self, row):
-        """
-        Get divider from a data row
-        divider depends of the timestep
-        by default return 2000 (timestep of 30 min)
-        """
-
-        if row[-1] == 15:
-            return 4000
-        return 2000
-
     # ------------------------------------------------------
     # Functions to manage route
     # ------------------------------------------------------