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

[UPD]Update function to display page depend on data

parent 9abdacd7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -10,6 +10,40 @@ from odoo.addons.oacc_portal.controllers.main import CustomerPortal as CustomerP
class CustomerPortal(CustomerPortal):
def _get_data_date(self, is_data_cdc, operation=None):
vals = {}
# Si des données existent, récupérer les dates min/max/début/fin de l'opération
if is_data_cdc:
date_start, date_end = operation.get_last_day("week")
date_deb, date_max = operation.get_last_day("day")
date_max = date_max.strftime("%d/%m/%Y")
date_min = operation.get_first_day()
date_min = date_min.strftime("%d/%m/%Y")
vals["data_values"] = operation.get_values_init_graph()
vals["date_vals"] = {
"date_start": date_start or False,
"date_end": date_end or False,
"date_min": date_min or False,
"date_max": date_max or False,
}
else:
vals["data_values"] = {
"date_day_start": False,
"date_day_end": False,
"date_week_start": False,
"date_week_end": False,
"date_month_start": False,
"date_month_end": False,
"date_year_start": False,
"date_year_end": False,
}
return vals
@http.route(
[
'/operation/<model("acc.operation"):operation>/pmo',
......@@ -23,25 +57,14 @@ class CustomerPortal(CustomerPortal):
render_values = {}
render_values.update(self._get_role(operation))
date_start, date_end = operation.get_last_day("week")
date_deb, date_max = operation.get_last_day("day")
date_max = date_max.strftime("%d/%m/%Y")
date_min = operation.get_first_day()
date_min = date_min.strftime("%d/%m/%Y")
render_values.update(operation.get_values_init_graph())
render_values.update(
self._get_data_date(render_values.get("isDataCdc"), operation))
render_values.update(
{
"operation": operation,
"main_object": operation,
"page_name": "pmo",
"date_start": date_start,
"date_end": date_end,
"date_min": date_min,
"date_max": date_max,
"scale": "week",
"is_curve_line": True
}
......@@ -62,15 +85,7 @@ class CustomerPortal(CustomerPortal):
render_values = {}
render_values.update(self._get_role(operation))
date_start, date_end = operation.get_last_day("week")
date_deb, date_max = operation.get_last_day("day")
date_max = date_max.strftime("%d/%m/%Y")
date_min = operation.get_first_day()
date_min = date_min.strftime("%d/%m/%Y")
render_values.update(operation.get_values_init_graph())
render_values.update(self._get_data_date(render_values.get("isDataCdc"), operation))
consumer_ids = operation.acc_delivery_ids.mapped("partner_id")
......@@ -80,10 +95,6 @@ class CustomerPortal(CustomerPortal):
"operation": operation,
"main_object": operation,
"page_name": "conso",
"date_start": date_start,
"date_end": date_end,
"date_min": date_min,
"date_max": date_max,
"scale": "week",
"is_curve_line": True
}
......@@ -106,15 +117,9 @@ class CustomerPortal(CustomerPortal):
render_values = {}
render_values.update(self._get_role(operation))
render_values.update(
self._get_data_date(render_values.get("isDataCdc"), operation))
date_start, date_end = operation.get_last_day("week")
date_deb, date_max = operation.get_last_day("day")
date_max = date_max.strftime("%d/%m/%Y")
date_min = operation.get_first_day()
date_min = date_min.strftime("%d/%m/%Y")
render_values.update(operation.get_values_init_graph())
producer_ids = operation.acc_injection_ids.mapped("partner_id")
render_values.update(
{
......@@ -122,10 +127,6 @@ class CustomerPortal(CustomerPortal):
"producers": producer_ids,
"main_object": operation,
"page_name": "prod",
"date_start": date_start,
"date_end": date_end,
"date_min": date_min,
"date_max": date_max,
"scale": "week",
"is_curve_line": True
}
......
......@@ -62,7 +62,7 @@ class AccOperation(models.Model):
date_year_start = date_year_start.strftime("%Y-%m-%d")
date_year_end = date_year_end.strftime("%Y-%m-%d")
data_values = {
values = {
"date_day_start": date_day_start,
"date_day_end": date_day_end,
"date_week_start": date_week_start,
......@@ -73,20 +73,4 @@ class AccOperation(models.Model):
"date_year_end": date_year_end,
}
values["data_values"] = data_values
return values
date_start, date_end = self.get_last_day("week")
date_deb, date_max = self.get_last_day("day")
date_max = date_max.strftime("%d/%m/%Y")
date_min = self.get_first_day()
date_min = date_min.strftime("%d/%m/%Y")
vals = {
"date_end": date_end,
"date_min": date_min,
"date_start": date_start,
}
return vals
......@@ -167,7 +167,7 @@
<template id="nav_button">
<div class="col-12 text-center">
<button
t-att-value="{'first_day': data_values['date_day_start'], 'last_day': data_values['date_day_end']}"
t-att-value="{'first_day': data_values['date_day_start'] or '', 'last_day': data_values['date_day_end' or '']}"
name="day"
class="btn btn-primary btn-period"
title="Dernier jour"
......@@ -177,7 +177,7 @@
<strong>Jour</strong>
</button>
<button
t-att-value="{'first_day': data_values['date_week_start'], 'last_day': data_values['date_week_end']}"
t-att-value="{'first_day': data_values['date_week_start'] or '', 'last_day': data_values['date_week_end'] or ''}"
name="week"
class="btn btn-primary btn-period btn-week"
title="7 derniers jours"
......@@ -187,7 +187,7 @@
<strong>Semaine</strong>
</button>
<button
t-att-value="{'first_day': data_values['date_month_start'], 'last_day': data_values['date_month_end']}"
t-att-value="{'first_day': data_values['date_month_start'] or '', 'last_day': data_values['date_month_end'] or ''}"
name="month"
class="btn btn-primary btn-period"
title="Dernier mois"
......@@ -197,7 +197,7 @@
<strong>Mois</strong>
</button>
<button
t-att-value="{'first_day': data_values['date_year_start'], 'last_day': data_values['date_year_end']}"
t-att-value="{'first_day': data_values['date_year_start'] or '', 'last_day': data_values['date_year_end'] or ''}"
name="year"
class="btn btn-primary btn-period"
title="12 derniers mois"
......
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