From c5f8d88d9a8bbce43a870e10615a1c6979317737 Mon Sep 17 00:00:00 2001 From: Carlos Roca Date: Fri, 28 Aug 2020 10:09:49 +0200 Subject: [PATCH] [FIX] mail_activity_done: Added the changes to avoid the linter warnings --- .../static/src/js/mail_activity.js | 59 +++++++++++-------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/mail_activity_done/static/src/js/mail_activity.js b/mail_activity_done/static/src/js/mail_activity.js index 3dea3f9a4..b32e8f341 100644 --- a/mail_activity_done/static/src/js/mail_activity.js +++ b/mail_activity_done/static/src/js/mail_activity.js @@ -1,12 +1,11 @@ -//Copyright 2018-20 ForgeFlow -//License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). +// Copyright 2018-20 ForgeFlow +// License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -odoo.define('mail.Activity.done', function(require) { -"use strict"; +odoo.define('mail.Activity.done', function (require) { + "use strict"; var mailUtils = require('mail.utils'); var core = require('web.core'); - var utils = require('mail.utils'); var time = require('web.time'); var mail_activity = require('mail.Activity'); @@ -15,51 +14,61 @@ odoo.define('mail.Activity.done', function(require) { // We are forced here to override the method, as there is no possibility // to inherit it. - var setDelayLabel = function(activities) { + var setDelayLabel = function (activities) { var today = moment().startOf('day'); - _.each(activities, function(activity) { + _.each(activities, function (activity) { var to_display = ''; var deadline = moment(activity.date_deadline).startOf('day'); - var diff = deadline.diff(today, 'days', true); // true means no rounding - if(diff === 0){ + // 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){ // overdue - if(diff === -1){ + } else { + // This block is for overdue + if (diff < 0) { // 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)); + } else { + to_display = _.str.sprintf( + _t('%d days overdue'), Math.abs(diff) + ); } - }else{ // due - if(diff === 1){ + // 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)); + } 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 + var open_activities = _.filter(activities, function (activity) { + return activity.done !== true; }); return open_activities; }; - var Activity = mail_activity.include({ + mail_activity.include({ + /** * @override * @private */ _render: function () { _.each(this._activities, function (activity) { - var note = mailUtils.parseAndTransform(activity.note || '', mailUtils.inline); + var note = mailUtils.parseAndTransform( + activity.note || '', mailUtils.inline); var is_blank = (/^\s*$/).test(note); - if (!is_blank) { - activity.note = mailUtils.parseAndTransform(activity.note, mailUtils.addLink); - } else { + if (is_blank) { activity.note = ''; + } else { + activity.note = mailUtils.parseAndTransform( + activity.note, mailUtils.addLink); } }); var activities = setDelayLabel(this._activities);