+
+ this.row_check = $(
+ `
`)
+ .appendTo(this.row);
+
+ this.row_index = $(
+ ``)
.appendTo(this.row)
.on('click', function(e) {
if(!$(e.target).hasClass('grid-row-check')) {
me.toggle_view();
}
});
+ } else if (this.show_search) {
+ this.row_check = $(
+ ``
+ ).appendTo(this.row);
+
+ this.row_index = $(
+ ``
+ ).appendTo(this.row);
+
+ this.row_index.find('input').on('keyup', frappe.utils.debounce((e) => {
+ let df = {
+ fieldtype: "Sr No"
+ };
+
+ this.grid.filter['row-index'] = {
+ df: df,
+ value: e.target.value
+ };
+
+ if (e.target.value == "") {
+ delete this.grid.filter['row-index'];
+ }
+
+ this.grid.grid_sortable
+ .option('disabled', Object.keys(this.grid.filter).length !== 0);
+
+ this.grid.prevent_build = true;
+ me.grid.refresh();
+ this.grid.prevent_build = false;
+ }, 500));
+ frappe.utils.only_allow_num_decimal(this.row_index.find('input'));
} else {
this.row_index.find('span').html(txt);
}
@@ -546,6 +588,7 @@ export default class GridRow {
setup_columns() {
this.focus_set = false;
+ this.search_columns = {};
this.grid.setup_visible_columns();
this.grid.visible_columns.forEach((col, ci) => {
@@ -561,8 +604,10 @@ export default class GridRow {
txt = __(txt);
}
let column;
- if (!this.columns[df.fieldname]) {
+ if (!this.columns[df.fieldname] && !this.show_search) {
column = this.make_column(df, colsize, txt, ci);
+ } else if (!this.columns[df.fieldname] && this.show_search) {
+ column = this.make_search_column(df, colsize);
} else {
column = this.columns[df.fieldname];
this.refresh_field(df.fieldname, txt);
@@ -580,6 +625,77 @@ export default class GridRow {
}
}
});
+
+ if (this.show_search) {
+ // last empty column
+ $(``)
+ .appendTo(this.row);
+ }
+ }
+
+ show_search_row() {
+ // show or remove search columns based on grid rows
+ this.show_search = this.frm && this.frm.doc &&
+ this.frm.doc[this.grid.df.fieldname] &&
+ this.frm.doc[this.grid.df.fieldname].length >= 20;
+ !this.show_search && this.wrapper.remove();
+ return this.show_search;
+ }
+
+ make_search_column(df, colsize) {
+ let title = "";
+ let input_class = "";
+ let is_disabled = "";
+
+ if (["Text", "Small Text"].includes(df.fieldtype)) {
+ input_class = "grid-overflow-no-ellipsis";
+ } else if (["Int", "Currency", "Float", "Percent"].includes(df.fieldtype)) {
+ input_class = "text-right";
+ } else if (df.fieldtype === "Check") {
+ title = __("1 = True & 0 = False");
+ input_class = "text-center";
+ } else if (df.fieldtype === 'Password') {
+ is_disabled = 'disabled';
+ title = __('Password cannot be filtered');
+ }
+
+ let $col = $('')
+ .appendTo(this.row);
+
+ let $search_input = $(`
+
+ `).appendTo($col);
+
+ this.search_columns[df.fieldname] = $col;
+
+ $search_input.on('keyup', frappe.utils.debounce((e) => {
+ this.grid.filter[df.fieldname] = {
+ df: df,
+ value: e.target.value
+ };
+
+ if (e.target.value == '') {
+ delete this.grid.filter[df.fieldname];
+ }
+
+ this.grid.grid_sortable
+ .option('disabled', Object.keys(this.grid.filter).length !== 0);
+
+ this.grid.prevent_build = true;
+ this.grid.refresh();
+ this.grid.prevent_build = false;
+ }, 500));
+
+ ["Currency", "Float", "Int", "Percent", "Rating"].includes(df.fieldtype) &&
+ frappe.utils.only_allow_num_decimal($search_input);
+
+ return $col;
}
make_column(df, colsize, txt, ci) {
diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js
index 538534e5cf..0713d5dc43 100644
--- a/frappe/public/js/frappe/form/sidebar/attachments.js
+++ b/frappe/public/js/frappe/form/sidebar/attachments.js
@@ -44,8 +44,17 @@ frappe.ui.form.Attachments = class Attachments {
// add attachment objects
var attachments = this.get_attachments();
if(attachments.length) {
- attachments.forEach(function(attachment) {
- me.add_attachment(attachment)
+ let exists = {};
+ let unique_attachments = attachments.filter(attachment => {
+ return Object.prototype.hasOwnProperty.call(
+ exists,
+ attachment.file_name
+ )
+ ? false
+ : (exists[attachment.file_name] = true);
+ });
+ unique_attachments.forEach(attachment => {
+ me.add_attachment(attachment);
});
} else {
this.attachments_label.removeClass("has-attachments");
@@ -75,7 +84,19 @@ frappe.ui.form.Attachments = class Attachments {
remove_action = function(target_id) {
frappe.confirm(__("Are you sure you want to delete the attachment?"),
function() {
- me.remove_attachment(target_id);
+ let target_attachment = me
+ .get_attachments()
+ .find(attachment => attachment.name === target_id);
+ let to_be_removed = me
+ .get_attachments()
+ .filter(
+ attachment =>
+ attachment.file_name ===
+ target_attachment.file_name
+ );
+ to_be_removed.forEach(attachment =>
+ me.remove_attachment(attachment.name)
+ );
}
);
return false;
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 016390a4e1..e55eb9fdeb 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -534,14 +534,14 @@ frappe.ui.form.Toolbar = class Toolbar {
});
}
show_title_as_dirty() {
- if(this.frm.save_disabled)
+ if (this.frm.save_disabled && !this.frm.set_dirty)
return;
- if(this.frm.doc.__unsaved) {
+ if (this.frm.is_dirty()) {
this.page.set_indicator(__("Not Saved"), "orange");
}
- $(this.frm.wrapper).attr("data-state", this.frm.doc.__unsaved ? "dirty" : "clean");
+ $(this.frm.wrapper).attr("data-state", this.frm.is_dirty() ? "dirty" : "clean");
}
show_jump_to_field_dialog() {
diff --git a/frappe/public/js/frappe/list/list_settings.js b/frappe/public/js/frappe/list/list_settings.js
index 782a077a78..186a4370bc 100644
--- a/frappe/public/js/frappe/list/list_settings.js
+++ b/frappe/public/js/frappe/list/list_settings.js
@@ -375,7 +375,7 @@ export default class ListSettings {
let me = this;
if (me.removed_fields) {
- me.removed_fields.concat(fields);
+ me.removed_fields = me.removed_fields.concat(fields);
} else {
me.removed_fields = fields;
}
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index beee935040..069f353368 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -915,7 +915,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
return this.settings.get_form_link(doc);
}
- const docname = doc.name.match(/[%'"#\s]/)
+ const docname = cstr(doc.name).match(/[%'"#\s]/)
? encodeURIComponent(doc.name)
: doc.name;
diff --git a/frappe/public/js/frappe/microtemplate.js b/frappe/public/js/frappe/microtemplate.js
index 151d008d3e..176862e233 100644
--- a/frappe/public/js/frappe/microtemplate.js
+++ b/frappe/public/js/frappe/microtemplate.js
@@ -138,6 +138,7 @@ frappe.render_tree = function(opts) {
opts.base_url = frappe.urllib.get_base_url();
opts.landscape = false;
opts.print_css = frappe.boot.print_css;
+ opts.print_format_css_path = frappe.assets.bundled_asset('print_format.bundle.css');
var tree = frappe.render_template("print_tree", opts);
var w = window.open();
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index fe959b259d..3b95a4b3f1 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -412,7 +412,7 @@ $.extend(frappe.model, {
}
},
- set_value: function(doctype, docname, fieldname, value, fieldtype) {
+ set_value: function(doctype, docname, fieldname, value, fieldtype, skip_dirty_trigger=false) {
/* help: Set a value locally (if changed) and execute triggers */
var doc;
@@ -438,11 +438,11 @@ $.extend(frappe.model, {
}
doc[key] = value;
- tasks.push(() => frappe.model.trigger(key, value, doc));
+ tasks.push(() => frappe.model.trigger(key, value, doc, skip_dirty_trigger));
} else {
// execute link triggers (want to reselect to execute triggers)
if(in_list(["Link", "Dynamic Link"], fieldtype) && doc) {
- tasks.push(() => frappe.model.trigger(key, value, doc));
+ tasks.push(() => frappe.model.trigger(key, value, doc, skip_dirty_trigger));
}
}
});
@@ -467,7 +467,7 @@ $.extend(frappe.model, {
frappe.model.events[doctype][fieldname].push(fn);
},
- trigger: function(fieldname, value, doc) {
+ trigger: function(fieldname, value, doc, skip_dirty_trigger=false) {
const tasks = [];
function enqueue_events(events) {
@@ -477,7 +477,7 @@ $.extend(frappe.model, {
if (!fn) continue;
tasks.push(() => {
- const return_value = fn(fieldname, value, doc);
+ const return_value = fn(fieldname, value, doc, skip_dirty_trigger);
// if the trigger returns a promise, return it,
// or use the default promise frappe.after_ajax
diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js
index d408fadb33..eb444be4e9 100644
--- a/frappe/public/js/frappe/ui/capture.js
+++ b/frappe/public/js/frappe/ui/capture.js
@@ -28,6 +28,24 @@ frappe._.get_data_uri = element => {
return data_uri;
};
+function get_file_input() {
+ let input = document.createElement("input");
+ input.setAttribute("type", "file");
+ input.setAttribute("accept", "image/*");
+ input.setAttribute("multiple", "");
+
+ return input;
+}
+
+function read(file) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = reject;
+ reader.readAsDataURL(file);
+ });
+}
+
/**
* @description Frappe's Capture object.
*
@@ -45,6 +63,9 @@ frappe.ui.Capture = class {
constructor(options = {}) {
this.options = frappe.ui.Capture.OPTIONS;
this.set_options(options);
+
+ this.facing_mode = "environment";
+ this.images = [];
}
set_options(options) {
@@ -53,69 +74,71 @@ frappe.ui.Capture = class {
return this;
}
- render() {
- return navigator.mediaDevices.getUserMedia({ video: true }).then(stream => {
- this.stream = stream;
+ show() {
+ this.build_dialog();
- this.dialog = new frappe.ui.Dialog({
- title: this.options.title,
- animate: this.options.animate,
- on_hide: () => this.stop_media_stream()
- });
+ if (frappe.is_mobile()) {
+ this.show_for_mobile();
+ } else {
+ this.show_for_desktop();
+ }
+ }
- this.dialog.get_close_btn().on('click', () => {
- this.hide();
- });
+ build_dialog() {
+ let me = this;
+ me.dialog = new frappe.ui.Dialog({
+ title: this.options.title,
+ animate: this.options.animate,
+ fields: [
+ {
+ fieldtype: "HTML",
+ fieldname: "capture"
+ },
+ {
+ fieldtype: "HTML",
+ fieldname: "total_count"
+ }
+ ],
+ on_hide: this.stop_media_stream()
+ });
- const set_take_photo_action = () => {
- this.dialog.set_primary_action(__('Take Photo'), () => {
- const data_url = frappe._.get_data_uri(video);
- $e.find('.fc-p').attr('src', data_url);
+ me.$template = $(frappe.ui.Capture.TEMPLATE);
- $e.find('.fc-s').hide();
- $e.find('.fc-p').show();
+ let field = me.dialog.get_field("capture");
+ $(field.wrapper).html(me.$template);
- this.dialog.set_secondary_action_label(__('Retake'));
- this.dialog.get_secondary_btn().show();
-
- this.dialog.set_primary_action(__('Submit'), () => {
- this.hide();
- if (this.callback) this.callback(data_url);
- });
- });
- };
-
- set_take_photo_action();
-
- this.dialog.set_secondary_action(() => {
- $e.find('.fc-p').hide();
- $e.find('.fc-s').show();
-
- this.dialog.get_secondary_btn().hide();
- this.dialog.get_primary_btn().off('click');
- set_take_photo_action();
- });
-
- this.dialog.get_secondary_btn().hide();
-
- const $e = $(frappe.ui.Capture.TEMPLATE);
-
- const video = $e.find('video')[0];
- video.srcObject = this.stream;
- video.play();
- const $container = $(this.dialog.body);
-
- $container.html($e);
+ me.dialog.get_close_btn().on('click', () => {
+ me.hide();
});
}
- show() {
- this.render()
+ show_for_mobile() {
+ let me = this;
+ if (!me.input) {
+ me.input = get_file_input();
+ }
+
+ me.input.onchange = async () => {
+ for (let file of me.input.files) {
+ let f = await read(file);
+ me.images.push(f);
+ }
+
+ me.render_preview();
+ me.dialog.show();
+ };
+ me.input.click();
+ }
+
+ show_for_desktop() {
+ let me = this;
+
+ this.render_stream()
.then(() => {
- this.dialog.show();
+ me.dialog.show();
})
.catch(err => {
- if (this.options.error) {
+ if (me.options.error) {
frappe.show_alert(frappe.ui.Capture.ERR_MESSAGE, 3);
}
@@ -123,6 +146,159 @@ frappe.ui.Capture = class {
});
}
+ render_stream() {
+ let me = this;
+ let constraints = {
+ video: {
+ facingMode: this.facing_mode
+ }
+ };
+
+ return navigator.mediaDevices.getUserMedia(constraints).then(stream => {
+ me.stream = stream;
+ me.dialog.custom_actions.empty();
+ me.dialog.get_primary_btn().off('click');
+ me.setup_take_photo_action();
+ me.setup_preview_action();
+ me.setup_toggle_camera();
+
+ me.$template.find('.fc-stream-container').show();
+ me.$template.find('.fc-preview-container').hide();
+ me.video = me.$template.find('video')[0];
+ me.video.srcObject = me.stream;
+ me.video.load();
+ me.video.play();
+ });
+ }
+
+ render_preview() {
+ this.stop_media_stream();
+ this.$template.find('.fc-stream-container').hide();
+ this.$template.find('.fc-preview-container').show();
+ this.dialog.get_primary_btn().off('click');
+
+ let images = ``;
+
+ this.images.forEach((image, idx) => {
+ images += `
+
${this.row_check_html}
- ${txt}
`)
+
+
+ ${frappe.utils.icon("close", "lg")}
+
+ 
+
+ `;
+ });
+
+ this.$template.find('.fc-preview-container').empty();
+ $(this.$template.find('.fc-preview-container')).html(
+ `
+ ${images}
+
`
+ );
+
+ this.setup_capture_action();
+ this.setup_submit_action();
+ this.setup_remove_action();
+ this.update_count();
+ this.dialog.custom_actions.empty();
+ }
+
+ setup_take_photo_action() {
+ let me = this;
+
+ this.dialog.set_primary_action(__('Take Photo'), () => {
+ const data_url = frappe._.get_data_uri(me.video);
+
+ me.images.push(data_url);
+ me.setup_preview_action();
+ me.update_count();
+ });
+ }
+
+ setup_preview_action() {
+ let me = this;
+
+ if (!this.images.length) {
+ return;
+ }
+
+ this.dialog.set_secondary_action_label(__("Preview"));
+ this.dialog.set_secondary_action(() => {
+ me.dialog.get_primary_btn().off('click');
+ me.render_preview();
+ });
+ }
+
+ setup_remove_action() {
+ let me = this;
+ let elements = this.$template[0].getElementsByClassName("capture-remove-btn");
+
+ elements.forEach(el => {
+ el.onclick = () => {
+ let idx = parseInt(el.getAttribute("data-idx"));
+
+ me.images.splice(idx, 1);
+ me.render_preview();
+ };
+ });
+ }
+
+ update_count() {
+ let field = this.dialog.get_field("total_count");
+ let msg = `${__("Total Images")}: ${this.images.length}`;
+
+ if (this.images.length === 0) {
+ msg = __("No Images");
+ }
+
+ $(field.wrapper).html(`
+
+
+ `);
+ }
+
+ setup_toggle_camera() {
+ let me = this;
+
+ this.dialog.add_custom_action(__("Switch Camera"), () => {
+ me.facing_mode = me.facing_mode == "environment" ? "user" : "environment";
+
+ frappe.show_alert({
+ message: __("Switching Camera")
+ });
+
+ me.stop_media_stream();
+ me.render_stream();
+ }, "btn-switch");
+ }
+
+ setup_capture_action() {
+ let me = this;
+
+ this.dialog.set_secondary_action_label(__("Capture"));
+ this.dialog.set_secondary_action(() => {
+ if (frappe.is_mobile()) {
+ me.show_for_mobile();
+ } else {
+ me.render_stream();
+ }
+ });
+ }
+
+ setup_submit_action() {
+ let me = this;
+
+ this.dialog.set_primary_action(__('Submit'), () => {
+ me.hide();
+
+ if (me.callback) {
+ me.callback(me.images);
+ }
+ });
+ }
+
hide() {
if (this.dialog) this.dialog.hide();
this.stop_media_stream();
@@ -148,11 +324,11 @@ frappe.ui.Capture.OPTIONS = {
frappe.ui.Capture.ERR_MESSAGE = __('Unable to load camera.');
frappe.ui.Capture.TEMPLATE = `
${msg}
+
- {{ title }}
-
-
-
-
-
+
-
-
-
-
`;
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 91a2390cdb..e3134b1f38 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -47,13 +47,17 @@ frappe.ui.Page = class Page {
}
setup_scroll_handler() {
- window.addEventListener('scroll', () => {
- if (document.documentElement.scrollTop) {
- $('.page-head').toggleClass('drop-shadow', true);
+ let last_scroll = 0;
+ window.addEventListener('scroll', frappe.utils.throttle(() => {
+ $('.page-head').toggleClass('drop-shadow', !!document.documentElement.scrollTop);
+ let current_scroll = document.documentElement.scrollTop;
+ if (current_scroll > 0 && last_scroll <= current_scroll) {
+ $('.page-head').css("top", "-15px");
} else {
- $('.page-head').removeClass('drop-shadow');
+ $('.page-head').css("top", "var(--navbar-height)");
}
- });
+ last_scroll = current_scroll;
+ }), 500);
}
get_empty_state(title, message, primary_action) {
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 6971d3bc20..0514576380 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -231,7 +231,7 @@ Object.assign(frappe.utils, {
if (tt && (tt.substr(0, 1)===">" || tt.substr(0, 4)===">")) {
part.push(t);
} else {
- out.concat(part);
+ out = out.concat(part);
out.push(t);
part = [];
}
@@ -1102,7 +1102,7 @@ Object.assign(frappe.utils, {
seconds: round(seconds % 60)
};
- if (duration_options.hide_days) {
+ if (duration_options && duration_options.hide_days) {
total_duration.hours = round(seconds / 3600);
total_duration.days = 0;
}
@@ -1462,5 +1462,23 @@ Object.assign(frappe.utils, {
console.log(error); // eslint-disable-line
return Promise.resolve(name);
}
+ },
+
+ only_allow_num_decimal(input) {
+ input.on('input', (e) => {
+ let self = $(e.target);
+ self.val(self.val().replace(/[^0-9.]/g, ''));
+ if ((e.which != 46 || self.val().indexOf('.') != -1) && (e.which < 48 || e.which > 57)) {
+ e.preventDefault();
+ }
+ });
+ },
+
+ string_to_boolean(string) {
+ switch (string.toLowerCase().trim()) {
+ case "t": case "true": case "y": case "yes": case "1": return true;
+ case "f": case "false": case "n": case "no": case "0": case null: return false;
+ default: return string;
+ }
}
});
diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js
index 0ab5e2e7dc..2739b3dd78 100644
--- a/frappe/public/js/frappe/views/calendar/calendar.js
+++ b/frappe/public/js/frappe/views/calendar/calendar.js
@@ -29,7 +29,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView {
.then(() => {
this.page_title = __('{0} Calendar', [this.page_title]);
this.calendar_settings = frappe.views.calendar[this.doctype] || {};
- this.calendar_name = frappe.utils.to_title_case(frappe.get_route()[3] || '');
+ this.calendar_name = frappe.get_route()[3];
});
}
@@ -72,12 +72,17 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView {
const calendar_name = this.calendar_name;
return new Promise(resolve => {
- if (calendar_name === 'Default') {
+ if (calendar_name === 'default') {
Object.assign(options, frappe.views.calendar[this.doctype]);
resolve(options);
} else {
frappe.model.with_doc('Calendar View', calendar_name, () => {
const doc = frappe.get_doc('Calendar View', calendar_name);
+ if (!doc) {
+ frappe.show_alert(__("{0} is not a valid Calendar. Redirecting to default Calendar.", [calendar_name.bold()]));
+ frappe.set_route("List", this.doctype, "Calendar", "default");
+ return;
+ }
Object.assign(options, {
field_map: {
id: "name",
diff --git a/frappe/public/js/frappe/views/reports/print_tree.html b/frappe/public/js/frappe/views/reports/print_tree.html
index 817c0c1e9f..973c1c0e21 100644
--- a/frappe/public/js/frappe/views/reports/print_tree.html
+++ b/frappe/public/js/frappe/views/reports/print_tree.html
@@ -1,91 +1,106 @@
-
-
-
-
-
-
-
-
-
-
+
+
- {% if print_settings.repeat_header_footer %}
-
- {% endif %}
-
- {% if print_settings.letter_head %}
-
+
-
- {% endif %}
- {{ print_settings.letter_head.header }}
-
- {{ tree }}
+ @media (max-width: 767px) {
+ ul.tree-children {
+ padding-left: 20px;
+ }
+ }
+
+
+
+
+
-
+ {% endif %}
+
+
+ {% if print_settings.repeat_header_footer %}
+
-
-
+ {% if print_settings.letter_head %}
+
+
+
+ {% endif %}
+ {{ print_settings.letter_head.header }}
+
+ {{ tree }}
+
+