nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: convert heatmap queries to QB (#33581)

Browse Source 
Uses new `UnixTimestamp` function, don't backport.
This commit is contained in:
Ankush Menat
2023-01-09 20:00:22 +05:30
committed by GitHub
parent 7ee151880a
commit fa4af2acce
3 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/projects/doctype/project/project.py
View File

@@ -7,6 +7,8 @@ from email_reply_parser import EmailReplyParser
from frappe import _
from frappe.desk.reportview import get_match_cond
from frappe.model.document import Document
from frappe.query_builder import Interval
from frappe.query_builder.functions import Count, CurDate, Date, UnixTimestamp
from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today
from erpnext import get_default_company
@@ -297,17 +299,19 @@ class Project(Document):
user.welcome_email_sent = 1
def get_timeline_data(doctype, name):
def get_timeline_data(doctype: str, name: str) -> dict[int, int]:
"""Return timeline for attendance"""
timesheet_detail = frappe.qb.DocType("Timesheet Detail")
return dict(
frappe.db.sql(
"""select unix_timestamp(from_time), count(*)
from `tabTimesheet Detail` where project=%s
and from_time > date_sub(curdate(), interval 1 year)
and docstatus < 2
group by date(from_time)""",
name,
)
frappe.qb.from_(timesheet_detail)
.select(UnixTimestamp(timesheet_detail.from_time), Count("*"))
.where(timesheet_detail.project == name)
.where(timesheet_detail.from_time > CurDate() - Interval(years=1))
.where(timesheet_detail.docstatus < 2)
.groupby(Date(timesheet_detail.from_time))
.run()
)