From 2beeb8b838968a72ed66b7652258b758563cc88b Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Mon, 21 Jun 2021 15:36:41 +0200 Subject: [PATCH] [IMP] web_view_calendar_list: black, isort, prettier --- web_view_calendar_list/__manifest__.py | 20 +-- .../models/ir_actions_act_window_view.py | 6 +- web_view_calendar_list/models/ir_ui_view.py | 6 +- .../static/src/js/calendar_list_controller.js | 8 +- .../static/src/js/calendar_list_model.js | 60 +++---- .../static/src/js/calendar_list_renderer.js | 167 +++++++++--------- .../static/src/js/calendar_list_view.js | 24 ++- web_view_calendar_list/templates/assets.xml | 30 +++- 8 files changed, 160 insertions(+), 161 deletions(-) diff --git a/web_view_calendar_list/__manifest__.py b/web_view_calendar_list/__manifest__.py index 5a0c70e14..bc2bc170e 100644 --- a/web_view_calendar_list/__manifest__.py +++ b/web_view_calendar_list/__manifest__.py @@ -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",], } diff --git a/web_view_calendar_list/models/ir_actions_act_window_view.py b/web_view_calendar_list/models/ir_actions_act_window_view.py index 43f8729a1..3b40c8bfe 100644 --- a/web_view_calendar_list/models/ir_actions_act_window_view.py +++ b/web_view_calendar_list/models/ir_actions_act_window_view.py @@ -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")]) diff --git a/web_view_calendar_list/models/ir_ui_view.py b/web_view_calendar_list/models/ir_ui_view.py index f1daf1af4..277a34369 100644 --- a/web_view_calendar_list/models/ir_ui_view.py +++ b/web_view_calendar_list/models/ir_ui_view.py @@ -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")]) diff --git a/web_view_calendar_list/static/src/js/calendar_list_controller.js b/web_view_calendar_list/static/src/js/calendar_list_controller.js index 18eb05206..77a9cf264 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_controller.js +++ b/web_view_calendar_list/static/src/js/calendar_list_controller.js @@ -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; - }); diff --git a/web_view_calendar_list/static/src/js/calendar_list_model.js b/web_view_calendar_list/static/src/js/calendar_list_model.js index 8ee473151..7b53e3f0d 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_model.js +++ b/web_view_calendar_list/static/src/js/calendar_list_model.js @@ -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 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; - }); diff --git a/web_view_calendar_list/static/src/js/calendar_list_renderer.js b/web_view_calendar_list/static/src/js/calendar_list_renderer.js index 4b488fd91..16e82bab8 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_renderer.js +++ b/web_view_calendar_list/static/src/js/calendar_list_renderer.js @@ -1,18 +1,18 @@ -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({ - _initCalendar: function () { + var AppointmentRenderer = CalendarRenderer.extend({ + _initCalendar: function() { var self = this; this.$calendar = this.$(".o_calendar_widget"); @@ -24,65 +24,69 @@ 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); + eventDrop: function(event) { + self.trigger_up("dropRecord", event); }, - eventResize: function (event) { - self.trigger_up('updateRecord', event); + eventResize: function(event) { + self.trigger_up("updateRecord", event); }, - eventClick: function (event) { - self.trigger_up('openEvent', event); - self.$calendar.fullCalendar('unselect'); + eventClick: function(event) { + 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}; + select: function(target_date, end_date, event, _js_event, _view) { + 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) { + 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'); + eventAfterAllRender: function() { + $(window).trigger("resize"); }, - viewRender: function (view) { + 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 @@ -97,74 +101,71 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { that is not dependant on the class, so we cannot modify it without overwriting all the class */ - _render: function () { + _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'); - 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; + 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'); + $a.addClass("o_selected_range"); + setTimeout(function() { + $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; - }); diff --git a/web_view_calendar_list/static/src/js/calendar_list_view.js b/web_view_calendar_list/static/src/js/calendar_list_view.js index 280b20ec1..7d0a4c229 100644 --- a/web_view_calendar_list/static/src/js/calendar_list_view.js +++ b/web_view_calendar_list/static/src/js/calendar_list_view.js @@ -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; - }); diff --git a/web_view_calendar_list/templates/assets.xml b/web_view_calendar_list/templates/assets.xml index 4431686d6..8a8002c9a 100644 --- a/web_view_calendar_list/templates/assets.xml +++ b/web_view_calendar_list/templates/assets.xml @@ -1,14 +1,28 @@ - + -