3
0
Fork 0

[IMP] web_view_calendar_list: black, isort, prettier

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
Enric Tobella 2021-06-21 15:36:41 +02:00 committed by Olga Marco
parent 8863c66381
commit 2beeb8b838
8 changed files with 160 additions and 161 deletions

View File

@ -2,17 +2,13 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
'name': 'Web View Calendar List',
'summary': """
"name": "Web View Calendar List",
"summary": """
Show calendars as a List""",
'version': '12.0.1.0.0',
'license': 'AGPL-3',
'author': 'Creu Blanca,Odoo Community Association (OCA)',
'website': 'https://github.com/OCA/web',
'depends': [
'web',
],
'data': [
'templates/assets.xml',
],
"version": "12.0.1.0.0",
"license": "AGPL-3",
"author": "Creu Blanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web",
"depends": ["web",],
"data": ["templates/assets.xml",],
}

View File

@ -5,8 +5,6 @@ from odoo import fields, models
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")])

View File

@ -5,8 +5,6 @@ from odoo import fields, models
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")])

View File

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

View File

@ -1,59 +1,57 @@
odoo.define('web_view_calendar_list.CalendarListModel', function (require) {
odoo.define("web_view_calendar_list.CalendarListModel", function(require) {
"use strict";
var CalendarModel = require('web.CalendarModel');
var CalendarModel = require("web.CalendarModel");
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 = '',
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;
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;
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');
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');
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');
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,
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,14 +1,14 @@
odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) {
odoo.define("web_view_calendar_list.CalendarListRenderer", function(require) {
"use strict";
var CalendarRenderer = require('web.CalendarRenderer');
var core = require('web.core');
var CalendarRenderer = require("web.CalendarRenderer");
var core = require("web.core");
var _t = core._t;
var scales = {
day: 'listDay',
week: 'listWeek',
month: 'listMonth',
day: "listDay",
week: "listWeek",
month: "listMonth",
};
var AppointmentRenderer = CalendarRenderer.extend({
@ -25,64 +25,68 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) {
// Documentation here : http://arshaw.com/fullcalendar/docs/
var fc_options = $.extend({}, this.state.fc_options, {
eventDrop: function(event) {
self.trigger_up('dropRecord', event);
self.trigger_up("dropRecord", event);
},
eventResize: function(event) {
self.trigger_up('updateRecord', event);
self.trigger_up("updateRecord", event);
},
eventClick: function(event) {
self.trigger_up('openEvent', event);
self.$calendar.fullCalendar('unselect');
self.trigger_up("openEvent", event);
self.$calendar.fullCalendar("unselect");
},
select: function(target_date, end_date, event, _js_event, _view) {
var data = {'start': target_date, 'end': 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');
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 = '';
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 ? 'HH:mm': 'h:mma'
);
display_hour = start.format(
timeFormat
) + ' - ' + end.format(timeFormat);
if (display_hour === '00:00 - 00:00') {
display_hour = _t('All day');
var timeFormat =
_t.database.parameters.time_format.search("%H") != -1
? "HH:mm"
: "h:mma";
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);
element.find(".fc-list-item-time").text(display_hour);
},
// Dirty hack to ensure a correct first render
eventAfterAllRender: function() {
$(window).trigger('resize');
$(window).trigger("resize");
},
viewRender: function(view) {
// Compute mode from view.name which is either 'month',
// 'agendaWeek' or 'agendaDay'
var mode = view.name === 'listMonth' ? 'month' : (view.name === 'listWeek' ? 'week' : 'day');
var mode =
view.name === "listMonth"
? "month"
: view.name === "listWeek"
? "week"
: "day";
// Compute title: in week mode, display the week number
var title = mode === 'week' ? _t(
'Week '
) + view.intervalStart.week() : view.title;
self.trigger_up('viewUpdated', {
var title =
mode === "week"
? _t("Week ") + view.intervalStart.week()
: view.title;
self.trigger_up("viewUpdated", {
mode: mode,
title: title,
});
},
height: 'parent',
height: "parent",
unselectAuto: false,
locale: locale,
/* Reset locale when fullcalendar has already been
@ -99,72 +103,69 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) {
*/
_render: function() {
var $calendar = this.$calendar;
var $fc_view = $calendar.find('.fc-view');
var $fc_view = $calendar.find(".fc-view");
var scrollPosition = $fc_view.scrollLeft();
var scrollTop = this.$calendar.find('.fc-scroller').scrollTop();
var scrollTop = this.$calendar.find(".fc-scroller").scrollTop();
$fc_view.scrollLeft(0);
$calendar.fullCalendar('unselect');
$calendar.fullCalendar("unselect");
if (scales[this.state.scale] !== $calendar.data(
'fullCalendar'
).getView().type) {
$calendar.fullCalendar('changeView', scales[this.state.scale]);
if (
scales[this.state.scale] !==
$calendar.data("fullCalendar").getView().type
) {
$calendar.fullCalendar("changeView", scales[this.state.scale]);
}
if (this.target_date !== this.state.target_date.toString()) {
$calendar.fullCalendar(
'gotoDate', moment(this.state.target_date));
$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');
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');
case "month":
$a = this.$small_calendar.find("td a");
break;
case 'week':
$a = this.$small_calendar.find(
'tr:has(.ui-state-active) a');
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');
case "day":
$a = this.$small_calendar.find("a.ui-state-active");
break;
}
$a.addClass('o_selected_range');
$a.addClass("o_selected_range");
setTimeout(function() {
$a.not('.ui-state-active').addClass('o_color');
$a.not(".ui-state-active").addClass("o_color");
});
$fc_view.scrollLeft(scrollPosition);
var fullWidth = this.state.fullWidth;
this.$('.o_calendar_sidebar_toggler')
.toggleClass('fa-close', !fullWidth)
.toggleClass('fa-chevron-left', fullWidth)
.attr(
'title',
fullWidth ? _('Open Sidebar') : _('Close Sidebar'));
this.$sidebar_container.toggleClass('o_sidebar_hidden', fullWidth);
this.$sidebar.toggleClass('o_hidden', fullWidth);
this.$(".o_calendar_sidebar_toggler")
.toggleClass("fa-close", !fullWidth)
.toggleClass("fa-chevron-left", fullWidth)
.attr("title", fullWidth ? _("Open Sidebar") : _("Close Sidebar"));
this.$sidebar_container.toggleClass("o_sidebar_hidden", fullWidth);
this.$sidebar.toggleClass("o_hidden", fullWidth);
this._renderFilters();
this.$calendar.appendTo('body');
this.$calendar.appendTo("body");
if (scrollTop) {
this.$calendar.fullCalendar('reinitView');
this.$calendar.fullCalendar("reinitView");
} else {
this.$calendar.fullCalendar('render');
this.$calendar.fullCalendar("render");
}
this._renderEvents();
this.$calendar.prependTo(this.$('.o_calendar_view'));
this.$calendar.prependTo(this.$(".o_calendar_view"));
return $.when();
},
});
return AppointmentRenderer;
});

View File

@ -1,20 +1,18 @@
odoo.define('web_view_calendar_list.CalendarListView', function (require) {
odoo.define("web_view_calendar_list.CalendarListView", function(require) {
"use strict";
var CalendarView = require('web.CalendarView');
var core = require('web.core');
var CalendarListController = require(
'web_view_calendar_list.CalendarListController');
var CalendarListModel = require('web_view_calendar_list.CalendarListModel');
var CalendarListRenderer = require(
'web_view_calendar_list.CalendarListRenderer');
var view_registry = require('web.view_registry');
var CalendarView = require("web.CalendarView");
var core = require("web.core");
var CalendarListController = require("web_view_calendar_list.CalendarListController");
var CalendarListModel = require("web_view_calendar_list.CalendarListModel");
var CalendarListRenderer = require("web_view_calendar_list.CalendarListRenderer");
var view_registry = require("web.view_registry");
var _lt = core._lt;
var CalendarListView = CalendarView.extend({
display_name: _lt('Calendar List'),
icon: 'fa-calendar-check-o',
display_name: _lt("Calendar List"),
icon: "fa-calendar-check-o",
config: {
Model: CalendarListModel,
Controller: CalendarListController,
@ -22,9 +20,7 @@ odoo.define('web_view_calendar_list.CalendarListView', function (require) {
},
});
view_registry
.add('calendar_list', CalendarListView);
view_registry.add("calendar_list", CalendarListView);
return CalendarListView;
});

View File

@ -1,14 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="assets_backend"
<template
id="assets_backend"
name="Backend Assets (used in backend interface)"
inherit_id="web.assets_backend">
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_view_calendar_list/static/src/js/calendar_list_renderer.js"/>
<script type="text/javascript" src="/web_view_calendar_list/static/src/js/calendar_list_model.js"/>
<script type="text/javascript" src="/web_view_calendar_list/static/src/js/calendar_list_controller.js"/>
<script type="text/javascript" src="/web_view_calendar_list/static/src/js/calendar_list_view.js"/>
<script
type="text/javascript"
src="/web_view_calendar_list/static/src/js/calendar_list_renderer.js"
/>
<script
type="text/javascript"
src="/web_view_calendar_list/static/src/js/calendar_list_model.js"
/>
<script
type="text/javascript"
src="/web_view_calendar_list/static/src/js/calendar_list_controller.js"
/>
<script
type="text/javascript"
src="/web_view_calendar_list/static/src/js/calendar_list_view.js"
/>
</xpath>
</template>
</odoo>