mirror of
https://github.com/itsdave-de/msp.git
synced 2025-05-06 07:25:13 +02:00
Anpassung des Presets
This commit is contained in:
parent
7a752e01d8
commit
9ab4157d86
@ -28,6 +28,7 @@ frappe.ui.form.on('Verkaufsstatistik Report', {
|
|||||||
// }
|
// }
|
||||||
// });
|
// });
|
||||||
// },
|
// },
|
||||||
|
|
||||||
|
|
||||||
preset: function(frm) {
|
preset: function(frm) {
|
||||||
if (!frm.doc.preset) {
|
if (!frm.doc.preset) {
|
||||||
@ -42,66 +43,47 @@ frappe.ui.form.on('Verkaufsstatistik Report', {
|
|||||||
beforeOneWeek2 = new Date(beforeOneWeek),
|
beforeOneWeek2 = new Date(beforeOneWeek),
|
||||||
day = beforeOneWeek.getDay(),
|
day = beforeOneWeek.getDay(),
|
||||||
diffToMonday = beforeOneWeek.getDate() - day + (day === 0 ? -6 : 1),
|
diffToMonday = beforeOneWeek.getDate() - day + (day === 0 ? -6 : 1),
|
||||||
lastMonday = new Date(beforeOneWeek.setDate(diffToMonday)).toISOString().split('T')[0],
|
lastMonday = convertDate(new Date(beforeOneWeek.setDate(diffToMonday))),
|
||||||
lastSunday = new Date(beforeOneWeek2.setDate(diffToMonday + 6)).toISOString().split('T')[0]
|
lastSunday = convertDate(new Date(beforeOneWeek2.setDate(diffToMonday + 6)))
|
||||||
console.log(lastMonday,lastSunday)
|
console.log(lastMonday,lastSunday)
|
||||||
frm.set_value('from_date',lastMonday)
|
frm.set_value('from_date',lastMonday)
|
||||||
frm.set_value('to_date',lastSunday)
|
frm.set_value('to_date',lastSunday)
|
||||||
} else if (frm.doc.preset === 'Last Month') {
|
} else if (frm.doc.preset === 'Last Month') {
|
||||||
let date = new Date(),
|
let date = new Date(),
|
||||||
previousMonthFirstDay = new Date(date.getFullYear(), date.getMonth()- 1, 2).toISOString().split('T')[0],
|
previousMonthFirstDay = convertDate(new Date(date.getFullYear(), date.getMonth()- 1, 1)),
|
||||||
previousMonthLastDay = new Date(date.getFullYear(), date.getMonth() , 1).toISOString().split('T')[0]
|
previousMonthLastDay = convertDate(new Date(date.getFullYear(), date.getMonth() , 0))
|
||||||
console.log(previousMonthFirstDay,previousMonthLastDay)
|
console.log(previousMonthFirstDay,previousMonthLastDay)
|
||||||
frm.set_value('from_date',previousMonthFirstDay)
|
frm.set_value('from_date',previousMonthFirstDay)
|
||||||
frm.set_value('to_date',previousMonthLastDay)
|
frm.set_value('to_date',previousMonthLastDay)
|
||||||
} else if (frm.doc.preset === 'Last Year') {
|
} else if (frm.doc.preset === 'Last Year') {
|
||||||
let currentYear = new Date().getFullYear(),
|
let currentYear = new Date().getFullYear(),
|
||||||
previousYear = currentYear-1,
|
previousYear = currentYear-1,
|
||||||
firstDay = new Date(previousYear, 0, 2).toISOString().split('T')[0],
|
firstDay = convertDate(new Date(previousYear, 0,1 )),
|
||||||
lastDay = new Date(currentYear, 0, 1).toISOString().split('T')[0]
|
lastDay = convertDate(new Date(previousYear, 11, 31))
|
||||||
console.log(lastDay);
|
console.log(lastDay);
|
||||||
frm.set_value('from_date',firstDay)
|
frm.set_value('from_date',firstDay)
|
||||||
frm.set_value('to_date',lastDay)
|
frm.set_value('to_date',lastDay)
|
||||||
} else if (frm.doc.preset === 'YTD') {
|
} else if (frm.doc.preset === 'YTD') {
|
||||||
let currentYear = new Date().getFullYear(),
|
let currentYear = new Date().getFullYear(),
|
||||||
firstDaySY = new Date(currentYear, 0, 2).toISOString().split('T')[0],
|
firstDaySY = convertDate(new Date(currentYear, 0, 1)),
|
||||||
today = new Date().toISOString().split('T')[0];
|
today = convertDate(new Date())
|
||||||
frm.set_value('from_date',firstDaySY);
|
frm.set_value('from_date',firstDaySY);
|
||||||
frm.set_value('to_date',today);
|
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) {
|
function convertDate(date) {
|
||||||
// frm.set_value('from_date', date_range.start);
|
let yyyy = date.getFullYear().toString(),
|
||||||
// frm.set_value('to_date', date_range.end);
|
mm = (date.getMonth()+1).toString(),
|
||||||
// console.log(date_range);
|
dd = date.getDate().toString(),
|
||||||
// console.log(date_range.start);
|
mmChars = mm.split(''),
|
||||||
// console.log(date_range.end)
|
ddChars = dd.split('')
|
||||||
// }
|
|
||||||
// });
|
return yyyy + '-' + (mmChars[1]?mm:"0"+mmChars[0]) + '-' + (ddChars[1]?dd:"0"+ddChars[0]);
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user