3
0
Fork 0

[MIG] web_view_calendar_list: Migration to 14.0

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
Olga Marco 2022-01-07 10:07:37 +01:00
parent df9116ce1e
commit 0f783d4b23
10 changed files with 124 additions and 220 deletions

View File

@ -38,9 +38,10 @@ Usage
Create a new view using the calendar_list tag. Create a new view using the calendar_list tag.
It has the same options than calendar:: It has the same options than calendar::
<calendar_list date_start="schedule_date" date_delay="duration" color="partner_id"> <calendar_list date_start="schedule_date" date_delay="duration" color="user_id" event_limit="5">
<field name="display_name"/> <field name="user_id" filters="1"/>
<field name="partner_id"/> <field name="priority"/>
<field name="maintenance_type"/>
</calendar_list> </calendar_list>
Bug Tracker Bug Tracker

View File

@ -5,7 +5,7 @@
"name": "Web View Calendar List", "name": "Web View Calendar List",
"summary": """ "summary": """
Show calendars as a List""", Show calendars as a List""",
"version": "13.0.1.0.0", "version": "14.0.1.0.0",
"license": "AGPL-3", "license": "AGPL-3",
"author": "Creu Blanca,Odoo Community Association (OCA)", "author": "Creu Blanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web", "website": "https://github.com/OCA/web",

View File

@ -7,4 +7,7 @@ from odoo import fields, models
class IrActionsActWindowView(models.Model): class IrActionsActWindowView(models.Model):
_inherit = "ir.actions.act_window.view" _inherit = "ir.actions.act_window.view"
view_mode = fields.Selection(selection_add=[("calendar_list", "Calendar List")]) view_mode = fields.Selection(
selection_add=[("calendar_list", "Calendar List")],
ondelete={"calendar_list": "cascade"},
)

View File

@ -7,4 +7,7 @@ from odoo import fields, models
class IrUiView(models.Model): class IrUiView(models.Model):
_inherit = "ir.ui.view" _inherit = "ir.ui.view"
type = fields.Selection(selection_add=[("calendar_list", "Calendar List")]) type = fields.Selection(
selection_add=[("calendar_list", "Calendar List")],
ondelete={"calendar_list": "cascade"},
)

View File

@ -1,9 +1,5 @@
odoo.define("web_view_calendar_list.CalendarListController", function (require) { odoo.define("web_view_calendar_list.CalendarListController", function (require) {
"use strict"; "use strict";
var CalendarController = require("web.CalendarController"); var CalendarController = require("web.CalendarController");
return CalendarController.extend({});
var CalendarListController = CalendarController.extend({});
return CalendarListController;
}); });

View File

@ -1,57 +1,5 @@
odoo.define("web_view_calendar_list.CalendarListModel", function (require) { odoo.define("web_view_calendar_list.CalendarListModel", function (require) {
"use strict"; "use strict";
var CalendarModel = require("web.CalendarModel"); var CalendarModel = require("web.CalendarModel");
return CalendarModel.extend({});
var AppointmentModel = CalendarModel.extend({
_recordToCalendarEvent: function (evt) {
var date_start = false;
var date_stop = false;
var date_delay = evt[this.mapping.date_delay] || 1.0,
all_day =
this.fields[this.mapping.date_start].type === "date" ||
(this.mapping.all_day && evt[this.mapping.all_day]) ||
false,
the_title = "",
attendees = [];
if (all_day) {
date_start = evt[this.mapping.date_start].clone().startOf("day");
date_stop = this.mapping.date_stop
? evt[this.mapping.date_stop].clone().startOf("day")
: null;
} else {
date_start = evt[this.mapping.date_start].clone();
date_stop = this.mapping.date_stop
? evt[this.mapping.date_stop].clone()
: null;
}
if (!date_stop && date_delay) {
date_stop = date_start.clone().add(date_delay, "hours");
}
if (!all_day) {
date_start.add(this.getSession().getTZOffset(date_start), "minutes");
date_stop.add(this.getSession().getTZOffset(date_stop), "minutes");
}
if (this.mapping.all_day && evt[this.mapping.all_day]) {
date_stop.add(1, "days");
}
return {
record: evt,
start: date_start,
end: date_stop,
r_start: date_start,
r_end: date_stop,
title: the_title,
allDay: all_day,
id: evt.id,
attendees: attendees,
};
},
});
return AppointmentModel;
}); });

