vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #6769 from netchampfaris/dt-date-filter-fix

Browse source 
fix: DataTable date filter
This commit is contained in:
Suraj Shetty 2019-01-16 14:23:01 +05:30 • committed by GitHub
commit bb7a2f04ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -616,11 +616,24 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
{for_print: false, always_show_decimals: true}, data);
};
let compareFn = null;
if (column.fieldtype === 'Date') {
compareFn = (cell, keyword) => {
if (!cell.content) return null;
if (keyword.length !== 'YYYY-MM-DD'.length) return null;
const keywordValue = frappe.datetime.user_to_obj(keyword);
const cellValue = frappe.datetime.str_to_obj(cell.content);
return [+cellValue, +keywordValue];
};
}
return Object.assign(column, {
id: column.fieldname,
name: column.label,
width: parseInt(column.width) || null,
editable: false,
compareValue: compareFn,
format: (value, row, column, data) => {
if (this.report_settings.formatter) {
return this.report_settings.formatter(value, row, column, data, format_cell);

14
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -823,6 +823,19 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
// child table column
const id = doctype !== this.doctype ? `${doctype}:${fieldname}` : fieldname;
let compareFn = null;
if (docfield.fieldtype === 'Date') {
compareFn = (cell, keyword) => {
if (!cell.content) return null;
if (keyword.length !== 'YYYY-MM-DD'.length) return null;
const keywordValue = frappe.datetime.user_to_obj(keyword);
const cellValue = frappe.datetime.str_to_obj(cell.content);
return [+cellValue, +keywordValue];
}
}
return {
id: id,
field: fieldname,
@ -832,6 +845,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
width,
editable,
align,
compareValue: compareFn,
format: (value, row, column, data) => {
const d = row.reduce((acc, curr) => {
if (!curr.column.docfield) return acc;

2
package.json
View file

@ -19,7 +19,7 @@
"awesomplete": "^1.1.2",
"cookie": "^0.3.1",
"express": "^4.16.2",
"frappe-datatable": "^1.7.3",
"frappe-datatable": "^1.8.0",
"frappe-gantt": "^0.1.0",
"fuse.js": "^3.2.0",
"highlight.js": "^9.12.0",

8
yarn.lock
View file

@ -1219,10 +1219,10 @@ forwarded@~0.1.2:
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
frappe-datatable@^1.7.2:
version "1.7.3"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.3.tgz#dadddf01867723bf0862918dd62cfea4652416a3"
integrity sha512-72LUx0ZRRjFPLFQUzgB7Uywpxgk1rFLjyzOq5yQ5Mr2G8u0t3AoUJLRG2lAqFD49JOxezVb6Oa03Qmon1DCExA==
frappe-datatable@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.8.0.tgz#7f789ed77bdf9800143fffb1bb28a24d5dbdc27c"
integrity sha512-j3DdmYtTjhcVXCVkYjKHdZOc8tSwZapanlujdx1xzXcL7Ueo+BFiPR5WptWRfH43K3nboh3m7clcAIX7LdQR4g==
dependencies:
hyperlist "^1.0.0-beta"
lodash "^4.17.5"