Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] mail_activity_done: Added the changes to avoid the linter warnings

pull/599/head
Carlos Roca 2020-08-28 10:09:49 +02:00
parent 80eb0afecd
commit c5f8d88d9a
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mail_activity_done/static/src/js/mail_activity.js
View File

@ -6,7 +6,6 @@ odoo.define('mail.Activity.done', function(require) {
var mailUtils = require('mail.utils'); var mailUtils = require('mail.utils');
var core = require('web.core'); var core = require('web.core');
var utils = require('mail.utils');
var time = require('web.time'); var time = require('web.time');
var mail_activity = require('mail.Activity'); var mail_activity = require('mail.Activity');
@ -20,21 +19,28 @@ odoo.define('mail.Activity.done', function(require) {
_.each(activities, function (activity) { _.each(activities, function (activity) {
var to_display = ''; var to_display = '';
var deadline = moment(activity.date_deadline).startOf('day'); var deadline = moment(activity.date_deadline).startOf('day');
var diff = deadline.diff(today, 'days', true); // true means no rounding // On next line, true means no rounding
var diff = deadline.diff(today, 'days', true);
if (diff === 0) { if (diff === 0) {
to_display = _t('Today'); to_display = _t('Today');
} else { } else {
if(diff < 0){ // overdue // This block is for overdue
if (diff < 0) { // eslint-disable-line no-lonely-if
if (diff === -1) { if (diff === -1) {
to_display = _t('Yesterday'); to_display = _t('Yesterday');
} else { } else {
to_display = _.str.sprintf(_t('%d days overdue'), Math.abs(diff)); to_display = _.str.sprintf(
_t('%d days overdue'), Math.abs(diff)
);
} }
}else{ // due // This block is for due
if(diff === 1){ } else {
if (diff === 1) { // eslint-disable-line no-lonely-if
to_display = _t('Tomorrow'); to_display = _t('Tomorrow');
} else { } else {
to_display = _.str.sprintf(_t('Due in %d days'), Math.abs(diff)); to_display = _.str.sprintf(
_t('Due in %d days'), Math.abs(diff)
);
} }
} }
} }
@ -42,24 +48,27 @@ odoo.define('mail.Activity.done', function(require) {
}); });
// We do not want to show the activities that have been completed. // We do not want to show the activities that have been completed.
var open_activities = _.filter(activities, function (activity) { var open_activities = _.filter(activities, function (activity) {
return activity.done !== true return activity.done !== true;
}); });
return open_activities; return open_activities;
}; };
var Activity = mail_activity.include({ mail_activity.include({
/** /**
* @override * @override
* @private * @private
*/ */
_render: function () { _render: function () {
_.each(this._activities, function (activity) { _.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); var is_blank = (/^\s*$/).test(note);
if (!is_blank) { if (is_blank) {
activity.note = mailUtils.parseAndTransform(activity.note, mailUtils.addLink);
} else {
activity.note = ''; activity.note = '';
} else {
activity.note = mailUtils.parseAndTransform(
activity.note, mailUtils.addLink);
} }
}); });
var activities = setDelayLabel(this._activities); var activities = setDelayLabel(this._activities);