|
@ -33,7 +33,8 @@ def get_data(filters): |
|
|
data = frappe.db.sql("""select dealer.zone,au.user_id,concat_ws(' ',au.first_name,au.last_name) as user_name, |
|
|
data = frappe.db.sql("""select dealer.zone,au.user_id,concat_ws(' ',au.first_name,au.last_name) as user_name, |
|
|
dealer.dealer_code,dealer.dealer_name,dealer.area,ad.os,ad.os_version, |
|
|
dealer.dealer_code,dealer.dealer_name,dealer.area,ad.os,ad.os_version, |
|
|
ad.device_type,ad.device_id,ad.app_current_version,al.type,date(al.date_time_stamp) as date, |
|
|
ad.device_type,ad.device_id,ad.app_current_version,al.type,date(al.date_time_stamp) as date, |
|
|
al.latitude, al.longitude, au.name, al.device, time(al.date_time_stamp) as last_login_time, mal.count from {current_db_name}.`tabApp Log` al,{current_db_name}.`tabApp Device` ad, {current_db_name}.`tabApp Users` au,{current_db_name}.`tabApp Dealer` dealer, |
|
|
al.latitude, al.longitude, au.name, al.device, time(al.date_time_stamp) as last_login_time, mal.count from {current_db_name}.`tabApp Log` al, |
|
|
|
|
|
{current_db_name}.`tabApp Device` ad, {current_db_name}.`tabApp Users` au,{current_db_name}.`tabApp Dealer` dealer, |
|
|
(select user,Max(date_time_stamp) as date_time_stam, count(date(date_time_stamp)) as count from {current_db_name}.`tabApp Log` |
|
|
(select user,Max(date_time_stamp) as date_time_stam, count(date(date_time_stamp)) as count from {current_db_name}.`tabApp Log` |
|
|
where date(date_time_stamp) between '{from_date}' and '{to_date}' group by user,date(date_time_stamp)) mal |
|
|
where date(date_time_stamp) between '{from_date}' and '{to_date}' group by user,date(date_time_stamp)) mal |
|
|
where mal.user=al.user |
|
|
where mal.user=al.user |
|
@ -48,19 +49,33 @@ def get_data(filters): |
|
|
|
|
|
|
|
|
def get_columns(): |
|
|
def get_columns(): |
|
|
columns = [ |
|
|
columns = [ |
|
|
|
|
|
{"label": _("<b>User ID</b>"), "fieldname": "user_id", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
{"label": _("<b>User Name</b>"), "fieldname": "user_name", "fieldtype": "Data", "width": 150}, |
|
|
{"label": _("<b>Date</b>"), "fieldname": "date", "fieldtype": "Date", "width": 100}, |
|
|
{"label": _("<b>Date</b>"), "fieldname": "date", "fieldtype": "Date", "width": 100}, |
|
|
{"label": _("<b>Time</b>"), "fieldname": "last_login_time", "fieldtype": "DateTime", "width": 130}, |
|
|
{"label": _("<b>Time</b>"), "fieldname": "last_login_time", "fieldtype": "DateTime", "width": 130}, |
|
|
{"label": _("<b>Zone</b>"), "fieldname": "zone", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Area Office</b>"), "fieldname": "area", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Dealer Code</b>"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
{"label": _("<b>Dealer Name</b>"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150}, |
|
|
|
|
|
{"label": _("<b>Device</b>"), "fieldname": "device_type", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Device ID</b>"), "fieldname": "device_id", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
{"label": _("<b>User ID</b>"), "fieldname": "user_id", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
{"label": _("<b>User Name</b>"), "fieldname": "user_name", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Latitude</b>"), "fieldname": "latitude", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Longitude</b>"), "fieldname": "longitude", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Count</b>"), "fieldname": "count", "fieldtype": "Data", "width": 100}, |
|
|
{"label": _("<b>Count</b>"), "fieldname": "count", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Device ID</b>"), "fieldname": "device_id", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Device</b>"), "fieldname": "device_type", "fieldtype": "Data", "width": 130}, |
|
|
|
|
|
{"label": _("<b>Latitude</b>"), "fieldname": "latitude", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
{"label": _("<b>Longitude</b>"), "fieldname": "longitude", "fieldtype": "Data", "width": 100} |
|
|
] |
|
|
] |
|
|
return columns |
|
|
return columns |
|
|
|
|
|
|
|
|
|
|
|
# def get_columns(): |
|
|
|
|
|
# columns = [ |
|
|
|
|
|
# {"label": _("<b>Date</b>"), "fieldname": "date", "fieldtype": "Date", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Time</b>"), "fieldname": "last_login_time", "fieldtype": "DateTime", "width": 130}, |
|
|
|
|
|
# {"label": _("<b>Zone</b>"), "fieldname": "zone", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Area Office</b>"), "fieldname": "area", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Dealer Code</b>"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
# {"label": _("<b>Dealer Name</b>"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150}, |
|
|
|
|
|
# {"label": _("<b>Device</b>"), "fieldname": "device_type", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Device ID</b>"), "fieldname": "device_id", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
# {"label": _("<b>User ID</b>"), "fieldname": "user_id", "fieldtype": "Data", "width": 150}, |
|
|
|
|
|
# {"label": _("<b>User Name</b>"), "fieldname": "user_name", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Latitude</b>"), "fieldname": "latitude", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Longitude</b>"), "fieldname": "longitude", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# {"label": _("<b>Count</b>"), "fieldname": "count", "fieldtype": "Data", "width": 100}, |
|
|
|
|
|
# ] |
|
|
|
|
|
# return columns |
|
|
|
|
|
|
|
|