").text(item.label).get(0);
- },
- replace: function(text) {
- this.input.value = '';
- }
- });
-
- search_input.on("awesomplete-select", function(e) {
- var item = e.originalEvent.text;
- if (item) {
- if (df && df.fieldtype == 'Check') {
- var noduplicate = true
- }
- if (item.label == "No Data") {
- me.base_list.set_filter(item.value, '', false, noduplicate);
- } else {
- me.base_list.set_filter(item.value, item.label, false, noduplicate);
- }
- }
- });
- }
+
+ `);
},
set_events: function() {
var me = this;
@@ -240,57 +38,6 @@ frappe.ui.FilterList = Class.extend({
me.base_list.run();
$(this).addClass("hide");
});
-
- //set sort filters
- this.wrapper.on("click", ".filter-sort-item", function() {
- var active = $(this).closest(".filter-dash-item").find(".filter-sort-active");
- active.attr('data-sort-by', $(this).attr('data-sort-by'));
- active.attr('data-order', $(this).attr('data-order'));
- me.reload_stats();
- });
-
- //setup date-time range pickers
- this.wrapper.find(".filter-input-date").each(function(i,v) {
- var self = this;
- var date;
- var date_wrapper = $('').appendTo($(this));
- make_date("range");
-
- function make_date(mode) {
- var fieldtype = mode==="range" ? "DateRange" : "Date";
- var name = $(v).data("name");
- if(date) {
- //cleanup old datepicker
- date.datepicker.destroy();
- }
- date = frappe.ui.form.make_control({
- df: {
- fieldtype: fieldtype,
- fieldname: name,
- },
- parent: date_wrapper,
- only_input: true
- });
- date.refresh();
-
- date.datepicker.update("onSelect", function(fd, dateObj) {
- var filt = me.get_filter(name);
- filt && filt.remove(true);
- if(!dateObj.length && dateObj && date.datepicker.opts.range===false) {
- me.add_filter(me.doctype, name, '=', moment(dateObj).format('YYYY-MM-DD'));
- me.base_list.run();
- } else if(dateObj.length===2 && date.datepicker.opts.range===true) {
- var [date1, date2] = [moment(dateObj[0]).format('YYYY-MM-DD'), moment(dateObj[1]).format('YYYY-MM-DD')];
- if(date1==date2) {
- me.add_filter(me.doctype, name, '=', date1);
- } else {
- me.add_filter(me.doctype, name, 'Between', [date1, date2]);
- }
- me.base_list.run();
- }
- });
- }
- })
},
show_filters: function() {
@@ -307,6 +54,13 @@ frappe.ui.FilterList = Class.extend({
},
add_filter: function(doctype, fieldname, condition, value, hidden) {
+ if (this.base_list.page.fields_dict[fieldname]
+ && ['=', 'like'].includes(condition)) {
+ // if filter exists in base_list, then exit
+ this.base_list.page.fields_dict[fieldname].set_input(value);
+ return;
+ }
+
if(doctype && fieldname
&& !frappe.meta.has_field(doctype, fieldname)
&& !in_list(frappe.model.std_fields_list, fieldname)) {
@@ -318,7 +72,6 @@ frappe.ui.FilterList = Class.extend({
return;
}
-
this.wrapper.find('.show_filters').toggle(true);
var is_new_filter = arguments.length===0;
@@ -384,6 +137,8 @@ frappe.ui.FilterList = Class.extend({
values.push(filter.get_value());
}
});
+ this.base_list.update_standard_filters(values);
+
return values;
},
@@ -480,7 +235,6 @@ frappe.ui.Filter = Class.extend({
this.flist.update_filters();
if(!dont_run) {
- this.flist.base_list.clean_dash = true;
this.flist.base_list.refresh(true);
}
},
@@ -673,7 +427,7 @@ frappe.ui.Filter = Class.extend({
title="'+__("Remove Filter")+'">\
\
')
- .insertAfter(this.flist.wrapper.find(".set-filters .show-filters"));
+ .insertAfter(this.flist.wrapper.find(".set-filters .new-filter"));
this.set_filter_button_text();
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 5a08f2ad34..7171fd3b9e 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -403,6 +403,13 @@ frappe.ui.Page = Class.extend({
show_form: function() {
this.page_form.removeClass("hide");
},
+ get_form_values: function() {
+ var values = {};
+ this.page_form.fields_dict.forEach(function(field, key) {
+ values[key] = field.get_value();
+ });
+ return values;
+ },
add_view: function(name, html) {
this.views[name] = $(html).appendTo($(this.wrapper).find(".page-content"));
if(!this.current_view) {
diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js
index 39dbdc002d..0f75aae67d 100644
--- a/frappe/public/js/frappe/views/reports/reportview.js
+++ b/frappe/public/js/frappe/views/reports/reportview.js
@@ -76,6 +76,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
this.add_totals_row = 0;
this.page = this.parent.page;
+ this.meta = frappe.get_meta(this.doctype);
this._body = $('').appendTo(this.page.main);
this.page_title = __('Report')+ ': ' + (this.docname ?
__(this.doctype) + ' - ' + __(this.docname) : __(this.doctype));
@@ -258,13 +259,15 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
// build args for query
get_args: function() {
- var me = this;
+ let me = this;
+ let filters = this.filter_list.get_filters();
+
return {
doctype: this.doctype,
fields: $.map(this.columns, function(v) { return me.get_full_column_name(v) }),
order_by: this.get_order_by(),
add_total_row: this.add_total_row,
- filters: this.filter_list.get_filters(),
+ filters: filters,
save_user_settings_fields: 1,
with_childnames: 1,
file_format_type: this.file_format_type
diff --git a/frappe/public/less/filter_dashboard.less b/frappe/public/less/filter_dashboard.less
deleted file mode 100644
index 22529448e0..0000000000
--- a/frappe/public/less/filter_dashboard.less
+++ /dev/null
@@ -1,129 +0,0 @@
-@import "variables.less";
-@import "mixins.less";
-
-.date-range-picker {
- font-size:85%;
-}
-
-.filter_area {
- margin: 0 -15px;
-}
-
-.filter-dashboard-wrapper {
- display: none;
- padding-bottom: 0px;
-}
-
-.list-filter-dashboard {
- border-top: 1px solid @border-color;
- overflow-x: scroll;
- overflow-y: hidden;
-}
-
-.filter-header {
- border-bottom: 1px solid @border-color;
- background-color: @panel-bg;
- padding: 8px 15px;
-
- .search-dropdown {
- margin-top: -20px;
- margin-right: 20px;
-
- .octicon {
- font-size: 14px;
- }
- }
-
- .sort-dropdown {
- margin-top: -16px;
- }
-
- .dropdown-menu {
- min-width: 120px !important;
- }
-}
-
-.filter-label {
- margin: 0px;
- color: @text-muted;
-}
-
-.filter-dashboard-items {
- height: 187px;
- margin-right: -2px;
- display: flex;
-}
-
-.filter-dash-item {
- flex-grow: 1;
- min-width: 180px;
- float: left;
- height: 187px;
- border-right:1px solid @border-color;
-}
-
-.filter-input {
- padding: 10px 15px;
-
- input {
- height: 25px;
- }
-}
-
-.filter-item-value, .stat-no-records {
- padding: 0px 15px;
-}
-
-.filter-dash-item:after {
- /*top:-10px;*/
-}
-
-.filter-sort {
- font-size:1.5em;
-}
-
-.filter-sort-item {
- a {
- padding: 8px !important;
- }
-}
-
-.filter-sort-item:hover {
- color: @grey-link-color;
- text-decoration: none;
- background-color: @btn-bg;
-}
-
-.filter-stat {
- overflow-y: auto;
- overflow-x: hidden;
- height: 158px;
- margin: 0px;
-}
-
-.selected {
- vertical-align: 10%;
- font-size: 1.2em;
-}
-
-.filter-sort-item > label {
- float:right;
-}
-
-.filter-stat-link > .badge {
- position: absolute;
- float: right;
- margin-right: 10px;
- margin-top: 2px;
- font-size: 11px;
-}
-
-.filter-stat-link > .stat {
- width: 130px;
- display: inline-block;
- .text-ellipsis();
-}
-
-.filter-dash-controls >.filter-label {
- padding-bottom: 5px;
-}
\ No newline at end of file
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 036790d9a2..49c7d1b723 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -249,7 +249,7 @@ h6.uppercase, .h6.uppercase {
.form-section:not(:last-child),
.form-inner-toolbar {
- border-bottom: 1px solid @light-border-color;
+ border-bottom: 1px solid @border-color;
}
.empty-section {
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 0f2eda8494..848267fb73 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -54,7 +54,7 @@
}
.filter-box {
- border-top: 1px solid @border-color;
+ border-bottom: 1px solid @border-color;
// margin: 0px -15px;
padding: 10px 15px 3px;
@@ -319,6 +319,12 @@
}
}
+.page-form {
+ .awesomplete > ul {
+ min-width: 300px;
+ }
+}
+
.taggle_input {
padding: 0;
margin-top: 3px;
diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less
index 9c3d40179a..11aef785a5 100644
--- a/frappe/public/less/page.less
+++ b/frappe/public/less/page.less
@@ -118,16 +118,23 @@
.page-form {
margin: 0px;
- padding-top: 15px;
+ padding-right: 15px;
+ padding-top: 10px;
border-bottom: 1px solid @border-color;
-}
+ background-color: @panel-bg;
-.page-form .form-group {
- margin-bottom: 15px;
-}
+ .form-group {
+ padding-right: 0px;
+ margin-bottom: 10px;
+ }
+ .checkbox {
+ margin-top: 4px;
+ margin-bottom: 4px;
-.page-form .checkbox {
- margin-top: 2px;
+ .help-box {
+ display: none;
+ }
+ }
}
select.input-sm {