diff --git a/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js b/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js index d3ea63d..45cf195 100644 --- a/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js +++ b/msp/msp/doctype/verkaufsstatistik_report/verkaufsstatistik_report.js @@ -28,6 +28,7 @@ frappe.ui.form.on('Verkaufsstatistik Report', { // } // }); // }, + preset: function(frm) { if (!frm.doc.preset) { @@ -42,66 +43,47 @@ frappe.ui.form.on('Verkaufsstatistik Report', { beforeOneWeek2 = new Date(beforeOneWeek), day = beforeOneWeek.getDay(), diffToMonday = beforeOneWeek.getDate() - day + (day === 0 ? -6 : 1), - lastMonday = new Date(beforeOneWeek.setDate(diffToMonday)).toISOString().split('T')[0], - lastSunday = new Date(beforeOneWeek2.setDate(diffToMonday + 6)).toISOString().split('T')[0] + lastMonday = convertDate(new Date(beforeOneWeek.setDate(diffToMonday))), + lastSunday = convertDate(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') { let date = new Date(), - previousMonthFirstDay = new Date(date.getFullYear(), date.getMonth()- 1, 2).toISOString().split('T')[0], - previousMonthLastDay = new Date(date.getFullYear(), date.getMonth() , 1).toISOString().split('T')[0] + previousMonthFirstDay = convertDate(new Date(date.getFullYear(), date.getMonth()- 1, 1)), + previousMonthLastDay = convertDate(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') { let currentYear = new Date().getFullYear(), previousYear = currentYear-1, - firstDay = new Date(previousYear, 0, 2).toISOString().split('T')[0], - lastDay = new Date(currentYear, 0, 1).toISOString().split('T')[0] + firstDay = convertDate(new Date(previousYear, 0,1 )), + lastDay = convertDate(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') { let currentYear = new Date().getFullYear(), - firstDaySY = new Date(currentYear, 0, 2).toISOString().split('T')[0], - today = new Date().toISOString().split('T')[0]; + firstDaySY = convertDate(new Date(currentYear, 0, 1)), + today = convertDate(new Date()) frm.set_value('from_date',firstDaySY); frm.set_value('to_date',today); } } }, + }); - // } 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) -// } -// }); + + function convertDate(date) { + let yyyy = date.getFullYear().toString(), + mm = (date.getMonth()+1).toString(), + dd = date.getDate().toString(), + mmChars = mm.split(''), + ddChars = dd.split('') + + return yyyy + '-' + (mmChars[1]?mm:"0"+mmChars[0]) + '-' + (ddChars[1]?dd:"0"+ddChars[0]); + } + \ No newline at end of file