From b8dbcd7d21c885263bb80694b16d7778bd210b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 21 Nov 2023 11:02:04 +0100
Subject: [PATCH] [UPD] pre-commit
---
models/project.py | 57 ++++++++++-------
views/project_views.xml | 137 ++++++++++++++++++++++++++++------------
2 files changed, 130 insertions(+), 64 deletions(-)
diff --git a/models/project.py b/models/project.py
index 94ebed2..012cba4 100644
--- a/models/project.py
+++ b/models/project.py
@@ -3,7 +3,7 @@
from datetime import datetime, timedelta
-from odoo import api, fields, models
+from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
from odoo.tools.misc import xlwt
@@ -484,9 +484,7 @@ class Project(models.Model):
"Nombre d'entreprises concernées par la création"
"d'une nouvelle activité collective"
)
- number_struct_proj = fields.Integer(
- "Nombre de projets structurants définis"
- )
+ number_struct_proj = fields.Integer("Nombre de projets structurants définis")
number_mean_people_inv = fields.Integer(
"Nombre moyen de personnes sollicitées hors du"
"groupe de travail (enquête, réunion publique)"
@@ -494,9 +492,11 @@ class Project(models.Model):
number_comp_created_at = fields.Integer("Nombre d'entreprises créées (AT)")
number_comp_terr = fields.Integer("Nombre d'entreprises accompagnées (TERR)")
number_day_period = fields.Float(
- "Nb jours sur période", compute="_compute_number_day_period", default=0.0)
+ "Nb jours sur période", compute="_compute_number_day_period", default=0.0
+ )
number_hour_period = fields.Float(
- "Nb heures sur période", compute="_compute_number_day_period", default=0.0)
+ "Nb heures sur période", compute="_compute_number_day_period", default=0.0
+ )
@api.depends("date_ca")
@api.multi
@@ -608,10 +608,12 @@ class Project(models.Model):
@api.multi
def _compute_number_gap_members(self):
for project in self:
- project.number_gap_members = sum(
- project.reunion_ids.mapped("number_participants")) / len(
- project.reunion_ids
- ) if project.reunion_ids else 0
+ project.number_gap_members = (
+ sum(project.reunion_ids.mapped("number_participants"))
+ / len(project.reunion_ids)
+ if project.reunion_ids
+ else 0
+ )
@api.multi
def _compute_number_day_period(self):
@@ -623,8 +625,10 @@ class Project(models.Model):
period_end = fields.Date.to_date(self.env.context.get("period_end"))
for project in self:
days = project.task_ids.filtered(
- lambda t: t.date_deadline and t.date_deadline >= period_start
- and t.date_deadline <= period_end).mapped("duree_hr")
+ lambda t: t.date_deadline
+ and t.date_deadline >= period_start
+ and t.date_deadline <= period_end
+ ).mapped("duree_hr")
project.number_day_period = sum(days)
project.number_hour_period = sum(days) * 7
@@ -763,10 +767,9 @@ class AdefpatReunionGAP(models.Model):
self.env.context["default_project_id"]
)
if project_id.exists().membre_ids:
- participant_ids = project_id.membre_ids.mapped(lambda p: (0, 0, {
- "member_id": p.id,
- "present": False
- }))
+ participant_ids = project_id.membre_ids.mapped(
+ lambda p: (0, 0, {"member_id": p.id, "present": False})
+ )
self.update({"participant_ids": participant_ids})
return participant_ids
@@ -785,13 +788,13 @@ class AdefpatReunionGAP(models.Model):
comodel_name="res.partner.reunion.gap",
inverse_name="gap_id",
string="Participants",
- default=_default_participant_ids
+ default=_default_participant_ids,
)
number_participants = fields.Integer(
string="Moyenne de participants",
compute="_compute_number_participants",
group_operator="avg",
- store=True
+ store=True,
)
@api.depends("participant_ids", "participant_ids.present")
@@ -899,7 +902,7 @@ class AdefpatPorteursProjets(models.Model):
est_dans_comcom = fields.Boolean(
string="Commune dans ComCom du lieu de formation",
help="En cas de lieu tournant, si un des lieux de formation est sur la com com "
- "du PP cocher la case",
+ "du PP cocher la case",
)
date_naissance = fields.Date(
related="porteur_id.date_naissance", string="Date de naissance"
@@ -934,7 +937,8 @@ class AdefpatPorteursProjets(models.Model):
related="project_id.departement", string="Département"
)
number_hour_period = fields.Float(
- "Nb heures sur période", compute="_compute_hour_period", default=0.0)
+ "Nb heures sur période", compute="_compute_hour_period", default=0.0
+ )
# ------------------------------------------------------
# Constrains
@@ -944,7 +948,9 @@ class AdefpatPorteursProjets(models.Model):
for pp in self:
if not pp.task_id and not pp.project_id:
raise ValidationError(
- "Un porteur de projet doit être associé à une tâche ou un projet."
+ _(
+ "Un porteur de projet doit être associé à une tâche ou un projet."
+ )
)
@api.depends("porteur_id")
@@ -964,12 +970,15 @@ class AdefpatPorteursProjets(models.Model):
for line in self:
if line.project_id:
task_ids = line.project_id.task_ids.filtered(
- lambda t: t.date_deadline and t.date_deadline >= period_start
- and t.date_deadline <= period_end)
+ lambda t: t.date_deadline
+ and t.date_deadline >= period_start
+ and t.date_deadline <= period_end
+ )
days = []
for task in task_ids:
participant_ids = task.participant_ids.filtered(
- lambda p: p.h_theoriques)
+ lambda p: p.h_theoriques
+ )
if line.porteur_id in participant_ids.mapped("porteur_id"):
days.append(task.duree_hr * 7)
line.number_hour_period = sum(days)
diff --git a/views/project_views.xml b/views/project_views.xml
index de66f53..b04b255 100644
--- a/views/project_views.xml
+++ b/views/project_views.xml
@@ -252,50 +252,73 @@
<!-- Critères CA -->
<div class="row">
<div class="col-12 col-xs-6">
- <separator string="Critères CA"/>
+ <separator string="Critères CA" />
<div class="row">
<div class="col-7 border-right">
- <label for="type_beneficiaire" style="font-weight: bold;"/>
+ <label
+ for="type_beneficiaire"
+ style="font-weight: bold;"
+ />
</div>
- <div class="col-5" style="padding-right: 48px;"><field
- name="type_beneficiaire"
- /></div>
+ <div
+ class="col-5"
+ style="padding-right: 48px;"
+ ><field name="type_beneficiaire" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="objectif_projet" style="font-weight: bold;"/>
+ <label
+ for="objectif_projet"
+ style="font-weight: bold;"
+ />
</div>
- <div class="col-5" style="padding-right: 48px;"><field
- name="objectif_projet"
- /></div>
+ <div
+ class="col-5"
+ style="padding-right: 48px;"
+ ><field name="objectif_projet" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="secteur_crit" style="font-weight: bold;"/>
+ <label
+ for="secteur_crit"
+ style="font-weight: bold;"
+ />
</div>
- <div class="col-5" style="padding-right: 48px;"><field
- name="secteur_crit"
- /></div>
+ <div
+ class="col-5"
+ style="padding-right: 48px;"
+ ><field name="secteur_crit" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="taille" style="font-weight: bold;"/>
+ <label
+ for="taille"
+ style="font-weight: bold;"
+ />
</div>
- <div class="col-5" style="padding-right: 48px;"><field
- name="taille"
- /></div>
+ <div
+ class="col-5"
+ style="padding-right: 48px;"
+ ><field name="taille" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="objectif_formation" style="font-weight: bold;"/>
+ <label
+ for="objectif_formation"
+ style="font-weight: bold;"
+ />
</div>
- <div class="col-5" style="padding-right: 48px;"><field
- name="objectif_formation"
- /></div>
+ <div
+ class="col-5"
+ style="padding-right: 48px;"
+ ><field name="objectif_formation" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="type_formation" style="font-weight: bold;"/>
+ <label
+ for="type_formation"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="type_formation" />
@@ -303,14 +326,20 @@
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="encadrement" style="font-weight: bold;"/>
+ <label
+ for="encadrement"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="encadrement" /></div>
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="bpi" style="font-weight: bold;"/>
+ <label
+ for="bpi"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="bpi" />
@@ -318,7 +347,10 @@
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="nb_emplois" style="font-weight: bold;"/>
+ <label
+ for="nb_emplois"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="nb_emplois" />
@@ -326,7 +358,10 @@
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="type_accompagnement" style="font-weight: bold;" />
+ <label
+ for="type_accompagnement"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="type_accompagnement" />
@@ -337,7 +372,10 @@
attrs="{'invisible': [('type_accompagnement', '!=', 'individualise')], 'required': [('type_accompagnement', '!=', 'individualise')]}"
>
<div class="col-7 border-right">
- <label for="nb_activité" style="font-weight: bold;" />
+ <label
+ for="nb_activité"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="nb_activité" />
@@ -348,7 +386,10 @@
attrs="{'invisible': [('type_accompagnement', '!=', 'territoriaux')], 'required': [('type_accompagnement', '!=', 'territoriaux')]}"
>
<div class="col-7 border-right">
- <label for="nb_coll" style="font-weight: bold;" />
+ <label
+ for="nb_coll"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="nb_coll" />
@@ -359,7 +400,10 @@
attrs="{'invisible': [('type_accompagnement', '!=', 'territoriaux')], 'required': [('type_accompagnement', '!=', 'territoriaux')]}"
>
<div class="col-7 border-right">
- <label for="nb_citoyens" style="font-weight: bold;" />
+ <label
+ for="nb_citoyens"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="nb_citoyens" />
@@ -370,7 +414,10 @@
attrs="{'invisible': [('type_accompagnement', '!=', 'territoriaux')], 'required': [('type_accompagnement', '!=', 'territoriaux')]}"
>
<div class="col-7 border-right">
- <label for="number_comp_terr" style="font-weight: bold;" />
+ <label
+ for="number_comp_terr"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="number_comp_terr" />
@@ -381,7 +428,10 @@
attrs="{'invisible': [('type_accompagnement', '!=', 'interentreprises')], 'required': [('type_accompagnement', '!=', 'interentreprises')]}"
>
<div class="col-7 border-right">
- <label for="nb_entreprises" style="font-weight: bold;" />
+ <label
+ for="nb_entreprises"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="nb_entreprises" />
@@ -389,7 +439,10 @@
</div>
<div class="row">
<div class="col-7 border-right">
- <label for="est_suite" style="font-weight: bold;" />
+ <label
+ for="est_suite"
+ style="font-weight: bold;"
+ />
</div>
<div class="col-5" style="padding-right: 48px;">
<field name="est_suite" />
@@ -650,7 +703,11 @@
</sheet>
</form>
</field>
- <field name="reunion_ids" widget="one2many" context="{'default_project_id': active_id}">
+ <field
+ name="reunion_ids"
+ widget="one2many"
+ context="{'default_project_id': active_id}"
+ >
<tree string="Réunions GAP">
<field name="date" />
<field name="number_participants" readonly="True" />
@@ -658,7 +715,7 @@
<form string="Réunion GAP">
<sheet>
<group class="row">
- <field name="date"/>
+ <field name="date" />
</group>
<label for="participant_ids" />
<field name="participant_ids" widget="one2many">
@@ -919,10 +976,7 @@
<field name="od_ids" widget="many2many_tags" />
<field name="departement" />
<field name="type_convention_id" />
- <field
- name="financement_adefpat"
- string="budget - facturation"
- />
+ <field name="financement_adefpat" string="budget - facturation" />
<field name="objectif_formation" />
<field name="bpi" widget="boolean_integer" />
<field name="type_accompagnement" />
@@ -959,8 +1013,11 @@
<field name="name">Nouveaux Projets par année</field>
<field name="res_model">project.project</field>
<field name="view_mode">tree</field>
- <field name="view_ids" eval="[(5, 0, 0),
- (0, 0, {'view_mode': 'tree', 'view_id': ref('view_adefpat_new_project_reporting_tree')})]"/>
+ <field
+ name="view_ids"
+ eval="[(5, 0, 0),
+ (0, 0, {'view_mode': 'tree', 'view_id': ref('view_adefpat_new_project_reporting_tree')})]"
+ />
<field name="context">{'group_by': 'date_ca:year'}</field>
</record>
--
GitLab