|
|
@ -30,7 +30,9 @@ def get_data(filters): |
|
|
|
data = frappe.db.sql("""SELECT date as date, device_id, device_type, module_id, vehicle_id, variant_id,variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id, |
|
|
|
count(*) as count, user_id, language FROM {0}.`tabModel Usage` WHERE vehicle_id='{1}' and variant_id='{2}' and (date(date) between '{3}' and '{4}') |
|
|
|
GROUP BY date(date), user_id, module_id, device_id, vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id, |
|
|
|
language;""".format(current_db_name, modelfilter, variantfilter[1], from_date, to_date), as_dict=1) |
|
|
|
language |
|
|
|
order by module_id,vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id,language; |
|
|
|
""".format(current_db_name, modelfilter, variantfilter[1], from_date, to_date), as_dict=1) |
|
|
|
|
|
|
|
for d in data: |
|
|
|
if d['user_id']: |
|
|
@ -58,8 +60,9 @@ def get_data(filters): |
|
|
|
|
|
|
|
data = frappe.db.sql("""SELECT date(date) as date, device_id, device_type, module_id, vehicle_id, variant_id,variant_mapping_id, system_id, sub_system_id, procedure_id, |
|
|
|
steps_id, count(*) as count, user_id, language FROM {0}.`tabModel Usage` WHERE vehicle_id='{1}' and (date(date) between '{2}' and '{3}') |
|
|
|
GROUP BY date(date), user_id, module_id, device_id, vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id, |
|
|
|
language;""".format(current_db_name, modelfilter, from_date, to_date), as_dict=1) |
|
|
|
GROUP BY date(date), user_id, module_id, device_id, vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id,language |
|
|
|
order by module_id,vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id,language; |
|
|
|
;""".format(current_db_name, modelfilter, from_date, to_date), as_dict=1) |
|
|
|
|
|
|
|
for d in data: |
|
|
|
if d['user_id']: |
|
|
@ -89,7 +92,9 @@ def get_data(filters): |
|
|
|
data = frappe.db.sql("""SELECT date as date, device_id, device_type, module_id, vehicle_id, variant_id,variant_mapping_id, system_id, sub_system_id, |
|
|
|
procedure_id, steps_id, count(*) as count, user_id, language FROM {0}.`tabModel Usage` WHERE vehicle_id='{1}' and variant_id='{2}' |
|
|
|
and (date(date) between '{3}' and '{4}') GROUP BY date(date), user_id, module_id, device_id, vehicle_id, variant_id, variant_mapping_id, |
|
|
|
system_id, sub_system_id, procedure_id, steps_id, language;""".format(current_db_name, variantfilter[0], variantfilter[1], from_date, to_date), as_dict=1) |
|
|
|
system_id, sub_system_id, procedure_id, steps_id, language |
|
|
|
order by module_id,vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id,language; |
|
|
|
;""".format(current_db_name, variantfilter[0], variantfilter[1], from_date, to_date), as_dict=1) |
|
|
|
|
|
|
|
for d in data: |
|
|
|
if d['user_id']: |
|
|
|