diff --git a/web_view_calendar_list/README.rst b/web_view_calendar_list/README.rst index cd53324e2..09249e649 100644 --- a/web_view_calendar_list/README.rst +++ b/web_view_calendar_list/README.rst @@ -14,13 +14,13 @@ Web View Calendar List :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/11.0/web_view_calendar_list + :target: https://github.com/OCA/web/tree/12.0/web_view_calendar_list :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_view_calendar_list + :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_view_calendar_list :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/162/11.0 + :target: https://runbot.odoo-community.org/runbot/162/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -79,6 +79,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/web `_ project on GitHub. +This module is part of the `OCA/web `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_view_calendar_list/__manifest__.py b/web_view_calendar_list/__manifest__.py index 3740f21c6..5a0c70e14 100644 --- a/web_view_calendar_list/__manifest__.py +++ b/web_view_calendar_list/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Web View Calendar List', 'summary': """ Show calendars as a List""", - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'AGPL-3', 'author': 'Creu Blanca,Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/web', diff --git a/web_view_calendar_list/i18n/web_view_calendar_list.pot b/web_view_calendar_list/i18n/web_view_calendar_list.pot index 2b39b09f9..0b48c56aa 100644 --- a/web_view_calendar_list/i18n/web_view_calendar_list.pot +++ b/web_view_calendar_list/i18n/web_view_calendar_list.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -13,27 +13,110 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: web_view_calendar_list +#: model:ir.model,name:web_view_calendar_list.model_ir_actions_act_window_view +msgid "Action Window View" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_view_calendar_list #. openerp-web -#: code:addons/web_view_calendar_list/static/src/js/calendar_list_renderer.js:59 +#: code:addons/web_view_calendar_list/static/src/js/calendar_list_renderer.js:63 #, python-format msgid "All day" msgstr "" +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Calendar" +msgstr "" + #. module: web_view_calendar_list #. openerp-web #: code:addons/web_view_calendar_list/static/src/js/calendar_list_view.js:16 +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 #, python-format msgid "Calendar List" msgstr "" #. module: web_view_calendar_list -#: model:ir.model,name:web_view_calendar_list.model_ir_actions_act_window_view -msgid "ir.actions.act_window.view" +#: selection:ir.ui.view,type:0 +msgid "Diagram" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Form" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Gantt" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Graph" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Kanban" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Pivot" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.ui.view,type:0 +msgid "QWeb" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.ui.view,type:0 +msgid "Search" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.ui.view,type:0 +msgid "Timeline" +msgstr "" + +#. module: web_view_calendar_list +#: selection:ir.actions.act_window.view,view_mode:0 +#: selection:ir.ui.view,type:0 +msgid "Tree" msgstr "" #. module: web_view_calendar_list #: model:ir.model,name:web_view_calendar_list.model_ir_ui_view -msgid "ir.ui.view" +msgid "View" +msgstr "" + +#. module: web_view_calendar_list +#: model:ir.model.fields,field_description:web_view_calendar_list.field_ir_actions_act_window_view__view_mode +#: model:ir.model.fields,field_description:web_view_calendar_list.field_ir_ui_view__type +msgid "View Type" +msgstr "" + +#. module: web_view_calendar_list +#. openerp-web +#: code:addons/web_view_calendar_list/static/src/js/calendar_list_renderer.js:77 +#, python-format +msgid "Week " msgstr "" diff --git a/web_view_calendar_list/static/description/index.html b/web_view_calendar_list/static/description/index.html index 5282ce0ba..15490a0aa 100644 --- a/web_view_calendar_list/static/description/index.html +++ b/web_view_calendar_list/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/web Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/web Translate me on Weblate Try me on Runbot

This module adds a new view type that can be used to show calendars as lists.

Table of contents

@@ -398,7 +398,7 @@ It has the same options than calendar:

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -422,7 +422,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/web project on GitHub.

+

This module is part of the OCA/web project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

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 d2fcb9d78..8ee473151 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 @@ -15,15 +15,15 @@ odoo.define('web_view_calendar_list.CalendarListModel', function (require) { the_title = '', attendees = []; - if (!all_day) { - date_start = evt[this.mapping.date_start].clone(); - date_stop = this.mapping.date_stop ? evt[ - this.mapping.date_stop].clone() : null; - } else { + 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) { 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 a135c24b9..4b488fd91 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 @@ -2,15 +2,13 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { "use strict"; var CalendarRenderer = require('web.CalendarRenderer'); - var session = require('web.session'); var core = require('web.core'); - var qweb = core.qweb; var _t = core._t; var scales = { day: 'listDay', week: 'listWeek', - month: 'listMonth' + month: 'listMonth', }; var AppointmentRenderer= CalendarRenderer.extend({ @@ -24,7 +22,7 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { var locale = moment.locale(); $.fullCalendar.locale(locale); - //Documentation here : http://arshaw.com/fullcalendar/docs/ + // Documentation here : http://arshaw.com/fullcalendar/docs/ var fc_options = $.extend({}, this.state.fc_options, { eventDrop: function (event) { self.trigger_up('dropRecord', event); @@ -53,8 +51,14 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { 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); + 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'); } @@ -66,10 +70,13 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { $(window).trigger('resize'); }, viewRender: function (view) { - // compute mode from view.name which is either 'month', 'agendaWeek' or 'agendaDay' + // Compute mode from view.name which is either 'month', + // 'agendaWeek' or 'agendaDay' var mode = view.name === 'listMonth' ? 'month' : (view.name === 'listWeek' ? 'week' : 'day'); - // compute title: in week mode, display the week number - var title = mode === 'week' ? view.intervalStart.week() : view.title; + // Compute title: in week mode, display the week number + var title = mode === 'week' ? _t( + 'Week ' + ) + view.intervalStart.week() : view.title; self.trigger_up('viewUpdated', { mode: mode, title: title, @@ -78,7 +85,9 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { height: 'parent', unselectAuto: false, locale: locale, - // reset locale when fullcalendar has already been instanciated before now + /* Reset locale when fullcalendar has already been + instanciated before now + */ }); this.$calendar.fullCalendar(fc_options); @@ -97,7 +106,9 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { $fc_view.scrollLeft(0); $calendar.fullCalendar('unselect'); - if (scales[this.state.scale] !== $calendar.data('fullCalendar').getView().type) { + if (scales[this.state.scale] !== $calendar.data( + 'fullCalendar' + ).getView().type) { $calendar.fullCalendar('changeView', scales[this.state.scale]); } @@ -112,16 +123,16 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { ).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 () { @@ -136,7 +147,7 @@ odoo.define('web_view_calendar_list.CalendarListRenderer', function (require) { .toggleClass('fa-chevron-left', fullWidth) .attr( 'title', - !fullWidth ? _('Close Sidebar') : _('Open Sidebar')); + fullWidth ? _('Open Sidebar') : _('Close Sidebar')); this.$sidebar_container.toggleClass('o_sidebar_hidden', fullWidth); this.$sidebar.toggleClass('o_hidden', fullWidth);