')
+ .addClass('form-control table-multiselect')
+ .appendTo(this.$input_area);
+
+ this.$input.removeClass('form-control');
+ this.$input_area.find('.awesomplete').appendTo(this.$multiselect_wrapper);
+
+ this.$input.on("awesomplete-selectcomplete", () => {
+ this.$input.val('').focus();
+ });
+
+ // used as an internal model to store values
+ this.rows = [];
+
+ this.$input_area.on('click', '.btn-remove', (e) => {
+ const $target = $(e.currentTarget);
+ const $value = $target.closest('.tb-selected-value');
+
+ const value = decodeURIComponent($value.data().value);
+ this.rows = this.rows.filter(val => val !== value);
+
+ this.parse_validate_and_set_in_model('');
+ });
+
+ this.$input.on('keydown', e => {
+ // if backspace key pressed on empty input, delete last value
+ if (e.keyCode == frappe.ui.keyCode.BACKSPACE && e.target.value === '') {
+ this.rows = this.rows.slice(0, this.rows.length - 1);
+ this.parse_validate_and_set_in_model('');
+ }
+ });
+ },
+
+ parse(value) {
+ if (value) {
+ this.rows.push(value);
+ }
+
+ return this.rows;
+ },
+
+ validate(value) {
+ const rows = (value || []).slice();
+
+ if (rows.length === 0) {
+ return rows;
+ }
+
+ const all_rows_except_last = rows.slice(0, rows.length - 1);
+ const last_value = rows[rows.length - 1];
+
+ // falsy value
+ if (!last_value) {
+ return all_rows_except_last;
+ }
+
+ // duplicate value
+ if (all_rows_except_last.includes(last_value)) {
+ return all_rows_except_last;
+ }
+
+ return rows;
+ },
+
+ set_formatted_input(value) {
+ this.rows = value || [];
+ this.set_pill_html(this.rows);
+ },
+
+ set_pill_html(values) {
+ const html = values
+ .map(value => this.get_pill_html(value))
+ .join('');
+
+ this.$multiselect_wrapper.find('.tb-selected-value').remove();
+ this.$multiselect_wrapper.prepend(html);
+ },
+
+ get_pill_html(value) {
+ const encoded_value = encodeURIComponent(value);
+ return `
+ ${__(value)}
+
+
+
`;
+ },
+
+ get_awesomplete_settings() {
+ const settings = this._super();
+
+ return Object.assign(settings, {
+ filter: function(text, input) {
+ let d = this.get_item(text.value);
+ if(!d) {
+ return Awesomplete.FILTER_CONTAINS(text, input.match(/[^,]*$/)[0]);
+ }
+
+ let getMatch = value => Awesomplete.FILTER_CONTAINS(value, input.match(/[^,]*$/)[0]);
+
+ // match typed input with label or value or description
+ let v = getMatch(d.label);
+ if(!v && d.value) {
+ v = getMatch(d.value);
+ }
+ if(!v && d.description) {
+ v = getMatch(d.description);
+ }
+
+ return v;
+ }
+ });
+ },
+
+ get_value() {
+ return this.rows;
+ },
+
+ get_values() {
+ return this.rows;
+ },
+
+ get_data() {
+ let data;
+ if(this.df.get_data) {
+ data = this.df.get_data();
+ if (data && data.then) {
+ data.then((r) => {
+ this.set_data(r);
+ });
+ data = this.get_value();
+ } else {
+ this.set_data(data);
+ }
+ } else {
+ data = this._super();
+ }
+ const values = this.get_values() || [];
+
+ // return values which are not already selected
+ if (data) data.filter(d => !values.includes(d));
+ return data;
+ }
+});
diff --git a/frappe/public/js/frappe/form/controls/rating.js b/frappe/public/js/frappe/form/controls/rating.js
new file mode 100644
index 0000000000..844e932665
--- /dev/null
+++ b/frappe/public/js/frappe/form/controls/rating.js
@@ -0,0 +1,62 @@
+frappe.ui.form.ControlRating = frappe.ui.form.ControlInt.extend({
+ make_input() {
+ this._super();
+ const star_template = `
+
+
+ `;
+
+ $(this.input_area).html(star_template);
+
+ $(this.input_area).find('i').hover((ev) => {
+ const el = $(ev.currentTarget);
+ let star_value = el.data('idx');
+ el.parent().children('i.fa').each( function(e){
+ if (e < star_value) {
+ $(this).addClass('star-hover');
+ } else {
+ $(this).removeClass('star-hover');
+ }
+ });
+ }, (ev) => {
+ const el = $(ev.currentTarget);
+ el.parent().children('i.fa').each( function() {
+ $(this).removeClass('star-hover');
+ });
+ });
+
+ $(this.input_area).find('i').click((ev) => {
+ const el = $(ev.currentTarget);
+ let star_value = el.data('idx');
+ el.parent().children('i.fa').each( function(e) {
+ if (e < star_value){
+ $(this).addClass('star-click');
+ } else {
+ $(this).removeClass('star-click');
+ }
+ });
+ this.validate_and_set_in_model(star_value, ev);
+ if (this.doctype && this.docname) {
+ this.set_input(star_value);
+ }
+ });
+ },
+ get_value() {
+ return cint(this.value);
+ },
+ set_formatted_input(value) {
+ let el = $(this.input_area).find('i');
+ el.children('i.fa').prevObject.each( function(e) {
+ if (e < value) {
+ $(this).addClass('star-click');
+ } else {
+ $(this).removeClass('star-click');
+ }
+ });
+ }
+});
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js
index 95ddebcc99..147ed7731e 100644
--- a/frappe/public/js/frappe/form/footer/assign_to.js
+++ b/frappe/public/js/frappe/form/footer/assign_to.js
@@ -185,6 +185,7 @@ frappe.ui.add_assignment = function(opts, dialog) {
var assign_to = dialog.fields_dict.assign_to.get_value();
var args = dialog.get_values();
if(args && assign_to) {
+ dialog.set_message('Assigning...');
return frappe.call({
method: opts.method,
args: $.extend(args, {
@@ -194,15 +195,17 @@ frappe.ui.add_assignment = function(opts, dialog) {
bulk_assign: opts.bulk_assign || false,
re_assign: opts.re_assign || false
}),
- callback: function(r,rt) {
+ btn: dialog.get_primary_btn(),
+ callback: function(r) {
if(!r.exc) {
if(opts.callback){
opts.callback(r);
}
dialog && dialog.hide();
+ } else {
+ dialog.clear_message();
}
},
- btn: this
});
}
}
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index b2926b31d8..5f2acd3929 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -159,6 +159,10 @@ frappe.ui.form.Timeline = class Timeline {
// append comments
timeline = timeline.concat(this.get_comments());
+
+ // append energy point logs
+ timeline = timeline.concat(this.get_energy_point_logs());
+
// sort
timeline
.filter(a => a.content)
@@ -514,6 +518,16 @@ frappe.ui.form.Timeline = class Timeline {
return docinfo.comments;
}
+ get_energy_point_logs() {
+ let energy_point_logs = this.frm.get_docinfo().energy_point_logs;
+ energy_point_logs.map(log => {
+ log.comment_type = 'Energy Points';
+ log.content = frappe.energy_points.format_form_log(log);
+ return log;
+ });
+ return energy_point_logs;
+ }
+
cast_comment_as_communication(c) {
c.sender = c.comment_email;
c.sender_full_name = c.comment_by;
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index 0815481030..3a79bed370 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -183,6 +183,8 @@
{% } %}
{%= __("Liked by {0}", [data.fullname]) %}
+ {% } else if (data.comment_type == "Energy Points") { %}
+ {{ data.content_html }}
{% } else { %}
{%= data.fullname %}
{%= __(data.content) %}
diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index 66a8aa5c12..7ace78a90f 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -20,9 +20,11 @@ frappe.ui.form.Sidebar = Class.extend({
this.make_attachments();
this.make_shared();
this.make_viewers();
+
this.make_tags();
this.make_like();
this.make_follow();
+ this.make_review();
this.bind_events();
frappe.ui.form.setup_user_image_event(this.frm);
@@ -43,7 +45,7 @@ frappe.ui.form.Sidebar = Class.extend({
frappe.ui.toggle_like(me.like_icon, me.frm.doctype, me.frm.doc.name, function() {
me.refresh_like();
});
- })
+ });
},
refresh: function() {
@@ -155,6 +157,7 @@ frappe.ui.form.Sidebar = Class.extend({
refresh_image: function() {
},
+
setup_ratings: function() {
var _ratings = this.frm.get_docinfo().rating || 0;
@@ -164,4 +167,13 @@ frappe.ui.form.Sidebar = Class.extend({
this.ratings.find(".rating-icons").html(rating_icons);
}
},
+
+ make_review: function() {
+ if (frappe.boot.energy_points_enabled) {
+ this.frm.reviews = new frappe.ui.form.Review({
+ parent: this.sidebar.find(".form-attachments"),
+ frm: this.frm
+ });
+ }
+ }
});
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 841bd4ddfb..c8afb6466a 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -52,6 +52,13 @@ frappe.form.formatters = {
Percent: function(value, docfield, options) {
return frappe.form.formatters._right(flt(value, 2) + "%", options)
},
+ Rating: function(value) {
+ return `
+ ${Array.from(new Array(5)).map((_, i) =>
+ ` `;
+ },
Currency: function (value, docfield, options, doc) {
var currency = frappe.meta.get_field_currency(docfield, doc);
var precision = docfield.precision || cint(frappe.boot.sysdefaults.currency_precision) || 2;
diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
new file mode 100644
index 0000000000..8447118644
--- /dev/null
+++ b/frappe/public/js/frappe/form/review.js
@@ -0,0 +1,204 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+// MIT License. See license.txt
+
+frappe.provide("frappe.ui.form");
+
+frappe.ui.form.Review = class Review {
+ constructor({parent, frm}) {
+ this.parent = parent;
+ this.frm = frm;
+ this.fetch_energy_points()
+ .then(() => {
+ this.make_review_container();
+ this.add_review_button();
+ this.update_reviewers();
+ });
+ }
+ fetch_energy_points() {
+ return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.get_energy_points', {
+ user: frappe.session.user
+ }).then(data => {
+ this.points = data;
+ });
+ }
+ make_review_container() {
+ this.$wrapper = this.parent.append(`
+
+ `);
+ this.review_list_wrapper = this.$wrapper.find('.review-list');
+ }
+ add_review_button() {
+
+ this.review_list_wrapper.append(`
+
+
+ `);
+
+ const review_button = this.review_list_wrapper.find('.btn-add-review');
+
+ if (!this.points.review_points) {
+ review_button.click(false);
+ review_button.popover({
+ trigger: 'hover',
+ content: () => {
+ return `
+ ${__('You do not have enough review points')}
+
`;
+ },
+ html: true
+ });
+ } else {
+ review_button.click(() => this.show_review_dialog());
+ }
+ }
+ get_involved_users() {
+ const user_fields = this.frm.meta.fields
+ .filter(d => d.fieldtype === 'Link' && d.options === 'User')
+ .map(d => d.fieldname);
+
+ user_fields.push('owner');
+ let involved_users = user_fields.map(field => this.frm.doc[field]);
+
+ const docinfo = this.frm.get_docinfo();
+
+ involved_users = involved_users.concat(
+ docinfo.communications.map(d => d.sender && d.delivery_status==='sent'),
+ docinfo.comments.map(d => d.owner),
+ docinfo.versions.map(d => d.owner),
+ docinfo.assignments.map(d => d.owner)
+ );
+
+ return involved_users
+ .uniqBy(u => u)
+ .filter(user => !['Administrator', frappe.session.user].includes(user))
+ .filter(Boolean);
+ }
+ show_review_dialog() {
+ const user_options = this.get_involved_users();
+ const doc_owner = this.frm.doc.owner;
+ const review_dialog = new frappe.ui.Dialog({
+ 'title': __('Add Review'),
+ 'fields': [{
+ fieldname: 'to_user',
+ fieldtype: 'Autocomplete',
+ label: __('To User'),
+ options: user_options,
+ default: user_options.includes(doc_owner) ? doc_owner : user_options[0],
+ description: __('Only users involved in the document are listed')
+ }, {
+ fieldname: 'review_type',
+ fieldtype: 'Select',
+ label: __('Action'),
+ options: [{
+ 'label': __('Appreciate'),
+ 'value': 'Appreciation'
+ }, {
+ 'label': __('Criticize'),
+ 'value': 'Criticism'
+ }],
+ default: 'Appreciation'
+ }, {
+ fieldname: 'points',
+ fieldtype: 'Int',
+ label: __('Points'),
+ reqd: 1,
+ description: __(`Currently you have ${this.points.review_points} review points`)
+ }, {
+ fieldtype: 'Small Text',
+ fieldname: 'reason',
+ reqd: 1,
+ label: __('Reason')
+ }],
+ primary_action: (values) => {
+ if (values.points > this.points.review_points) {
+ return frappe.msgprint(__('You do not have enough points'));
+ }
+ frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.review', {
+ doc: {
+ doctype: this.frm.doc.doctype,
+ name: this.frm.doc.name,
+ },
+ to_user: values.to_user,
+ points: values.points,
+ review_type: values.review_type,
+ reason: values.reason
+ }).then(review => {
+ review_dialog.hide();
+ review_dialog.clear();
+ this.frm.get_docinfo().energy_point_logs.unshift(review);
+ this.frm.timeline.refresh();
+ this.update_reviewers();
+ });
+ },
+ primary_action_label: __('Submit')
+ });
+ review_dialog.show();
+ }
+ update_reviewers() {
+ const review_logs = this.frm.get_docinfo().energy_point_logs
+ .filter(log => ['Appreciation', 'Criticism'].includes(log.type));
+
+ this.review_list_wrapper.find('.review-pill').remove();
+ review_logs.forEach(log => {
+ let review_pill = $(`
+
+ ${frappe.avatar(log.owner)}
+ ${frappe.energy_points.get_points(log.points)}
+
+ `);
+ this.review_list_wrapper.prepend(review_pill);
+ this.setup_detail_popover(review_pill, log);
+ });
+ }
+ setup_detail_popover(el, data) {
+ let subject = '';
+ let fullname = frappe.user.full_name(data.user);
+ let timestamp = `
${frappe.datetime.comment_when(data.creation)} `;
+ let message_parts = [Math.abs(data.points), fullname, timestamp];
+ if (data.type === 'Appreciation') {
+ if (data.points == 1) {
+ subject = __('{0} appreciation point for {1} {2}', message_parts);
+ } else {
+ subject = __('{0} appreciation points for {1} {2}', message_parts);
+ }
+ } else {
+ if (data.points == -1) {
+ subject = __('{0} criticism point for {1} {2}', message_parts);
+ } else {
+ subject = __('{0} criticism points for {1} {2}', message_parts);
+ }
+ }
+ el.popover({
+ animation: true,
+ trigger: 'hover',
+ delay: 500,
+ placement: 'top',
+ template:`
+
+ `,
+ content: () => {
+ return `
+
+ `;
+ },
+ html: true,
+ container: 'body'
+ });
+ return el;
+ }
+};
diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js
index 044d5b53ac..115ad5e702 100644
--- a/frappe/public/js/frappe/form/workflow.js
+++ b/frappe/public/js/frappe/form/workflow.js
@@ -68,8 +68,8 @@ frappe.ui.form.States = Class.extend({
},
show_actions: function() {
- var added = false,
- me = this;
+ var added = false;
+ var me = this;
this.frm.page.clear_actions_menu();
@@ -103,10 +103,15 @@ frappe.ui.form.States = Class.extend({
});
}
});
+ this.setup_btn(added);
});
- if(added) {
+ },
+
+ setup_btn: function(action_added) {
+ if(action_added) {
this.frm.page.btn_primary.addClass("hide");
+ this.frm.page.btn_secondary.addClass("hide");
this.frm.toolbar.current_status = "";
this.setup_help();
}
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index d92ca100ce..0e18993349 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -365,6 +365,7 @@ frappe.views.BaseList = class BaseList {
this.toggle_result_area();
this.before_render();
this.render();
+ this.after_render();
this.freeze(false);
if (this.settings.refresh) {
this.settings.refresh(this);
@@ -393,6 +394,10 @@ frappe.views.BaseList = class BaseList {
}
+ after_render() {
+
+ }
+
render() {
// for child classes
}
diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html
index 619fa66277..502968e967 100644
--- a/frappe/public/js/frappe/list/list_sidebar.html
+++ b/frappe/public/js/frappe/list/list_sidebar.html
@@ -45,11 +45,15 @@