pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] spreadshet: wrong date format for week in pivot

Browse Source 
When importing a pivot with a date field in week format, the date was
formatted as "W2023 40" instead of "W40 2023".

closes odoo/odoo#137682

Task: 3539629
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
This commit is contained in:
Adrien Minne (adrm)
2023-10-20 20:52:41 +00:00
parent ad4af37b96
commit bb4216b950
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/spreadsheet/static/src/pivot/pivot_time_adapters.js
+1 -1
View File
@@ -123,7 +123,7 @@ const weekAdapter = {
return `${nextWeek.weekNumber}/${nextWeek.weekYear}`;
},
format(normalizedValue, locale) {
const [year, week] = normalizedValue.split("/");
const [week, year] = normalizedValue.split("/");
return sprintf(_t("W%(week)s %(year)s"), { week, year });
},
};
addons/spreadsheet/static/tests/pivots/pivot_helpers_test.js
+36
View File
@@ -2,6 +2,9 @@
import { getFirstPivotFunction, getNumberOfPivotFormulas } from "@spreadsheet/pivot/pivot_helpers";
import { getFirstListFunction, getNumberOfListFormulas } from "@spreadsheet/list/list_helpers";
import { toNormalizedPivotValue } from "@spreadsheet/pivot/pivot_model";
import { pivotTimeAdapter } from "@spreadsheet/pivot/pivot_time_adapters";
import { constants } from "@odoo/o-spreadsheet";
const { DEFAULT_LOCALE } = constants;
function stringArg(value) {
return { type: "STRING", value: `${value}` };
@@ -172,3 +175,36 @@ QUnit.module("spreadsheet > toNormalizedPivotValue", {}, () => {
}
});
});
QUnit.module("spreadsheet > pivot time adapters formatted value", {}, () => {
QUnit.test("Day adapter", (assert) => {
const adapter = pivotTimeAdapter("day");
assert.strictEqual(adapter.format("11/12/2020", DEFAULT_LOCALE), "11/12/2020");
assert.strictEqual(adapter.format("01/11/2020", DEFAULT_LOCALE), "1/11/2020");
assert.strictEqual(adapter.format("12/05/2020", DEFAULT_LOCALE), "12/5/2020");
});
QUnit.test("Week adapter", (assert) => {
const adapter = pivotTimeAdapter("week");
assert.strictEqual(adapter.format("5/2024", DEFAULT_LOCALE), "W5 2024");
assert.strictEqual(adapter.format("51/2020", DEFAULT_LOCALE), "W51 2020");
});
QUnit.test("Month adapter", (assert) => {
const adapter = pivotTimeAdapter("month");
assert.strictEqual(adapter.format("12/2020", DEFAULT_LOCALE), "December 2020");
assert.strictEqual(adapter.format("02/2020", DEFAULT_LOCALE), "February 2020");
});
QUnit.test("Quarter adapter", (assert) => {
const adapter = pivotTimeAdapter("quarter");
assert.strictEqual(adapter.format("1/2022", DEFAULT_LOCALE), "Q1 2022");
assert.strictEqual(adapter.format("3/1998", DEFAULT_LOCALE), "Q3 1998");
});
QUnit.test("Year adapter", (assert) => {
const adapter = pivotTimeAdapter("year");
assert.strictEqual(adapter.format("2020", DEFAULT_LOCALE), "2020");
assert.strictEqual(adapter.format("1997", DEFAULT_LOCALE), "1997");
});
});