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

refactor: Use current_date variable

Browse source
This commit is contained in:
Suraj Shetty 2020-07-03 10:59:00 +05:30 • committed by GitHub
parent 66eef87fdc
commit 002dfec30d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/desk/page/leaderboard/leaderboard.js
View file

@ -379,16 +379,16 @@ class Leaderboard {
let timespan = this.options.selected_timespan.toLowerCase();
let current_date = frappe.datetime.now_date();
let date_range_map = {
"this week": [frappe.datetime.week_start(), frappe.datetime.now_date()],
"this month": [frappe.datetime.month_start(), frappe.datetime.now_date()],
"this quarter": [frappe.datetime.quarter_start(), frappe.datetime.now_date()],
"this year": [frappe.datetime.year_start(), frappe.datetime.now_date()],
"last week": [frappe.datetime.add_days(current_date, -7), frappe.datetime.now_date()],
"last month": [frappe.datetime.add_months(current_date, -1), frappe.datetime.now_date()],
"last quarter": [frappe.datetime.add_months(current_date, -3), frappe.datetime.now_date()],
"last year": [frappe.datetime.add_months(current_date, -12), frappe.datetime.now_date()],
"this week": [frappe.datetime.week_start(), current_date],
"this month": [frappe.datetime.month_start(), current_date],
"this quarter": [frappe.datetime.quarter_start(), current_date],
"this year": [frappe.datetime.year_start(), current_date],
"last week": [frappe.datetime.add_days(current_date, -7), current_date],
"last month": [frappe.datetime.add_months(current_date, -1), current_date],
"last quarter": [frappe.datetime.add_months(current_date, -3), current_date],
"last year": [frappe.datetime.add_months(current_date, -12), current_date],
"all time": null,
"select date range": this.selected_date_range || [frappe.datetime.month_start(), frappe.datetime.now_date()]
"select date range": this.selected_date_range || [frappe.datetime.month_start(), current_date]
}
return date_range_map[timespan];
}