View File

@ -1,72 +1,15 @@
odoo.define("web_view_calendar_list.CalendarListRenderer", function (require) { odoo.define("web_view_calendar_list.CalendarListRenderer", function (require) {
"use strict"; "use strict";
var CalendarRenderer = require("web.CalendarRenderer"); const CalendarRenderer = require("web.CalendarRenderer");
var core = require("web.core"); const core = require("web.core");
var _t = core._t; const _t = core._t;
var scales = { return CalendarRenderer.extend({
day: "listDay", _getFullCalendarOptions: function (fcOptions) {
week: "listWeek",
month: "listMonth",
};
var AppointmentRenderer = CalendarRenderer.extend({
_initCalendar: function () {
var self = this; var self = this;
return this._super(
this.$calendar = this.$(".o_calendar_widget"); _.extend({}, fcOptions, {
// This seems like a workaround but apparently passing the locale
// in the options is not enough. We should initialize it beforehand
var locale = moment.locale();
$.fullCalendar.locale(locale);
// Documentation here : http://arshaw.com/fullcalendar/docs/
var fc_options = $.extend({}, this.state.fc_options, {
eventDrop: function (event) {
self.trigger_up("dropRecord", event);
},
eventResize: function (event) {
self.trigger_up("updateRecord", event);
},
eventClick: function (event) {
self.trigger_up("openEvent", event);
self.$calendar.fullCalendar("unselect");
},
select: function (target_date, end_date) {
var data = {start: target_date, end: end_date};
if (self.state.context.default_name) {
data.title = self.state.context.default_name;
}
self.trigger_up("openCreate", data);
self.$calendar.fullCalendar("unselect");
},
eventRender: function (event, element) {
var $render = $(self._eventRender(event));
event.title = $render.find(".o_field_type_char:first").text();
element.find(".fc-list-item-title").html($render.html());
element.addClass($render.attr("class"));
var display_hour = "";
if (!event.allDay) {
var start = event.r_start || event.start;
var end = event.r_end || event.end;
var timeFormat =
_t.database.parameters.time_format.search("%H") == -1
? "h:mma"
: "HH:mm";
display_hour =
start.format(timeFormat) + " - " + end.format(timeFormat);
if (display_hour === "00:00 - 00:00") {
display_hour = _t("All day");
}
}
element.find(".fc-list-item-time").text(display_hour);
},
// Dirty hack to ensure a correct first render
windowResize: function () {
self._render();
},
viewRender: function (view) { viewRender: function (view) {
// Compute mode from view.name which is either 'month', // Compute mode from view.name which is either 'month',
// 'agendaWeek' or 'agendaDay' // 'agendaWeek' or 'agendaDay'
@ -86,79 +29,54 @@ odoo.define("web_view_calendar_list.CalendarListRenderer", function (require) {
title: title, title: title,
}); });
}, },
height: "parent", views: {
unselectAuto: false, listDay: {
isRTL: _t.database.parameters.direction === "rtl", columnHeaderFormat: "LL",
locale: locale,
/* Reset locale when fullcalendar has already been
instanciated before now
*/
});
this.$calendar.fullCalendar(fc_options);
}, },
/* listWeek: {
We need to overwrite it in order make a change on the state variable columnHeaderFormat: "ddd D",
that is not dependant on the class, so we cannot modify it without },
overwriting all the class listMonth: {
*/ columnHeaderFormat: "dddd",
_render: function () { },
var $calendar = this.$calendar; },
var $fc_view = $calendar.find(".fc-view"); eventRender: function (info) {
var scrollPosition = $fc_view.scrollLeft(); var event = info.event;
var scrollTop = this.$calendar.find(".fc-scroller").scrollTop(); var element = $(info.el);
element.attr("data-event-id", event.id);
$fc_view.scrollLeft(0); var $render = $(self._eventRender(event));
$calendar.fullCalendar("unselect"); element.find(".fc-list-item-title").html($render.html());
element.addClass($render.attr("class"));
if ( var color = self.getColor(event.extendedProps.color_index);
scales[this.state.scale] !== if (typeof color === "number") {
$calendar.data("fullCalendar").getView().type element
) { .find(".fc-event-dot")
$calendar.fullCalendar("changeView", scales[this.state.scale]); .addClass(_.str.sprintf("o_calendar_color_%s", color));
}
if (this.target_date !== this.state.target_date.toString()) {
$calendar.fullCalendar("gotoDate", moment(this.state.target_date));
this.target_date = this.state.target_date.toString();
}
this.$small_calendar
.datepicker("setDate", this.state.highlight_date.toDate())
.find(".o_selected_range")
.removeClass("o_color o_selected_range");
var $a = false;
switch (this.state.scale) {
case "month":
$a = this.$small_calendar.find("td a");
break;
case "week":
$a = this.$small_calendar.find("tr:has(.ui-state-active) a");
break;
case "day":
$a = this.$small_calendar.find("a.ui-state-active");
break;
}
$a.addClass("o_selected_range");
setTimeout(function () {
$a.not(".ui-state-active").addClass("o_color");
});
$fc_view.scrollLeft(scrollPosition);
this._renderFilters();
this.$calendar.appendTo("body");
if (scrollTop) {
this.$calendar.fullCalendar("reinitView");
} else { } else {
this.$calendar.fullCalendar("render"); element
.find(".fc-event-dot")
.addClass("o_calendar_color_1");
} }
this._renderEvents(); if (typeof color === "string") {
this.$calendar.prependTo(this.$(".o_calendar_view")); element
.find(".fc-event-dot")
return $.when(); .css("background-color", color);
}
// Add background if doesn't exist
if (!element.find(".fc-bg").length) {
element
.find(".fc-content")
.after($("<div/>", {class: "fc-bg"}));
}
// On double click, edit the event
element.on("dblclick", function () {
self.trigger_up("edit_event", {id: event.id});
});
},
plugins: ["list"],
isRTL: _t.database.parameters.direction === "rtl",
})
);
}, },
}); });
return AppointmentRenderer;
}); });

