diff --git a/README.rst b/README.rst
index 4a8a7473a4d32d96f2802ad30499d0d87ad5dc40..6caa06a698b1ba08edd7507e7a3973da06fe6133 100755
--- a/README.rst
+++ b/README.rst
@@ -3,13 +3,13 @@
:alt: License: AGPL-3
-=========================================
-ENERCOOP - Gestion des Courbes de charges
-=========================================
+====================================
+ACC - Gestion des Courbes de charges
+====================================
Description
===========
-Ce module permet de construire les graphes.
+Ce module permet la construction et l'affichage des graphes.
Exemple
=======
diff --git a/__manifest__.py b/__manifest__.py
index ab4375413e7190c81df91d1715e2c56b1aa1b34d..1bddc3929a3deded82ba93ed1611cd15ebaba973 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -1,21 +1,21 @@
{
- 'name': "ENERCOOP - Gestion des CDC",
+ 'name': "ACC - Gestion des CDC",
'summary': "Gestion des Courbes de charges",
'author': "Le Filament",
'website': "https://www.le-filament.com",
- 'version': '12.0.1.0.1',
+ 'version': '14.0.1.0.1',
'license': "AGPL-3",
'depends': [
- 'enercoop_partner', 'enercoop_enedis_api'
+ 'acc_operation', 'acc_enedis_api'
],
'data': [
"security/ir.model.access.csv",
# datas
# wizard
# views
- 'views/enercoop_operation_views.xml',
- 'views/enercoop_operation_templates.xml',
- 'views/res_partner_views.xml',
+ 'views/acc_operation_views.xml',
+ 'views/acc_operation_templates.xml',
+ # 'views/res_partner_views.xml',
# views menu
],
'qweb': [
diff --git a/models/__init__.py b/models/__init__.py
index 5e7ed1ea9cae8bdfa2b325f27210334ea0f2948d..dc150385cc796f27b0fa78c9f7c7a04d9e49f32f 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -1,6 +1,6 @@
# Copyright 2021 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from . import enercoop_operation
-from . import enercoop_operation_graph
-from . import enercoop_counter
+from . import acc_operation
+from . import acc_operation_graph
+# from . import acc_counter
diff --git a/models/enercoop_counter.py b/models/acc_counter.py
similarity index 68%
rename from models/enercoop_counter.py
rename to models/acc_counter.py
index db9f18a9d10d52f7eca4ee5369f8a526dc3d06a0..06047222e5db0afc6a50306e854ecfcb8a8f3acc 100644
--- a/models/enercoop_counter.py
+++ b/models/acc_counter.py
@@ -6,8 +6,8 @@ from odoo import _, models
DEFAULT_MONTH_RANGE = 3
-class EnercoopCounter(models.Model):
- _inherit = 'enercoop.counter.operation'
+class AccCounter(models.Model):
+ _inherit = 'acc.counter'
# ------------------------------------------------------
# Actions
@@ -18,17 +18,17 @@ class EnercoopCounter(models.Model):
:return: Vue Qweb
"""
self.ensure_one()
- counter_id = self.env['enercoop.counter'].browse(self.env.context.get('default_counter_id'))
+ counter_id = self.env['acc.counter'].browse(self.env.context.get('default_counter_id'))
action = self.env["ir.actions.actions"]._for_xml_id(
- "enercoop_cdc.enercoop_operation_action_client_courbes")
+ "acc_cdc.acc_operation_action_client_courbes")
action['params'] = {
'operation_ids': self.operation_id.id,
- 'enercoop_counter_id': counter_id.id
+ 'acc_counter_id': counter_id.id
}
action['context'] = {
'active_id': self.operation_id.id,
'active_ids': self.operation_id.ids,
'search_default_name': self.operation_id.name,
- 'search_default_enercoop_delivery_operation_ids': counter_id.name,
+ 'search_default_acc_delivery_operation_ids': counter_id.name,
}
return action
\ No newline at end of file
diff --git a/models/enercoop_operation.py b/models/acc_operation.py
similarity index 88%
rename from models/enercoop_operation.py
rename to models/acc_operation.py
index 2df884676f32480322a290638294cdf6805946ef..0d9533d1ec1076c550fd47a505ab92426aca3f90 100644
--- a/models/enercoop_operation.py
+++ b/models/acc_operation.py
@@ -9,8 +9,8 @@ import dateutil.parser as parser
from dateutil.relativedelta import relativedelta
-class EnercoopOperation(models.Model):
- _inherit = 'enercoop.operation'
+class AccOperation(models.Model):
+ _inherit = 'acc.operation'
# ------------------------------------------------------
# Actions
@@ -23,7 +23,7 @@ class EnercoopOperation(models.Model):
self.ensure_one()
partner_id = self.env['res.partner'].browse(self.env.context.get('default_partner_id'))
action = self.env["ir.actions.actions"]._for_xml_id(
- "enercoop_cdc.enercoop_operation_action_client_courbes")
+ "acc_cdc.acc_operation_action_client_courbes")
action['params'] = {
'operation_ids': self.ids,
}
@@ -45,8 +45,8 @@ class EnercoopOperation(models.Model):
# Récupère les dates du dernier mois disponible
date_start, date_end = self.get_last_day('month')
# Conso Totale
- autoconso_ids = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', '=', self.id),
+ autoconso_ids = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', '=', self.id),
('comp_data_type', '=', 'autocons'),
('date_slot', '>=', date_start),
('date_slot', '<', date_end)])
@@ -64,24 +64,24 @@ class EnercoopOperation(models.Model):
# Récupère les dates du dernier mois disponible
date_start, date_end = self.get_last_day('month')
# Conso Totale
- conso_ids = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', '=', self.id),
+ conso_ids = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', '=', self.id),
('comp_data_type', '=', 'cons'),
('date_slot', '>=', date_start),
('date_slot', '<', date_end)])
conso_tot = (sum(conso_ids.mapped('power')) / 1000) / 2
# Prod Totale
- prod_ids = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', '=', self.id),
+ prod_ids = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', '=', self.id),
('comp_data_type', '=', 'prod'),
('date_slot', '>=', date_start),
('date_slot', '<', date_end)])
prod_tot = (sum(prod_ids.mapped('power')) / 1000) / 2
# Auto cons Totale
- autoconso_ids = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', '=', self.id),
+ autoconso_ids = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', '=', self.id),
('comp_data_type', '=', 'autocons'),
('date_slot', '>=', date_start),
('date_slot', '<', date_end)])
@@ -95,8 +95,8 @@ class EnercoopOperation(models.Model):
"""
puiss_tot = 0.0
- for counter in self.enercoop_injection_operation_ids:
- puiss_tot += counter.enercoop_counter_id.power_instal
+ for counter in self.acc_injection_ids:
+ puiss_tot += counter.acc_counter_id.power_instal
return puiss_tot
@@ -129,13 +129,16 @@ class EnercoopOperation(models.Model):
"""
# Get last date slot recorded
- last_record = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', 'in', self.ids),
+ last_record = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', 'in', self.ids),
], limit=1, order='date_slot DESC')
date_end = last_record.date_slot
if scale == 'semestre':
- date_start = date_end - relativedelta(months=6)
+ date_first = date_end - relativedelta(months=1)
+ date_end = date_utils.end_of(date_first, 'month')
+ date_start = date_end - relativedelta(months=5)
+ date_start = date_utils.start_of(date_start, 'month')
elif scale == 'month':
date_start = date_end - relativedelta(months=1)
date_start = date_utils.start_of(date_start, scale)
@@ -143,6 +146,8 @@ class EnercoopOperation(models.Model):
elif scale == 'week':
date_start = date_end - relativedelta(days=6)
date_start = date_utils.start_of(date_start, 'day')
+ elif scale == 'day':
+ date_start = date_utils.start_of(date_end, 'day')
else:
date_first = date_end - relativedelta(months=1)
date_end = date_utils.end_of(date_first, 'month')
@@ -157,8 +162,8 @@ class EnercoopOperation(models.Model):
"""
# Get last date slot recorded
- first_record = self.env['enercoop.enedis.cdc'].search([
- ('enercoop_operation_id', 'in', self.ids),
+ first_record = self.env['acc.enedis.cdc'].search([
+ ('acc_operation_id', 'in', self.ids),
], limit=1, order='date_slot ASC')
date_min = first_record.date_slot
@@ -216,17 +221,17 @@ class EnercoopOperation(models.Model):
date_trunc(%s, A.date_slot) AS date_slot,
(SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
(SUM( (CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END) )/2) / 1000 as prod,
- ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) - SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
- AND ( A.enercoop_counter_id IN %s OR A.comp_data_type = 'prod' )
- AND A.date_slot >= %s
- AND A.date_slot < %s
- GROUP BY date_trunc(%s, A.date_slot)
- ORDER BY date_slot ASC;
- """
+ (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
+ AND ( A.acc_counter_id IN %s OR A.comp_data_type = 'prod' )
+ AND A.date_slot >= %s
+ AND A.date_slot < %s
+ GROUP BY date_trunc(%s, A.date_slot)
+ ORDER BY date_slot ASC;
+ """
query_params = (slot_type, tuple(self.ids), tuple(prm_ids.ids), date_start, date_end, slot_type)
self.env.cr.execute(query, query_params)
raw_data = self.env.cr.fetchall()
@@ -270,17 +275,17 @@ class EnercoopOperation(models.Model):
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
(SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
- ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) - SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
- AND A.enercoop_counter_id IN %s
- AND A.date_slot >= %s
- AND A.date_slot < %s
- GROUP BY date_trunc(%s, A.date_slot)
- ORDER BY date_slot ASC;
- """
+ (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
+ AND A.acc_counter_id IN %s
+ AND A.date_slot >= %s
+ AND A.date_slot < %s
+ GROUP BY date_trunc(%s, A.date_slot)
+ ORDER BY date_slot ASC;
+ """
query_params = (slot_type, tuple(self.ids), tuple(prm_ids.ids), date_start, date_end, slot_type)
self.env.cr.execute(query, query_params)
raw_data = self.env.cr.fetchall()
@@ -318,13 +323,12 @@ class EnercoopOperation(models.Model):
date_trunc(%s, A.date_slot) AS date_slot,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM((CASE WHEN comp_data_type = 'prod' AND A.enercoop_counter_id IN %s THEN A.power ELSE 0 END)) / 2) /
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 1 END)) / 2) *
- (SUM((CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 1 END)) / 2) / 1000 as surplus
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
+ (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_counter_id IN %s
+ AND A.acc_operation_id IN %s
AND A.date_slot >= %s
AND A.date_slot < %s
GROUP BY date_trunc(%s, A.date_slot)
@@ -376,13 +380,12 @@ class EnercoopOperation(models.Model):
date_trunc(%s, A.date_slot) AS date_slot,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM((CASE WHEN comp_data_type = 'prod' AND A.enercoop_counter_id IN %s THEN A.power ELSE 0 END)) / 2) /
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 1 END)) / 2) *
- (SUM((CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 1 END)) / 2) / 1000 as surplus
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
+ (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_counter_id IN %s
+ AND A.acc_operation_id IN %s
AND A.date_slot >= %s
AND A.date_slot < %s
GROUP BY date_trunc(%s, A.date_slot)
@@ -428,17 +431,14 @@ class EnercoopOperation(models.Model):
(SUM((CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) / 2) / 1000 as cons,
(SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
(SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) / 2) / 1000 as prod_s,
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) / 2) /
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 1 END)) / 2) *
- (SUM((CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 1 END)) / 2) / 1000 as surplus,
- ((SUM((CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
+ (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
+ (SUM((CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
AND A.date_slot >= %s
AND A.date_slot < %s
GROUP BY date_trunc(%s, A.date_slot)
@@ -496,17 +496,14 @@ class EnercoopOperation(models.Model):
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
(SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) / 2) /
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 1 END)) / 2) *
- (SUM((CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 1 END)) / 2) / 1000 as surplus,
- ((SUM((CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
+ (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
+ (SUM((CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
- FROM enercoop_enedis_cdc A
- JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
- WHERE A.enercoop_operation_id IS NOT NULL
- AND A.enercoop_operation_id IN %s
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
AND A.date_slot >= %s
AND A.date_slot < %s
GROUP BY date_trunc(%s, A.date_slot)
@@ -1044,7 +1041,7 @@ class EnercoopOperation(models.Model):
return chart_data
@api.model
- def graph_view(self, domain, scale, first_day, last_day, enercoop_counter_id=None):
+ def graph_view(self, domain, scale, first_day, last_day, acc_counter_id=None):
"""
Fonction appelée lors du chargement de la vue Qweb
:param domain: représente le champ recherche de la vue
@@ -1055,7 +1052,7 @@ class EnercoopOperation(models.Model):
"""
result_graph = {}
# Get the operations depending to the domain
- operation_ids = self.env['enercoop.operation'].search(domain)
+ operation_ids = self.env['acc.operation'].search(domain)
if operation_ids:
# Get date start and date end depending on type of scale
@@ -1071,8 +1068,8 @@ class EnercoopOperation(models.Model):
date_end = date_utils.end_of(date_end, 'day')
counter_ids = None
- if enercoop_counter_id:
- counter_ids = self.env['enercoop.counter'].search([('name', '=', enercoop_counter_id)]).ids
+ if acc_counter_id:
+ counter_ids = self.env['acc.counter'].search([('name', '=', acc_counter_id)]).ids
scale, step_courbe, step_display_courbe = operation_ids.get_step_from_date(
date_start=date_start, date_end=date_end, scale=scale)
@@ -1216,30 +1213,28 @@ class EnercoopOperation(models.Model):
# Get PRM ids
if prm_id:
- enercoop_counter_ids = self.env['enercoop.counter'].browse(prm_id)
+ acc_counter_ids = self.env['acc.counter'].browse(prm_id)
elif partner_id:
- enercoop_counter_ids = self.env['enercoop.counter'].search([('partner_id', '=', partner_id)])
+ acc_counter_ids = self.env['acc.counter'].search([('partner_id', '=', partner_id)])
else:
if type == 'cons':
- enercoop_counter_ids = self.env['enercoop.counter'].sudo().search(
- [('enercoop_operation_ids', 'in', self.sudo().enercoop_delivery_operation_ids.ids)])
+ acc_counter_ids = self.acc_delivery_ids
else:
- enercoop_counter_ids = self.env['enercoop.counter'].sudo().search(
- [('enercoop_operation_ids', 'in', self.sudo().enercoop_injection_operation_ids.ids)])
+ acc_counter_ids = self.acc_injection_ids
if type == 'cons':
- chart_data = self.get_cdc_by_query_cons(step_courbe, date_start, date_end, enercoop_counter_ids)
+ chart_data = self.get_cdc_by_query_cons(step_courbe, date_start, date_end, acc_counter_ids)
if scale == 'week':
- chart_data_histo = self.get_cdc_by_query_histo_cons('day', date_start, date_end, enercoop_counter_ids)
+ chart_data_histo = self.get_cdc_by_query_histo_cons('day', date_start, date_end, acc_counter_ids)
chart_data.update(chart_data_histo)
# Build the chart with data and options
result_graph = self.build_graph_data_options_cons(chart_data, step_display_courbe=step_display_courbe,
scale=scale, step_courbe=step_courbe)
else:
- chart_data = self.get_cdc_by_query_prod(step_courbe, date_start, date_end, enercoop_counter_ids)
+ chart_data = self.get_cdc_by_query_prod(step_courbe, date_start, date_end, acc_counter_ids)
if scale == 'week':
- chart_data_histo = self.get_cdc_by_query_histo_prod('day', date_start, date_end, enercoop_counter_ids)
+ chart_data_histo = self.get_cdc_by_query_histo_prod('day', date_start, date_end, acc_counter_ids)
chart_data.update(chart_data_histo)
# Build the chart with data and options
diff --git a/models/enercoop_operation_graph.py b/models/acc_operation_graph.py
similarity index 97%
rename from models/enercoop_operation_graph.py
rename to models/acc_operation_graph.py
index 5aa38a121cf1f519e03112755637faee2ac5e745..88ab67e65af84901c670239397e9109e847fab54 100644
--- a/models/enercoop_operation_graph.py
+++ b/models/acc_operation_graph.py
@@ -6,8 +6,8 @@ from odoo import _, models
DEFAULT_MONTH_RANGE = 3
-class EnercoopOperation(models.Model):
- _inherit = 'enercoop.operation'
+class AccOperation(models.Model):
+ _inherit = 'acc.operation'
def _qweb_prepare_qcontext(self, view_id, domain):
values = super()._qweb_prepare_qcontext(view_id, domain)
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 4f3bcabad3efb80a38a7c26fe6643bccc9a80b10..2b833a80f0a533b27ca704afcec5ef272828c599 100755
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,2 +1,2 @@
id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-access_enercoop_enedis_cdc_portal,enercoop.enedis.cdc.portal,enercoop_partner.model_enercoop_enedis_cdc,base.group_portal,1,0,0,0
\ No newline at end of file
+access_acc_enedis_cdc_portal,acc.enedis.cdc.portal,acc_operation.model_acc_enedis_cdc,base.group_portal,1,0,0,0
\ No newline at end of file
diff --git a/static/src/js/operation_graph.js b/static/src/js/operation_graph.js
index 39447bcb50eee4b8a2ed2dda7309d7f558a950ab..e0b7ff7b1bcf9b72566d6d7ef4e55c7074faba0e 100644
--- a/static/src/js/operation_graph.js
+++ b/static/src/js/operation_graph.js
@@ -1,4 +1,4 @@
-odoo.define('enercoop_cdc.operation_graph', function (require) {
+odoo.define('acc_cdc.operation_graph', function (require) {
"use strict";
var qweb = require('web.qweb');
@@ -9,7 +9,7 @@ odoo.define('enercoop_cdc.operation_graph', function (require) {
let chartValues;
const Renderer = qweb.Renderer.extend({
events:_.extend({}, qweb.Renderer.prototype.events, {
- 'click .o_enercoop_button': '_onChartClicked',
+ 'click .o_acc_button': '_onChartClicked',
}),
_render: async function () {
@@ -100,12 +100,12 @@ odoo.define('enercoop_cdc.operation_graph', function (require) {
histo_prod,
Object.assign({}, result.histo_chart_prod)
);
- this.$el.find('.o_enercoop_button').removeClass('active');
+ this.$el.find('.o_acc_button').removeClass('active');
if (this.state.scale) {
- var $but = this.$el.find('.o_enercoop_button[data-mode="' + this.state.scale + '"]')
+ var $but = this.$el.find('.o_acc_button[data-mode="' + this.state.scale + '"]')
}
else {
- var $but = this.$el.find('.o_enercoop_button[data-mode="month"]')
+ var $but = this.$el.find('.o_acc_button[data-mode="month"]')
}
$but.addClass('active');
@@ -181,12 +181,12 @@ odoo.define('enercoop_cdc.operation_graph', function (require) {
_loadChart: function (super_def, params) {
var self = this;
- var enercoop_counter_id = self._state.context.search_default_enercoop_delivery_operation_ids
+ var acc_counter_id = self._state.context.search_default_acc_delivery_operation_ids
var domain = self._state.domain
var chart_def = this._rpc({
- model: 'enercoop.operation',
+ model: 'acc.operation',
method: 'graph_view',
- args: [domain, this.scales, this.first_day, this.last_day, enercoop_counter_id],
+ args: [domain, this.scales, this.first_day, this.last_day, acc_counter_id],
context: this._state.context,
});
return Promise.all([super_def, chart_def]).then(function(results) {
@@ -253,7 +253,7 @@ odoo.define('enercoop_cdc.operation_graph', function (require) {
searchMenuTypes: ['filter', 'favorite'],
jsLibs: [
'/web/static/lib/Chart/Chart.js',
- '/enercoop_cdc/static/src/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.min.js',
+ '/acc_cdc/static/src/lib/chartjs-plugin-datalabels/chartjs-plugin-datalabels.min.js',
'/web/static/lib/moment/moment.js',
],
config: _.extend({}, qweb.View.prototype.config, {
diff --git a/views/enercoop_operation_templates.xml b/views/acc_operation_templates.xml
similarity index 77%
rename from views/enercoop_operation_templates.xml
rename to views/acc_operation_templates.xml
index 04a95ac6fdc771842ec387ea818411ece126ec87..d56dbf641c48bc6022b350442943bebbcdda8e1a 100644
--- a/views/enercoop_operation_templates.xml
+++ b/views/acc_operation_templates.xml
@@ -3,14 +3,14 @@
<template id="assets_backend" name="operation assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
- <script type="text/javascript" src="/enercoop_cdc/static/src/js/operation_graph.js"></script>
+ <script type="text/javascript" src="/acc_cdc/static/src/js/operation_graph.js"></script>
</xpath>
</template>
<record id="graph_courbes" model="ir.ui.view">
<field name="name">Courbes</field>
<field name="type">qweb</field>
- <field name="model">enercoop.operation</field>
+ <field name="model">acc.operation</field>
<field name="arch" type="xml">
<qweb js_class="operation_graph">
@@ -20,11 +20,11 @@
<div class="o_timesheet_plan_sale_timesheet">
<div class="o_timesheet_plan_sale_timesheet_dashboard">
<div class="container text-center mt32 mb32">
- <button t-att-context="{'first_day': data_values['date_day_start'], 'last_day': ''}" name="day" class="btn btn-secondary o_enercoop_button" title="Dernier jour" aria-label="Dernier jour" data-mode="day"><strong>Dernière journée</strong><br/><t t-esc="data_values['last_day']"/></button>
- <button t-att-context="{'first_day': data_values['date_week_start'], 'last_day': data_values['date_week_end']}" name="week" class="btn btn-secondary o_enercoop_button" title="7 derniers jours" aria-label="7 derniers jours" data-mode="week"><strong>7 derniers jours</strong><br/><t t-esc="data_values['last_week']"/></button>
- <button t-att-context="{'first_day': data_values['date_month_start'], 'last_day': data_values['date_month_end']}" name="month" class="btn btn-secondary o_enercoop_button" title="Dernier mois" aria-label="Dernier mois" data-mode="month"><strong>Dernier mois</strong><br/><t t-esc="data_values['last_month']"/></button>
- <button t-att-context="{'first_day': data_values['date_semestre_start'], 'last_day': data_values['date_semestre_end']}" name="semestre" class="btn btn-secondary o_enercoop_button" title="6 derniers mois" aria-label="6 derniers mois" data-mode="semestre"><strong>6 derniers mois</strong><br/><t t-esc="data_values['last_semestre']"/></button>
- <button t-att-context="{'first_day': data_values['date_year_start'], 'last_day': data_values['date_year_end']}" name="year" class="btn btn-secondary o_enercoop_button" title="12 derniers mois" aria-label="12 derniers mois" data-mode="year"><strong>12 derniers mois</strong><br/><t t-esc="data_values['last_year']"/></button>
+ <button t-att-context="{'first_day': data_values['date_day_start'], 'last_day': ''}" name="day" class="btn btn-secondary o_acc_button" title="Dernier jour" aria-label="Dernier jour" data-mode="day"><strong>Dernière journée</strong><br/><t t-esc="data_values['last_day']"/></button>
+ <button t-att-context="{'first_day': data_values['date_week_start'], 'last_day': data_values['date_week_end']}" name="week" class="btn btn-secondary o_acc_button" title="7 derniers jours" aria-label="7 derniers jours" data-mode="week"><strong>7 derniers jours</strong><br/><t t-esc="data_values['last_week']"/></button>
+ <button t-att-context="{'first_day': data_values['date_month_start'], 'last_day': data_values['date_month_end']}" name="month" class="btn btn-secondary o_acc_button" title="Dernier mois" aria-label="Dernier mois" data-mode="month"><strong>Dernier mois</strong><br/><t t-esc="data_values['last_month']"/></button>
+ <button t-att-context="{'first_day': data_values['date_semestre_start'], 'last_day': data_values['date_semestre_end']}" name="semestre" class="btn btn-secondary o_acc_button" title="6 derniers mois" aria-label="6 derniers mois" data-mode="semestre"><strong>6 derniers mois</strong><br/><t t-esc="data_values['last_semestre']"/></button>
+ <button t-att-context="{'first_day': data_values['date_year_start'], 'last_day': data_values['date_year_end']}" name="year" class="btn btn-secondary o_acc_button" title="12 derniers mois" aria-label="12 derniers mois" data-mode="year"><strong>12 derniers mois</strong><br/><t t-esc="data_values['last_year']"/></button>
</div>
<div class="text-center o_title mt32">
<h2>Vues Consommateurs</h2>
@@ -79,7 +79,7 @@
</record>
<!-- <template id="graph">-->
-<!-- <div t-name="enercoop_cdc.renderGraph" class="hello-world">-->
+<!-- <div t-name="acc_cdc.renderGraph" class="hello-world">-->
<!-- <div class="container">-->
<!-- <div class="row mt32 mb32">-->
<!-- <div class="col-md-6 col-12 p-5">-->
diff --git a/views/enercoop_operation_views.xml b/views/acc_operation_views.xml
similarity index 58%
rename from views/enercoop_operation_views.xml
rename to views/acc_operation_views.xml
index 5450cfe4b8890e644b6d52fabd2f8adb95e63f4a..f5236d36b4ab34c823d897dd742ffdd6f99f0f34 100644
--- a/views/enercoop_operation_views.xml
+++ b/views/acc_operation_views.xml
@@ -2,10 +2,10 @@
<odoo>
<data>
- <record id="cdc_enercoop_operation_form_view" model="ir.ui.view">
- <field name="name">cdc.enercoop_operation_form_view.api.form</field>
- <field name="model">enercoop.operation</field>
- <field name="inherit_id" ref="enercoop_enedis_api.enercoop_operation_form_view"/>
+ <record id="cdc_acc_operation_form_view" model="ir.ui.view">
+ <field name="name">cdc.acc_operation_form_view.api.form</field>
+ <field name="model">acc.operation</field>
+ <field name="inherit_id" ref="acc_enedis_api.acc_operation_form_view"/>
<field name="arch" type="xml">
<header position="inside">
<button
@@ -18,9 +18,9 @@
</field>
</record>
- <record id="enercoop_operation_action_client_courbes" model="ir.actions.act_window">
+ <record id="acc_operation_action_client_courbes" model="ir.actions.act_window">
<field name="name">Voir les courbes</field>
- <field name="res_model">enercoop.operation</field>
+ <field name="res_model">acc.operation</field>
<field name="view_mode">qweb</field>
</record>
diff --git a/views/res_partner_views.xml b/views/res_partner_views.xml
index 8d68e9ef0dad8541760299bae570613894b23bf5..9a510bb1dedebdedb496b8c52845d590f524acde 100644
--- a/views/res_partner_views.xml
+++ b/views/res_partner_views.xml
@@ -2,12 +2,12 @@
<odoo>
<data>
- <record id="enercoop_place_form_view" model="ir.ui.view">
- <field name="name">cdc.enercoop_place_form_view.api.form</field>
- <field name="model">enercoop.counter</field>
- <field name="inherit_id" ref="enercoop_partner.enercoop_place_form_view"/>
+ <record id="acc_place_form_view" model="ir.ui.view">
+ <field name="name">cdc.acc_place_form_view.api.form</field>
+ <field name="model">acc.counter</field>
+ <field name="inherit_id" ref="acc_operation.acc_place_form_view"/>
<field name="arch" type="xml">
- <xpath expr="//notebook//page//field[@name='enercoop_operation_ids']//tree//field[@name='is_delivery']" position="after">
+ <xpath expr="//field[@name='acc_operation_id']" position="after">
<button icon="fa-times"
class="text-danger"
string="Voir les courbes"