diff --git a/addons/web/static/src/views/calendar/calendar_model.js b/addons/web/static/src/views/calendar/calendar_model.js index 29d20ab364b96..ebdfd2b9dc41f 100644 --- a/addons/web/static/src/views/calendar/calendar_model.js +++ b/addons/web/static/src/views/calendar/calendar_model.js @@ -483,7 +483,7 @@ export class CalendarModel extends Model { * @param {Record} rawRecord */ normalizeRecord(rawRecord) { - const { fields, fieldMapping, isTimeHidden, scale } = this.meta; + const { fields, fieldMapping, isTimeHidden } = this.meta; const startType = fields[fieldMapping.date_start].type; const isAllDay = @@ -515,7 +515,6 @@ export class CalendarModel extends Model { const showTime = !(fieldMapping.all_day && rawRecord[fieldMapping.all_day]) && - scale === "month" && startType !== "date" && start.day === end.day; diff --git a/addons/web/static/tests/views/calendar/calendar_view_tests.js b/addons/web/static/tests/views/calendar/calendar_view_tests.js index b05c6b2e6dd08..262808b68a6b4 100644 --- a/addons/web/static/tests/views/calendar/calendar_view_tests.js +++ b/addons/web/static/tests/views/calendar/calendar_view_tests.js @@ -1291,12 +1291,12 @@ QUnit.module("Views", ({ beforeEach }) => { `, }); - await clickEvent(target, 4); + await clickEvent(target, 2); assert.containsOnce(target, ".o_cw_popover", "should open a popover clicking on event"); assert.strictEqual( target.querySelector(".o_cw_popover .popover-header").textContent, - "event 4", - "popover should have a title 'event 4'" + "event 2", + "popover should have a title 'event 2'" ); assert.containsOnce( target, @@ -1314,10 +1314,14 @@ QUnit.module("Views", ({ beforeEach }) => { "popover should have a close button" ); assert.strictEqual( - target.querySelector(".o_cw_popover .list-group-item b.text-capitalize").textContent, - "December 14, 2016", + target.querySelectorAll(".o_cw_popover .list-group-item")[0].textContent.trim(), + "December 12, 2016", "should display date 'December 14, 2016'" ); + assert.strictEqual( + target.querySelectorAll(".o_cw_popover .list-group-item")[1].textContent.trim(), + "11:55 - 15:55 (4 hours)" + ); assert.containsN( target, ".o_cw_popover .o_cw_popover_fields_secondary .list-group-item", @@ -1336,8 +1340,8 @@ QUnit.module("Views", ({ beforeEach }) => { ); assert.strictEqual( groups[0].querySelector(".o_field_char").textContent, - "event 4", - "value should be a 'event 4'" + "event 2", + "value should be a 'event 2'" ); assert.containsOnce(groups[1], ".o_form_uri", "should apply m20 widget"); assert.strictEqual( @@ -2381,7 +2385,7 @@ QUnit.module("Views", ({ beforeEach }) => { await click(target, ".o-calendar-quick-create--edit-btn"); }); - QUnit.test(`show start time of single day event for month mode`, async (assert) => { + QUnit.test(`show start time of single day event`, async (assert) => { patchTimeZone(-240); await makeView({ @@ -2411,11 +2415,7 @@ QUnit.module("Views", ({ beforeEach }) => { // switch to week mode await changeScale(target, "week"); - assert.containsNone( - findEvent(target, 2), - ".fc-content .fc-time", - "should not show time in week mode as week mode already have time on y-axis" - ); + assert.containsOnce(findEvent(target, 2), ".fc-content .fc-time"); }); QUnit.test(`start time should not shown for date type field`, async (assert) => { @@ -2437,9 +2437,15 @@ QUnit.module("Views", ({ beforeEach }) => { ".fc-content .fc-time", "should not show time for date type field" ); + + await changeScale(target, "week"); + assert.containsNone(findEvent(target, 2), ".fc-content .fc-time"); + + await changeScale(target, "day"); + assert.containsNone(findEvent(target, 2), ".fc-content .fc-time"); }); - QUnit.test(`start time should not shown in month mode if hide_time is true`, async (assert) => { + QUnit.test(`start time should not shown if hide_time is true`, async (assert) => { patchTimeZone(-240); await makeView({ @@ -2456,6 +2462,12 @@ QUnit.module("Views", ({ beforeEach }) => { ".fc-content .fc-time", "should not show time for hide_time attribute" ); + + await changeScale(target, "week"); + assert.containsNone(findEvent(target, 2), ".fc-content .fc-time"); + + await changeScale(target, "day"); + assert.containsNone(findEvent(target, 2), ".fc-content .fc-time"); }); QUnit.test(`readonly date_start field`, async (assert) => { @@ -3483,7 +3495,7 @@ QUnit.module("Views", ({ beforeEach }) => { await click(target, ".o-calendar-quick-create--create-btn"); assert.strictEqual( findEvent(target, 8).textContent, - "new event in quick create", + "00:00 new event in quick create", "should display the new record after quick create dialog" ); });