From 4185d782c3c393e386cb98163361496c16da33c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Fri, 12 Jan 2024 12:19:34 +0100
Subject: [PATCH] [FIX] date errors
---
static/src/js/operation_chart.js | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/static/src/js/operation_chart.js b/static/src/js/operation_chart.js
index 950e164..872623e 100644
--- a/static/src/js/operation_chart.js
+++ b/static/src/js/operation_chart.js
@@ -47,10 +47,14 @@ odoo.define("oacc_portal_overview_cdc.operation_chart", function (require) {
this.chartData = null;
},
- /**
- * @override
- */
- willStart: function () {
+ willStart: async function () {
+ await loadJS("/web/static/lib/Chart/Chart.js");
+ await loadJS(
+ "/oacc_portal_overview_cdc/static/src/js/lib/chartjs-plugin-datalabels.min.js"
+ );
+ await loadJS(
+ "/oacc_portal_overview_cdc/static/lib/daterangepicker/daterangepicker.js"
+ );
var self = this;
var def = this._rpc({
model: "acc.operation",
@@ -60,17 +64,6 @@ odoo.define("oacc_portal_overview_cdc.operation_chart", function (require) {
self.minDate = data.date_min;
self.maxDate = data.date_max;
});
- return Promise.all([this._super.apply(this, arguments), def]);
- },
-
- willStart: async function () {
- await loadJS("/web/static/lib/Chart/Chart.js");
- await loadJS(
- "/oacc_portal_overview_cdc/static/src/js/lib/chartjs-plugin-datalabels.min.js"
- );
- await loadJS(
- "/oacc_portal_overview_cdc/static/lib/daterangepicker/daterangepicker.js"
- );
},
/**
@@ -682,16 +675,16 @@ odoo.define("oacc_portal_overview_cdc.operation_chart", function (require) {
// Disable buttons if first or last date
if (
- moment(this.last_day, "dd/mm/yyyy") >=
- moment(this.maxDate, "dd/mm/yyyy")
+ moment(this.last_day, "DD/MM/YYYY") >=
+ moment(this.maxDate, "DD/MM/YYYY")
) {
$('button[id="next-period"]').prop("disabled", true);
} else {
$('button[id="next-period"]').prop("disabled", false);
}
if (
- moment(this.first_day, "dd/mm/yyyy") <=
- moment(this.minDate, "dd/mm/yyyy")
+ moment(this.first_day, "DD/MM/YYYY") <=
+ moment(this.minDate, "DD/MM/YYYY")
) {
$('button[id="previous-period"]').prop("disabled", true);
} else {
--
GitLab