From 8a574fa17afec62534f5fdaca28ce058497d9341 Mon Sep 17 00:00:00 2001 From: Beate Trzensiok Date: Tue, 21 Jun 2022 13:19:11 +0200 Subject: [PATCH] Anpassungen im Preset --- .../verkaufsstatistik_report.js | 68 ++++++++++++++++--- 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js b/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js index e55b252..42b3eaf 100644 --- a/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js +++ b/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js @@ -38,18 +38,70 @@ frappe.ui.form.on('Verkaufsstatistik Report', { frm.toggle_enable(['from_date', 'to_date'], false); if (frm.doc.preset === 'Last Week') { - frm.events.set_dates(frm, frappe.datetime.previous("week")); + let beforeOneWeek = new Date(new Date().getTime() - 60 * 60 * 24 * 7 * 1000), + beforeOneWeek2 = new Date(beforeOneWeek), + day = beforeOneWeek.getDay(), + diffToMonday = beforeOneWeek.getDate() - day + (day === 0 ? -6 : 1), + lastMonday = new Date(beforeOneWeek.setDate(diffToMonday)), + lastSunday = new Date(beforeOneWeek2.setDate(diffToMonday + 6)) + console.log(lastMonday,lastSunday) + frm.set_value('from_date',lastMonday) + frm.set_value('to_date',lastSunday) } else if (frm.doc.preset === 'Last Month') { - frm.events.set_dates(frm, frappe.datetime.previous("month")); + let date = new Date(), + previousMonthFirstDay = new Date(date.getFullYear(), date.getMonth() - 1, 1), + previousMonthLastDay = new Date(date.getFullYear(), date.getMonth() , 0) + console.log(previousMonthFirstDay,previousMonthLastDay) + frm.set_value('from_date',previousMonthFirstDay) + frm.set_value('to_date',previousMonthLastDay) } else if (frm.doc.preset === 'Last Year') { - frm.events.set_dates(frm, frappe.datetime.previous("year")); + let currentYear = new Date().getFullYear(), + previousYear = currentYear-1, + firstDay = new Date(previousYear, 0, 1), + lastDay = new Date(previousYear, 11, 31) + console.log(lastDay); + frm.set_value('from_date',firstDay) + frm.set_value('to_date',lastDay) } else if (frm.doc.preset === 'YTD') { - frm.events.set_dates(frm, frappe.datetime.year_to_date()); + let currentYear = new Date().getFullYear(), + firstDaySY = new Date(currentYear, 0, 1), + today = new Date(); + frm.set_value('from_date',firstDaySY); + frm.set_value('to_date',today); + } } }, - set_dates: function(frm, date_range) { - frm.set_value('from_date', date_range.start); - frm.set_value('to_date', date_range.end); - }, }); + // } else if (frm.doc.preset === 'Last Month') { + // frm.events.set_dates(frm, frappe.datetime.previous("month")); + // } else if (frm.doc.preset === 'Last Year') { + // frm.events.set_dates(frm, frappe.datetime.previous("year")); + // } else if (frm.doc.preset === 'YTD') { + // frm.events.set_dates(frm, frappe.datetime.year_to_date()); +// // } +// } +// }, +// // if (frm.doc.preset === 'Last Week') { +// frm.events.set_dates(frm, frappe.datetime.previous("week")); +// } else if (frm.doc.preset === 'Last Month') { +// frm.events.set_dates(frm, frappe.datetime.previous("month")); +// } else if (frm.doc.preset === 'Last Year') { +// frm.events.set_dates(frm, frappe.datetime.previous("year")); +// } else if (frm.doc.preset === 'YTD') { +// frm.events.set_dates(frm, frappe.datetime.year_to_date()); +// } +// } +// }, + + + + +// set_dates: function(frm, date_range) { +// frm.set_value('from_date', date_range.start); +// frm.set_value('to_date', date_range.end); +// console.log(date_range); +// console.log(date_range.start); +// console.log(date_range.end) +// } +// });