diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 1187282953..a26fe00801 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -3,15 +3,16 @@
frappe.provide('frappe.timeline');
-frappe.ui.form.Timeline = Class.extend({
- init: function(opts) {
+frappe.ui.form.Timeline = class Timeline {
+ constructor(opts) {
$.extend(this, opts);
this.make();
- },
- make: function() {
+ }
+
+ make() {
var me = this;
this.wrapper = $(frappe.render_template("timeline",
- {doctype: this.frm.doctype})).appendTo(this.parent);
+ {doctype: me.frm.doctype, allow_events_in_timeline: me.frm.meta.allow_events_in_timeline})).appendTo(me.parent);
this.list = this.wrapper.find(".timeline-items");
@@ -31,6 +32,7 @@ frappe.ui.form.Timeline = Class.extend({
});
this.setup_email_button();
+ this.setup_interaction_button();
this.list.on("click", ".toggle-blockquote", function() {
$(this).parent().siblings("blockquote").toggleClass("hidden");
@@ -69,11 +71,11 @@ frappe.ui.form.Timeline = Class.extend({
});
});
- },
+ }
- setup_email_button: function() {
+ setup_email_button() {
var me = this;
- var selector = this.frm.doctype === "Communication"? ".btn-reply-email": ".btn-new-email"
+ var selector = this.frm.doctype === "Communication"? ".btn-reply-email": ".btn-new-email";
this.email_button = this.wrapper.find(selector)
.on("click", function() {
var args = {
@@ -96,11 +98,39 @@ frappe.ui.form.Timeline = Class.extend({
}
new frappe.views.CommunicationComposer(args)
});
- },
+ }
- refresh: function(scroll_to_end) {
+ setup_interaction_button() {
var me = this;
+ var selector = ".btn-new-interaction";
+ this.activity_button = this.wrapper.find(selector)
+ .on("click", function() {
+ var args = {
+ doc: me.frm.doc,
+ frm: me.frm,
+ recipients: me.get_recipient()
+ }
+ $.extend(args, {
+ txt: frappe.markdown(me.comment_area.val())
+ });
+ new frappe.views.InteractionComposer(args);
+ });
+ }
+ setup_editing_area() {
+ this.$editing_area = $('
');
+
+ this.editing_area = new frappe.ui.CommentArea({
+ parent: this.$editing_area,
+ mentions: this.get_names_for_mentions(),
+ no_wrapper: true
+ });
+
+ this.editing_area.destroy();
+ }
+
+ refresh(scroll_to_end) {
+ var me = this;
this.last_type = "Comment";
if(this.frm.doc.__islocal) {
@@ -110,18 +140,20 @@ frappe.ui.form.Timeline = Class.extend({
this.wrapper.toggle(true);
this.list.empty();
this.comment_area.set_value('');
- var communications = this.get_communications(true);
+ let communications = this.get_communications(true);
var views = this.get_view_logs();
var timeline = communications.concat(views);
timeline
- .sort((a, b) => a.creation > b.creation ? -1 : 1)
- .filter(c => c.content)
- .forEach(c => {
- c.frm = me.frm;
- me.render_timeline_item(c);
+ .filter(a => a.content)
+ .sort((b, c) => me.compare_dates(b, c))
+ .forEach(d => {
+ d.frm = me.frm;
+ me.render_timeline_item(d);
});
+
+
// more btn
if (this.more===undefined && timeline.length===20) {
this.more = true;
@@ -149,7 +181,14 @@ frappe.ui.form.Timeline = Class.extend({
this.frm.sidebar.refresh_comments();
this.frm.trigger('timeline_refresh');
- },
+ }
+
+ compare_dates(b, c) {
+ let b_date = b.communication_date ? b.communication_date : b.creation;
+ let c_date = c.communication_date ? c.communication_date : c.creation;
+ let comparison = new Date(b_date) > new Date(c_date) ? -1 : 1;
+ return comparison;
+ }
make_editing_area(container) {
return frappe.ui.form.make_control({
@@ -166,7 +205,7 @@ frappe.ui.form.Timeline = Class.extend({
});
},
- render_timeline_item: function(c) {
+ render_timeline_item(c) {
var me = this;
this.prepare_timeline_item(c);
var $timeline_item = $(frappe.render_template("timeline_item", {data:c, frm:this.frm}))
@@ -224,9 +263,9 @@ frappe.ui.form.Timeline = Class.extend({
this.add_reply_btn_event($timeline_item, c);
}
- },
+ }
- add_reply_btn_event: function($timeline_item, c) {
+ add_reply_btn_event($timeline_item, c) {
var me = this;
$timeline_item.find(".reply-link").on("click", function() {
var name = $(this).attr("data-name");
@@ -249,9 +288,9 @@ frappe.ui.form.Timeline = Class.extend({
last_email: last_email
});
});
- },
+ }
- prepare_timeline_item: function(c) {
+ prepare_timeline_item(c) {
if(!c.sender) c.sender = c.owner;
if(c.sender && c.sender.indexOf("<")!==-1) {
@@ -271,8 +310,9 @@ frappe.ui.form.Timeline = Class.extend({
c["edit"] = '';
}
}
- c.comment_on_small = comment_when(c.creation, true);
- c.comment_on = comment_when(c.creation);
+ c.comment_on_small = comment_when(c.communication_date, true);
+ c.comment_on = comment_when(c.communication_date);
+ c.futur_date = c.communication_date > frappe.datetime.now_datetime() ? true : false;
if(!c.fullname) {
c.fullname = c.sender_full_name || frappe.user.full_name(c.sender);
}
@@ -356,15 +396,15 @@ frappe.ui.form.Timeline = Class.extend({
c.show_subject = true;
}
}
- },
+ }
- is_communication_or_comment: function(c) {
+ is_communication_or_comment(c) {
return c.communication_type==="Communication"
|| c.communication_type==="Feedback"
|| (c.communication_type==="Comment" && (c.comment_type==="Comment"||c.comment_type==="Relinked"));
- },
+ }
- set_icon_and_color: function(c) {
+ set_icon_and_color(c) {
if(c.communication_type == "Feedback"){
c.icon = "octicon octicon-comment-discussion"
c.rating_icons = frappe.render_template("rating_icons", {rating: c.rating, show_label: true})
@@ -375,6 +415,9 @@ frappe.ui.form.Timeline = Class.extend({
"Chat": "octicon octicon-comment-discussion",
"Phone": "octicon octicon-device-mobile",
"SMS": "octicon octicon-comment",
+ "Event": "fa fa-calendar",
+ "Meeting": "octicon octicon-briefcase",
+ "ToDo": "fa fa-check",
"Created": "octicon octicon-plus",
"Submitted": "octicon octicon-lock",
"Cancelled": "octicon octicon-x",
@@ -419,8 +462,9 @@ frappe.ui.form.Timeline = Class.extend({
}
if(!c.icon_fg)
c.icon_fg = "#fff";
- },
- get_communications: function(with_versions) {
+ }
+
+ get_communications(with_versions) {
var docinfo = this.frm.get_docinfo(),
me = this,
out = [].concat(docinfo.communications);
@@ -429,8 +473,9 @@ frappe.ui.form.Timeline = Class.extend({
}
return out;
- },
- get_view_logs: function(){
+ }
+
+ get_view_logs(){
var docinfo = this.frm.get_docinfo(),
me = this,
out = [];
@@ -440,9 +485,9 @@ frappe.ui.form.Timeline = Class.extend({
out.push(c);
};
return out;
- },
+ }
- build_version_comments: function(docinfo, out) {
+ build_version_comments(docinfo, out) {
var me = this;
docinfo.versions.forEach(function(version) {
if(!version.data) return;
@@ -543,8 +588,9 @@ frappe.ui.form.Timeline = Class.extend({
}
});
});
- },
- get_version_comment: function(version, text, comment_type) {
+ }
+
+ get_version_comment(version, text, comment_type) {
if(!comment_type) {
text = '
' + text + '';
}
@@ -557,9 +603,9 @@ frappe.ui.form.Timeline = Class.extend({
comment_by: version.owner,
content: text
};
- },
+ }
- insert_comment: function(comment_type, comment, btn) {
+ insert_comment(comment_type, comment, btn) {
var me = this;
return frappe.call({
method: "frappe.desk.form.utils.add_comment",
@@ -599,9 +645,9 @@ frappe.ui.form.Timeline = Class.extend({
}
});
- },
+ }
- delete_comment: function(name) {
+ delete_comment(name) {
var me = this;
frappe.confirm(__('Delete comment?'), function() {
@@ -627,7 +673,7 @@ frappe.ui.form.Timeline = Class.extend({
}
});
});
- },
+ }
/**
* Update comment
@@ -637,8 +683,7 @@ frappe.ui.form.Timeline = Class.extend({
*
* @returns {boolean}
*/
- update_comment: function(name, content)
- {
+ update_comment(name, content){
return frappe.call({
method: 'frappe.desk.form.utils.update_comment',
args: { name, content },
@@ -648,17 +693,17 @@ frappe.ui.form.Timeline = Class.extend({
}
}
});
- },
+ }
- get_recipient: function() {
+ get_recipient() {
if(this.frm.email_field) {
return this.frm.doc[this.frm.email_field];
} else {
return this.frm.doc.email_id || this.frm.doc.email || "";
}
- },
+ }
- get_last_email: function(from_recipient) {
+ get_last_email(from_recipient) {
var last_email = null,
communications = this.frm.get_docinfo().communications,
email = this.get_recipient();
@@ -678,21 +723,21 @@ frappe.ui.form.Timeline = Class.extend({
});
return last_email;
- },
+ }
- get_names_for_mentions: function() {
+ get_names_for_mentions() {
var valid_users = Object.keys(frappe.boot.user_info)
.filter(user => !["Administrator", "Guest"].includes(user));
return valid_users.map(user => frappe.boot.user_info[user].name);
- },
+ }
- setup_comment_like: function() {
+ setup_comment_like() {
this.wrapper.on("click", ".comment-likes .octicon-heart", frappe.ui.click_toggle_like);
frappe.ui.setup_like_popover(this.wrapper, ".comment-likes");
}
-});
+};
$.extend(frappe.timeline, {
new_communication: function(communication) {
@@ -760,4 +805,4 @@ $.extend(frappe.timeline, {
return index;
}
-})
+})
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index 558e287175..6d10ca8b0d 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -96,9 +96,9 @@
data-name="{%= data.name %}" title="{%= __("Reply") %}">{%= __("Reply") %}
{% } %}
{% } %}
-