From a79bbd78967c8bdde2a4db6ca36e6645d3744bcf Mon Sep 17 00:00:00 2001 From: venkataakhil Date: Thu, 20 Jul 2023 15:23:48 +0530 Subject: [PATCH] Reports fields re arrange --- .../model_download_report.py | 18 +++++++++--------- .../model_hit_report/model_hit_report.py | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/smart_service/add_ons/report/model_download_report/model_download_report.py b/smart_service/add_ons/report/model_download_report/model_download_report.py index 0887f61..b0485e1 100644 --- a/smart_service/add_ons/report/model_download_report/model_download_report.py +++ b/smart_service/add_ons/report/model_download_report/model_download_report.py @@ -51,17 +51,17 @@ def get_data(filters): def get_columns(): columns = [ - {"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 100}, - {"label": _("Downloaded Vehicle"), "fieldname": "download_vehicle_id", "fieldtype": "Data", "width": 170}, - {"label": _("Downloaded Version"), "fieldname": "download_vehicle_current_version", "fieldtype": "Data", "width": 150}, + {"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 150}, + {"label": _("Downloaded Vehicle"), "fieldname": "download_vehicle_id", "fieldtype": "Data", "width": 150}, {"label": _("Downloaded Language"), "fieldname": "download_vehicle_language_id", "fieldtype": "Data", "width": 150}, + {"label": _("Downloaded Version"), "fieldname": "download_vehicle_current_version", "fieldtype": "Data", "width": 150}, {"label": _("App Version"), "fieldname": "app_version", "fieldtype": "Data", "width": 150}, - {"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": 150}, - {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 150}, - {"label": _("Device"), "fieldname": "device_id", "fieldtype": "Data", "width": 100}, - {"label": _("Device Type"), "fieldname": "device_type", "fieldtype": "Data", "width": 130} + # {"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": 150}, + # {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 150}, + {"label": _("Device"), "fieldname": "device_id", "fieldtype": "Data", "width": 150}, + {"label": _("Device Type"), "fieldname": "device_type", "fieldtype": "Data", "width": 150} ] return columns \ No newline at end of file diff --git a/smart_service/add_ons/report/model_hit_report/model_hit_report.py b/smart_service/add_ons/report/model_hit_report/model_hit_report.py index 1c5a4c0..5aef1f6 100644 --- a/smart_service/add_ons/report/model_hit_report/model_hit_report.py +++ b/smart_service/add_ons/report/model_hit_report/model_hit_report.py @@ -119,20 +119,20 @@ def get_data(filters): def get_columns(): columns = [ {"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 150}, - {"label": _("Module"), "fieldname": "module_id", "fieldtype": "Data", "width": 150}, {"label": _("Model"), "fieldname": "vehicle_id", "fieldtype": "Data", "width": 150}, {"label": _("Variant Mapping"), "fieldname": "variant_mapping_id", "fieldtype": "Data", "width": 150}, {"label": _("Variant"), "fieldname": "variant_id", "fieldtype": "Data", "width": 80}, + {"label": _("Module"), "fieldname": "module_id", "fieldtype": "Data", "width": 150}, {"label": _("System"), "fieldname": "system_id", "fieldtype": "Data", "width": 150}, {"label": _("Sub System"), "fieldname": "sub_system_id", "fieldtype": "Data", "width": 150}, {"label": _("Procedure"), "fieldname": "procedure_id", "fieldtype": "Data", "width": 150}, {"label": _("Steps"), "fieldname": "steps_id", "fieldtype": "Data", "width": 150}, {"label": _("Language"), "fieldname": "language", "fieldtype": "Data", "width": 80}, {"label": _("Count"), "fieldname": "count", "fieldtype": "Data", "width": 80}, - {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 150}, - {"label": _("Area Office"), "fieldname": "area", "fieldtype": "Data", "width": 150}, - {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150}, - {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 150}, + # {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 150}, + # {"label": _("Area Office"), "fieldname": "area", "fieldtype": "Data", "width": 150}, + # {"label": _("Dealer Code"), "fieldname": "dealer_code", "fieldtype": "Data", "width": 150}, + # {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 150}, {"label": _("Device"), "fieldname": "device_id", "fieldtype": "Data", "width": 150}, {"label": _("Device Type"), "fieldname": "device_type", "fieldtype": "Data", "width": 150} ]