diff --git a/models/acc_operation.py b/models/acc_operation.py index c8ffe06e4e9b4abf3c2de448b7d00545711b4029..997c79e9d1b4ec7de2eacd54ffaa351c2202f4c1 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -2,6 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import base64 +import pytz from datetime import datetime, timedelta from io import StringIO @@ -121,7 +122,8 @@ class AccOperation(models.Model): [("name", "=", id_pdm)] ) - computed_data_type = data_filename[3] + computed_data_type = data_filename[3].lower() + file_decode = StringIO(base64.b64decode(file.datas).decode("UTF-8")) file_decode.seek(0) # reader = pd.read_csv(file_decode, header=None, delimiter=';') @@ -132,7 +134,8 @@ class AccOperation(models.Model): for row in reader.values: # Create 1st slot 0-30min date_slot = datetime.strptime(row[0], "%d/%m/%Y %H:%M") - # date_slot = row[0] + date_slot_utc = fields.Datetime.to_string(date_slot) + self.env["acc.enedis.cdc"].create( { "name": file.name, @@ -141,10 +144,15 @@ class AccOperation(models.Model): "comp_data_type": computed_data_type, "power": row[1], "date_slot": date_slot, + "date_slot_utc": date_slot_utc, } ) # Create 2nd slot 30-60min - date_slot_30 = date_slot + timedelta(minutes=30) + date_slot_30 = datetime.strptime(row[0], "%d/%m/%Y %H:%M") + timedelta(minutes=30) + + date_slot_utc = fields.Datetime.to_string(date_slot_30) + + # date_slot_utc = fields.Datetime.to_string(date_slot_30) self.env["acc.enedis.cdc"].create( { "name": file.name, @@ -153,6 +161,7 @@ class AccOperation(models.Model): "comp_data_type": computed_data_type, "power": row[2], "date_slot": date_slot_30, + "date_slot_utc": date_slot_utc, } ) diff --git a/views/acc_enedis_cdc_views.xml b/views/acc_enedis_cdc_views.xml index 101df11fffedb7117fdb0f07185febba315854d0..01108b093ac0846761ca88a033c54c5cdfcd3b5a 100644 --- a/views/acc_enedis_cdc_views.xml +++ b/views/acc_enedis_cdc_views.xml @@ -39,6 +39,7 @@ <field name="acc_operation_id" /> <field name="acc_counter_id" /> <field name="date_slot_utc" /> + <field name="date_slot" /> <field name="comp_data_type" /> <field name="power" /> </tree> diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml index d8254ec51057c20c12c3abe09acbb9814c0f4b47..98233790f94d5e6afa723281769e70634ea65af8 100644 --- a/views/acc_operation_views.xml +++ b/views/acc_operation_views.xml @@ -25,7 +25,7 @@ <field name="arch" type="xml"> <form string="Opération"> <header> -<!-- <button string="Intégration des données ENEDIS" type="object" class="btn-primary" name="import_enedis_data"/>--> + <button string="Intégration des données ENEDIS" type="object" class="btn-primary" name="import_enedis_data"/> </header> <sheet> <widget