From 28251044e47a2f5ed497074eca0ca599fe264d70 Mon Sep 17 00:00:00 2001 From: administrator Date: Fri, 15 Dec 2023 07:01:49 +0000 Subject: [PATCH] Remove nothing to show message to select model and remove user id and user name --- .../model_download_report.js | 20 +++++++------- .../model_hit_report/model_hit_report.js | 26 +++++++++++-------- .../model_hit_report/model_hit_report.py | 4 +-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/smart_service/add_ons/report/model_download_report/model_download_report.js b/smart_service/add_ons/report/model_download_report/model_download_report.js index fabeffb..be6ef55 100644 --- a/smart_service/add_ons/report/model_download_report/model_download_report.js +++ b/smart_service/add_ons/report/model_download_report/model_download_report.js @@ -28,23 +28,23 @@ frappe.query_reports["Model Download Report"] = { "on_change":function() { model = frappe.query_report.get_filter_value('model'); if (!model) { - setTimeout(function mysam(){ - $('.msg-box').empty() - $('.msg-box').append('
Generic Empty State

Please Enter the Model

') + // setTimeout(function mysam(){ + // $('.msg-box').empty() + // $('.msg-box').append('
Generic Empty State

Please Enter the Model

') - },200) + // },100) } frappe.query_report.refresh(); } } ], - "onload":function(){ - setTimeout(function mysam(){ - $('.msg-box').empty() - $('.msg-box').append('
Generic Empty State

Please Enter the Model

') + // "onload":function(){ + // setTimeout(function mysam(){ + // $('.msg-box').empty() + // $('.msg-box').append('
Generic Empty State

Please Enter the Model

') - },400) + // },400) - } + // } }; diff --git a/smart_service/add_ons/report/model_hit_report/model_hit_report.js b/smart_service/add_ons/report/model_hit_report/model_hit_report.js index 70725b9..5440ce6 100644 --- a/smart_service/add_ons/report/model_hit_report/model_hit_report.js +++ b/smart_service/add_ons/report/model_hit_report/model_hit_report.js @@ -28,11 +28,15 @@ frappe.query_reports["Model Hit Report"] = { "on_change":function() { model = frappe.query_report.get_filter_value('model'); if (!model) { - setTimeout(function mysam(){ - $('.msg-box').empty() - $('.msg-box').append('
Generic Empty State

Please Enter the Model

') - - },200) + variant = frappe.query_report.get_filter_value('variant'); + if(variant){ + frappe.query_report.set_filter_value("variant", ''); + } + // setTimeout(function mysam(){ + // $('.msg-box').empty() + // $('.msg-box').append('
Generic Empty State

Please Enter the Model

') + + // },200) } frappe.query_report.refresh(); } @@ -55,14 +59,14 @@ frappe.query_reports["Model Hit Report"] = { } ], - "onload":function(){ - setTimeout(function mysam(){ - $('.msg-box').empty() - $('.msg-box').append('
Generic Empty State

Please Enter the Model

') + // "onload":function(){ + // setTimeout(function mysam(){ + // $('.msg-box').empty() + // $('.msg-box').append('
Generic Empty State

Please Enter the Model

') - },400) + // },400) - }, + // }, "formatter": function (value, row, column, data, default_formatter) { 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 bed144c..23e73d8 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 @@ -123,8 +123,8 @@ def get_data(filters): def get_columns(): columns = [ {"label": _("Date"), "fieldname": "date", "fieldtype": "Date", "width": 150}, - {"label": _("User ID"), "fieldname": "login_name", "fieldtype": "Data", "width": 125}, - {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 125}, + # {"label": _("User ID"), "fieldname": "login_name", "fieldtype": "Data", "width": 125}, + # {"label": _("User Name"), "fieldname": "user_name", "fieldtype": "Data", "width": 125}, {"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},