Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
L
lefilament_tdb
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
lefilament_tdb
Validations
5a273831
Valider
5a273831
rédigé
Il y a 11 mois
par
Benjamin - Le Filament
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
[UPD] employee query
parent
72ac948f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
models/lefilament_tdb.py
+51
-24
51 ajouts, 24 suppressions
models/lefilament_tdb.py
templates/dashboard_detail.xml
+6
-0
6 ajouts, 0 suppression
templates/dashboard_detail.xml
avec
57 ajouts
et
24 suppressions
models/lefilament_tdb.py
+
51
−
24
Voir le fichier @
5a273831
...
...
@@ -444,17 +444,45 @@ class LeFilamentTdb(models.Model):
return
result
def
_employee_time
(
self
,
date_start
=
None
,
date_end
=
None
):
clause
=
""
clause
=
"
where 1=1
"
if
date_start
:
clause
+=
f
"
and
aal.
date >=
'
{
date_start
}
'"
clause
+=
f
"
and
line_
date >=
'
{
date_start
}
'
"
if
date_end
:
clause
+=
f
"
and
aal.
date <=
'
{
date_end
}
'"
clause
+=
f
"
and
line_
date <=
'
{
date_end
}
'
"
query
=
"""
select
e.name as
"
Personne
"
,
sum(case when aal.partner_id != 1 or aal.partner_id is null and aal.holiday_id is null then unit_amount else 0 end) as
"
Prod
"
,
sum(case when aal.partner_id = 1 and aal.holiday_id is null then unit_amount else 0 end) as
"
Interne
"
employee as
"
Employé
"
,
sum(production) as
"
Prod
"
,
sum(internal) as
"
Interne
"
,
sum(revenue) as
"
CA
"
from
(
select
p.name as employee,
0 as production,
0 as internal,
aal.amount as revenue,
aal.date as line_date
from
account_analytic_line aal
left join
account_analytic_account aa on aal.account_id = aa.id
left join
account_analytic_plan aap on aa.plan_id = aap.id
left join
res_partner p on aa.partner_id = p.id
where
aap.id = 3
union
select
e.name as employee,
case when aal.partner_id != 1 or aal.partner_id is null and aal.holiday_id is null then unit_amount else 0 end as production,
case when aal.partner_id = 1 and aal.holiday_id is null then unit_amount else 0 end as internal,
0 as revenue,
aal.date as line_date
from
account_analytic_line aal
left join
...
...
@@ -466,11 +494,10 @@ class LeFilamentTdb(models.Model):
where
aal.project_id is not null
and (lt.active is true or lt.active is null)
) query
%s
group by
e.name
order by
sum(case when aal.partner_id != 1 or aal.partner_id is null and aal.holiday_id is null then unit_amount else 0 end) desc
group by employee
order by sum(production) desc
"""
self
.
env
.
cr
.
execute
(
query
,
(
AsIs
(
clause
),))
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
templates/dashboard_detail.xml
+
6
−
0
Voir le fichier @
5a273831
...
...
@@ -72,6 +72,7 @@
<t
t-value=
"records.dashboard_detail_values()"
t-set=
"init_data"
/>
<t
t-value=
"init_data.get('customer')"
t-set=
"customer"
/>
<t
t-value=
"init_data.get('employee_time')"
t-set=
"employee_time"
/>
<t
t-value=
"init_data.get('employee_revenue')"
t-set=
"employee_revenue"
/>
<t
t-call=
"lefilament_tdb.dashboard_detail_values"
/>
</div>
</qweb>
...
...
@@ -103,6 +104,11 @@
<t
t-call=
"lefilament_tdb.dashboard_detail_table"
>
<t
t-set=
"data"
t-value=
"employee_time"
/>
</t>
<h3
class=
"text-uppercase py-2 mb-0 mt-5"
>
CA par employé
</h3>
<hr
class=
"mt-0"
/>
<t
t-call=
"lefilament_tdb.dashboard_detail_table"
>
<t
t-set=
"data"
t-value=
"employee_revenue"
/>
</t>
</div>
</div>
</div>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter