Skip to content
Extraits de code Groupes Projets
Valider 25cb81be rédigé par Juliana's avatar Juliana
Parcourir les fichiers

Remise en l'etat

parent 6b8a4e10
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -50,9 +50,9 @@ class EnercoopOperation(models.Model): ...@@ -50,9 +50,9 @@ class EnercoopOperation(models.Model):
auto_join=True auto_join=True
) )
percent_autoconso = fields.Float( percent_autoconso = fields.Float(
"% Autoconso") "% Autoconso",
# compute="_compute_percent_autoconso") compute="_compute_percent_autoconso")
# graph_values = fields.Text(compute="_compute_graph_values") graph_values = fields.Text(compute="_compute_graph_values")
distribution_key = fields.Selection([ distribution_key = fields.Selection([
('statique', 'Statique'), ('statique', 'Statique'),
('dynamique', 'Dynamique par défaut'), ('dynamique', 'Dynamique par défaut'),
...@@ -84,57 +84,57 @@ class EnercoopOperation(models.Model): ...@@ -84,57 +84,57 @@ class EnercoopOperation(models.Model):
if operation.date_start_contract: if operation.date_start_contract:
operation.birthday_date = operation.date_start_contract.day operation.birthday_date = operation.date_start_contract.day
# def _compute_graph_values(self): def _compute_graph_values(self):
# for operation in self: for operation in self:
# autoconso_ids = self.env['enercoop.enedis.energie'].search([ autoconso_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Autoconso')]) ('comp_data_type', '=', 'Autoconso')])
# autoconso_count = sum(autoconso_ids.mapped('power')) autoconso_count = sum(autoconso_ids.mapped('power'))
# conso_ids = self.env['enercoop.enedis.energie'].search([ conso_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Conso')]) ('comp_data_type', '=', 'Conso')])
# conso_count = sum(conso_ids.mapped('power')) conso_count = sum(conso_ids.mapped('power'))
# prod_ids = self.env['enercoop.enedis.energie'].search([ prod_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Prod')]) ('comp_data_type', '=', 'Prod')])
# prod_count = sum(prod_ids.mapped('power')) prod_count = sum(prod_ids.mapped('power'))
# surplus_ids = self.env['enercoop.enedis.energie'].search([ surplus_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Surplus')]) ('comp_data_type', '=', 'Surplus')])
# surplus_count = sum(surplus_ids.mapped('power')) surplus_count = sum(surplus_ids.mapped('power'))
#
# operation.graph_values = json.dumps([{ operation.graph_values = json.dumps([{
# 'values': [ 'values': [
# {'label': 'Autoconsommation', 'value': autoconso_count}, {'label': 'Autoconsommation', 'value': autoconso_count},
# {'label': 'Consommation', 'value': conso_count}, {'label': 'Consommation', 'value': conso_count},
# {'label': 'Production', 'value': prod_count}, {'label': 'Production', 'value': prod_count},
# {'label': 'Surplus', 'value': surplus_count}, {'label': 'Surplus', 'value': surplus_count},
# ], ],
# 'area': True, 'area': True,
# 'title': '', 'title': '',
# 'key': 'Operations', 'key': 'Operations',
# 'color': '#F61E00' 'color': '#F61E00'
# }]) }])
# def _compute_percent_autoconso(self): def _compute_percent_autoconso(self):
# for operation in self: for operation in self:
# autoconso_ids = self.env['enercoop.enedis.energie'].search([ autoconso_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Autoconso')]) ('comp_data_type', '=', 'Autoconso')])
# autoconso_count = sum(autoconso_ids.mapped('power')) autoconso_count = sum(autoconso_ids.mapped('power'))
# conso_ids = self.env['enercoop.enedis.energie'].search([ conso_ids = self.env['enercoop.enedis.energie'].search([
# ('enercoop_operation_id', '=', operation.id), ('enercoop_operation_id', '=', operation.id),
# ('comp_data_type', '=', 'Conso')]) ('comp_data_type', '=', 'Conso')])
# conso_count = sum(conso_ids.mapped('power')) conso_count = sum(conso_ids.mapped('power'))
# percent = 0 percent = 0
# if conso_count: if conso_count:
# percent = autoconso_count / conso_count * 100 percent = autoconso_count / conso_count * 100
# if 0 < percent < 1: if 0 < percent < 1:
# operation.percent_autoconso = 1 operation.percent_autoconso = 1
# elif 99 < percent < 100: elif 99 < percent < 100:
# operation.percent_autoconso = 99 operation.percent_autoconso = 99
# else: else:
# operation.percent_autoconso = percent operation.percent_autoconso = percent
# ------------------------------------------------------ # ------------------------------------------------------
# Onchange / Constraints # Onchange / Constraints
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<field name="name"/> <field name="name"/>
<field name="percent_autoconso"/> <field name="percent_autoconso"/>
<field name="pmo_id"/> <field name="pmo_id"/>
<!-- <field name="graph_values"/>--> <field name="graph_values"/>
<templates> <templates>
<t t-name="kanban-box"> <t t-name="kanban-box">
<div class="container o_kanban_card_content oe_kanban_global_click"> <div class="container o_kanban_card_content oe_kanban_global_click">
...@@ -132,14 +132,10 @@ ...@@ -132,14 +132,10 @@
<div class="row"> <div class="row">
<div class="col-6 text-center"> <div class="col-6 text-center">
<field name="percent_autoconso" widget="gauge"/> <field name="percent_autoconso" widget="gauge"/>
<!-- <div class="btn-group-vertical">-->
<!-- <button type="object" name="cotiz_view" class="btn btn-info">Voir les appels <br /> de cotisations</button>-->
<!-- <button type="object" name="bordereaux_view" class="btn btn-info">Voir les bordereaux</button>-->
<!-- </div>-->
</div> </div>
<!-- <div>--> <div>
<!-- <field name="graph_values" widget="dashboard_graph" graph_type="bar"/>--> <field name="graph_values" widget="dashboard_graph" graph_type="bar"/>
<!-- </div>--> </div>
</div> </div>
</div> </div>
</t> </t>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter