From 0b9e7765ce75877d5167b1af0a6a9806f9949eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Mon, 7 Nov 2022 12:17:13 -0300 Subject: [PATCH] [FIX] mail_activity_done: Remove broken and apparently unused js file --- mail_activity_done/__manifest__.py | 5 -- .../static/src/js/mail_activity.esm.js | 84 ------------------- 2 files changed, 89 deletions(-) delete mode 100644 mail_activity_done/static/src/js/mail_activity.esm.js diff --git a/mail_activity_done/__manifest__.py b/mail_activity_done/__manifest__.py index 298898265..6cc358a1e 100644 --- a/mail_activity_done/__manifest__.py +++ b/mail_activity_done/__manifest__.py @@ -9,11 +9,6 @@ "website": "https://github.com/OCA/social", "depends": ["mail"], "data": ["views/mail_activity_views.xml"], - "assets": { - "web.assets_backend": [ - "mail_activity_done/static/src/js/mail_activity.esm.js", - ], - }, "pre_init_hook": "pre_init_hook", "uninstall_hook": "uninstall_hook", } diff --git a/mail_activity_done/static/src/js/mail_activity.esm.js b/mail_activity_done/static/src/js/mail_activity.esm.js deleted file mode 100644 index da7f686d7..000000000 --- a/mail_activity_done/static/src/js/mail_activity.esm.js +++ /dev/null @@ -1,84 +0,0 @@ -/** @odoo-module **/ - -// Copyright 2018-22 ForgeFlow -// License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -import {qweb as QWeb, _t} from "web.core"; -import mailUtils from "@mail/js/utils"; -import mail_activity from "mail.activity"; -import time from "web.time"; - -// We are forced here to override the method, as there is no possibility -// to inherit it. -var setDelayLabel = function (activities) { - var today = moment().startOf("day"); - _.each(activities, function (activity) { - var to_display = ""; - var deadline = moment(activity.date_deadline).startOf("day"); - // On next line, true means no rounding - var diff = deadline.diff(today, "days", true); - if (diff === 0) { - to_display = _t("Today"); - } else if (diff < 0) { - // This block is for overdue - // eslint-disable-line no-lonely-if - if (diff === -1) { - to_display = _t("Yesterday"); - } else { - to_display = _.str.sprintf(_t("%d days overdue"), Math.abs(diff)); - } - // This block is for due - } else if (diff === 1) { - // eslint-disable-line no-lonely-if - to_display = _t("Tomorrow"); - } else { - to_display = _.str.sprintf(_t("Due in %d days"), Math.abs(diff)); - } - activity.label_delay = to_display; - }); - // We do not want to show the activities that have been completed. - var open_activities = _.filter(activities, function (activity) { - return activity.done !== true; - }); - return open_activities; -}; - -mail_activity.include({ - /** - * @override - * @private - */ - _render: function () { - _.each(this._activities, function (activity) { - var note = mailUtils.parseAndTransform( - activity.note || "", - mailUtils.inline - ); - var is_blank = /^\s*$/.test(note); - if (is_blank) { - activity.note = ""; - } else { - activity.note = mailUtils.parseAndTransform( - activity.note, - mailUtils.addLink - ); - } - }); - var activities = setDelayLabel(this._activities); - if (activities.length) { - var nbActivities = _.countBy(activities, "state"); - this.$el.html( - QWeb.render("mail.activity_items", { - activities: activities, - nbPlannedActivities: nbActivities.planned, - nbTodayActivities: nbActivities.today, - nbOverdueActivities: nbActivities.overdue, - dateFormat: time.getLangDateFormat(), - datetimeFormat: time.getLangDatetimeFormat(), - }) - ); - } else { - this.$el.empty(); - } - }, -});