diff --git a/lefilament_projets.py b/lefilament_projets.py index b1c16f149ccb0f4058cac299714d071e90ed9402..1a901bcc7155f9f35d4f59a8d0edf8ac1f1b6a68 100644 --- a/lefilament_projets.py +++ b/lefilament_projets.py @@ -14,6 +14,7 @@ class SapovalPartners(models.Model): lf_taux_horaire = fields.Float('Taux Horaire', compute='_taux_horaire') lf_heures_projet = fields.Float('Heures allouées', compute='_total_heures') lf_heures_passees = fields.Float('Heures passées', compute='_total_heures_passees') + lf_heures_restantes = fields.Float('Heures restantes', compute='_total_heures_restantes') @api.one def _taux_horaire(self): @@ -29,8 +30,10 @@ class SapovalPartners(models.Model): @api.one def _total_heures_passees(self): res = 0.0 - #task = self.pool.get('project.task') - # task_ids = task.search(cr, uid, [('project_id', '=', id)], context=context) for record in self.task_ids: res = res + record.effective_hours - self.lf_heures_passees = res \ No newline at end of file + self.lf_heures_passees = res + + @api.one + def _total_heures_restantes(self): + self.lf_heures_restantes = self.lf_heures_projet - self.lf_heures_passees \ No newline at end of file diff --git a/views/lefilament_projets_view.xml b/views/lefilament_projets_view.xml index 965456d7b81c3a396e81fda8c81f2bb5aabf5e0a..8139818a6ca8b6e9b50196808cb5198d2a313553 100644 --- a/views/lefilament_projets_view.xml +++ b/views/lefilament_projets_view.xml @@ -47,9 +47,23 @@ <field name="inherit_id" ref="project.view_project_kanban"/> <field name="arch" type="xml"> <xpath expr="//div[@class='o_kanban_primary_left']" position="after"> - <field name="lf_total_budget"> euros</field><br /> - <field name="lf_heures_projet" > heures prévues</field><br /> - <field name="lf_heures_passees" > heures passées</field> + <field name="lf_total_budget"> euros</field> + <table class="table table-condensed"> + <thead style="background: transparent; border-bottom: 1px solid #555;"> + <tr> + <td style="padding: 5px 0;">prévu</td> + <td style="padding: 5px 0;">cours</td> + <td style="padding: 5px 0;">reste</td> + </tr> + </thead> + <tbody> + <tr> + <td style="padding: 5px 0;border-top: 1px solid #555;"><field name="lf_heures_projet" >h</field></td> + <td style="padding: 5px 0;border-top: 1px solid #555;"><field name="lf_heures_passees" >h</field></td> + <td style="padding: 5px 0;border-top: 1px solid #555;"><field name="lf_heures_restantes" >h</field></td> + </tr> + </tbody> + </table> </xpath> </field> </record>