View File

@ -9,6 +9,12 @@ odoo.define("web_view_calendar_list.CalendarListView", function (require) {
var view_registry = require("web.view_registry"); var view_registry = require("web.view_registry");
var _lt = core._lt; var _lt = core._lt;
const scalesInfo = {
day: "listDay",
week: "listWeek",
month: "listMonth",
};
const allowedScales = Object.keys(scalesInfo);
var CalendarListView = CalendarView.extend({ var CalendarListView = CalendarView.extend({
display_name: _lt("Calendar List"), display_name: _lt("Calendar List"),
@ -18,6 +24,19 @@ odoo.define("web_view_calendar_list.CalendarListView", function (require) {
Controller: CalendarListController, Controller: CalendarListController,
Renderer: CalendarListRenderer, Renderer: CalendarListRenderer,
}), }),
init: function () {
this._super.apply(this, arguments);
var scales = allowedScales;
if (this.arch.attrs.scales) {
scales = this.arch.attrs.scales
.split(",")
.filter((x) => allowedScales.includes(x));
}
this.controllerParams.scales = scales;
this.rendererParams.scalesInfo = scalesInfo;
this.loadParams.scales = scales;
this.loadParams.scalesInfo = scalesInfo;
},
}); });
view_registry.add("calendar_list", CalendarListView); view_registry.add("calendar_list", CalendarListView);

View File

@ -0,0 +1,11 @@
// Variables
// =============== Generate color classes ===============
@for $i from 1 through length($o-colors-complete) {
$color: nth($o-colors-complete, $i);
.o_calendar_view .fc-view {
.fc-event-dot.o_calendar_color_#{$i - 1} {
background-color: $color;
}
}
}

View File

@ -23,6 +23,11 @@
type="text/javascript" type="text/javascript"
src="/web_view_calendar_list/static/src/js/calendar_list_view.js" src="/web_view_calendar_list/static/src/js/calendar_list_view.js"
/> />
<link
rel="stylesheet"
type="text/scss"
href="/web_view_calendar_list/static/src/scss/web_calendar_list.scss"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>