diff --git a/smart_service/add_ons/report/feedback_report/feedback_report.py b/smart_service/add_ons/report/feedback_report/feedback_report.py
index 66a8237..3b06502 100644
--- a/smart_service/add_ons/report/feedback_report/feedback_report.py
+++ b/smart_service/add_ons/report/feedback_report/feedback_report.py
@@ -28,6 +28,8 @@ def get_data(filters):
def get_columns():
columns = [
+ {"label": _("User ID"), "fieldname": "user_id", "fieldtype":"Data","width": 100},
+ {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 150},
{"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 100},
{"label": _("Feedback ID"), "fieldname": "name", "fieldtype": "Link", "options":"User Feedback","width": 120},
{"label": _("Feedback Type"), "fieldname": "feedback_type", "fieldtype": "Data", "width": 120},
@@ -35,15 +37,12 @@ def get_columns():
{"label": _("Feedback Description"), "fieldname": "description", "fieldtype": "Text Editor", "width": 250},
{"label": _("Attachments"), "fieldname": "attachments", "fieldtype": "Data", "width": 100},
{"label": _("Feedback Status"), "fieldname": "status", "fieldtype": "Data", "width": 100},
- {"label": _("User ID"), "fieldname": "user_id", "fieldtype":"Data","width": 100},
- {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 150},
{"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100},
{"label": _("Area Office"), "fieldname": "area", "fieldtype": "Data", "width": 140},
{"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 120},
{"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 150},
{"label": _("Closure Date"), "fieldname": "closure_date", "fieldtype": "Data", "width": 150},
{"label": _("Closed By"), "fieldname": "closed_by", "fieldtype": "Data", "width": 120}
-
]
return columns
diff --git a/smart_service/add_ons/report/installation_report/installation_report.py b/smart_service/add_ons/report/installation_report/installation_report.py
index f3ec9af..0f5cb30 100644
--- a/smart_service/add_ons/report/installation_report/installation_report.py
+++ b/smart_service/add_ons/report/installation_report/installation_report.py
@@ -31,21 +31,36 @@ def get_data(filters):
def get_columns():
columns = [
- {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100},
- {"label": _("Area Office"), "fieldname": "area", "fieldtype":"Data","width": 150},
- {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 100},
- {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150},
+ {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 100},
+ {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 150},
{"label": _("Installation"), "fieldname": "device", "fieldtype": "Data","width": 100},
+ {"label": _("App Version No"), "fieldname": "app_current_version", "fieldtype": "Data", "width": 150},
+ {"label": _("Activity Type"), "fieldname": "type", "fieldtype": "Data","width": 150},
{"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data","width": 100},
- {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 100},
+ {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 150},
{"label": _("Device OS"), "fieldname": "os", "fieldtype": "Data", "width": 100},
{"label": _("OS Version"), "fieldname": "os_version", "fieldtype": "Data", "width": 100},
- {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 100},
- {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 100},
- {"label": _("Activity Type"), "fieldname": "type", "fieldtype": "Data","width": 100},
{"label": _("App Installation Date"), "fieldname": "date_time_stamp", "fieldtype": "DateTime","width": 200},
- {"label": _("App Last Accessed Date"), "fieldname": "date", "fieldtype": "DateTime","width": 200},
- {"label": _("App Version No"), "fieldname": "app_current_version", "fieldtype": "Data", "width": 150},
+ {"label": _("App Last Accessed Date"), "fieldname": "date", "fieldtype": "DateTime","width": 200}
]
return columns
+# def get_columns():
+# columns = [
+# {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100},
+# {"label": _("Area Office"), "fieldname": "area", "fieldtype":"Data","width": 150},
+# {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 100},
+# {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150},
+# {"label": _("Installation"), "fieldname": "device", "fieldtype": "Data","width": 100},
+# {"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data","width": 100},
+# {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 100},
+# {"label": _("Device OS"), "fieldname": "os", "fieldtype": "Data", "width": 100},
+# {"label": _("OS Version"), "fieldname": "os_version", "fieldtype": "Data", "width": 100},
+# {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 100},
+# {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 100},
+# {"label": _("Activity Type"), "fieldname": "type", "fieldtype": "Data","width": 100},
+# {"label": _("App Installation Date"), "fieldname": "date_time_stamp", "fieldtype": "DateTime","width": 200},
+# {"label": _("App Last Accessed Date"), "fieldname": "date", "fieldtype": "DateTime","width": 200},
+# {"label": _("App Version No"), "fieldname": "app_current_version", "fieldtype": "Data", "width": 150},
+# ]
+# return columns
diff --git a/smart_service/add_ons/report/login_report/login_report.py b/smart_service/add_ons/report/login_report/login_report.py
index 884a1a1..548dff8 100644
--- a/smart_service/add_ons/report/login_report/login_report.py
+++ b/smart_service/add_ons/report/login_report/login_report.py
@@ -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,
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,
- 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`
where date(date_time_stamp) between '{from_date}' and '{to_date}' group by user,date(date_time_stamp)) mal
where mal.user=al.user
@@ -48,19 +49,33 @@ def get_data(filters):
def get_columns():
columns = [
+ {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 150},
+ {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 150},
{"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 100},
{"label": _("Time"), "fieldname": "last_login_time", "fieldtype": "DateTime", "width": 130},
- {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100},
- {"label": _("Area Office"), "fieldname": "area", "fieldtype": "Data", "width": 100},
- {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150},
- {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150},
- {"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data", "width": 100},
- {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 150},
- {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 150},
- {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 100},
- {"label": _("Latitude"), "fieldname": "latitude", "fieldtype": "Data", "width": 100},
- {"label": _("Longitude"), "fieldname": "longitude", "fieldtype": "Data", "width": 100},
{"label": _("Count"), "fieldname": "count", "fieldtype": "Data", "width": 100},
+ {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 100},
+ {"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data", "width": 130},
+ {"label": _("Latitude"), "fieldname": "latitude", "fieldtype": "Data", "width": 100},
+ {"label": _("Longitude"), "fieldname": "longitude", "fieldtype": "Data", "width": 100}
]
return columns
+# def get_columns():
+# columns = [
+# {"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 100},
+# {"label": _("Time"), "fieldname": "last_login_time", "fieldtype": "DateTime", "width": 130},
+# {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100},
+# {"label": _("Area Office"), "fieldname": "area", "fieldtype": "Data", "width": 100},
+# {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150},
+# {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype":"Data","width": 150},
+# {"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data", "width": 100},
+# {"label": _("Device ID"), "fieldname": "device_id", "fieldtype": "Data", "width": 150},
+# {"label": _("User ID"), "fieldname": "user_id", "fieldtype": "Data", "width": 150},
+# {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 100},
+# {"label": _("Latitude"), "fieldname": "latitude", "fieldtype": "Data", "width": 100},
+# {"label": _("Longitude"), "fieldname": "longitude", "fieldtype": "Data", "width": 100},
+# {"label": _("Count"), "fieldname": "count", "fieldtype": "Data", "width": 100},
+# ]
+# return columns
+