From 73500f6cafeac2304478a87e099e89c498fe5615 Mon Sep 17 00:00:00 2001 From: shyam-kumar8848 <113445741+shyam-kumar8848@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:10:23 +0530 Subject: [PATCH] fix: Case Study --- .../case_study/api/case_study_listing.py | 5 --- .../doctype/case_study/case_study.json | 8 ++-- .../expertise/api/expertise_details.py | 5 ++- .../doctype/expertise/expertise.json | 8 ++-- .../doctype/google_analytics/__init__.py | 0 .../google_analytics/google_analytics.js | 8 ++++ .../google_analytics/google_analytics.json | 40 +++++++++++++++++++ .../google_analytics/google_analytics.py | 9 +++++ .../google_analytics/test_google_analytics.py | 9 +++++ 9 files changed, 75 insertions(+), 17 deletions(-) create mode 100644 digital_8848/digital_8848/doctype/google_analytics/__init__.py create mode 100644 digital_8848/digital_8848/doctype/google_analytics/google_analytics.js create mode 100644 digital_8848/digital_8848/doctype/google_analytics/google_analytics.json create mode 100644 digital_8848/digital_8848/doctype/google_analytics/google_analytics.py create mode 100644 digital_8848/digital_8848/doctype/google_analytics/test_google_analytics.py diff --git a/digital_8848/digital_8848/doctype/case_study/api/case_study_listing.py b/digital_8848/digital_8848/doctype/case_study/api/case_study_listing.py index 6e4f23d..f6982ee 100644 --- a/digital_8848/digital_8848/doctype/case_study/api/case_study_listing.py +++ b/digital_8848/digital_8848/doctype/case_study/api/case_study_listing.py @@ -16,9 +16,6 @@ def get_case_study_listing(**kwargs): page_no = 0 start = page_no * limit - print("limit:", limit) - print("page_no:", page_no) - response = [] filters = {"publish_on_site": 1} @@ -28,12 +25,10 @@ def get_case_study_listing(**kwargs): tab_list = get_tab_details() total_count = frappe.db.count("Case Study", filters=filters) - print("total_count:", total_count) case_study_doctypes_list = frappe.get_all( "Case Study", filters=filters, pluck="name", limit=limit, start=start ) - print("case_study_doctypes_list:", case_study_doctypes_list) if case_study_doctypes_list: for doctype in case_study_doctypes_list: diff --git a/digital_8848/digital_8848/doctype/case_study/case_study.json b/digital_8848/digital_8848/doctype/case_study/case_study.json index c826808..778bdd0 100644 --- a/digital_8848/digital_8848/doctype/case_study/case_study.json +++ b/digital_8848/digital_8848/doctype/case_study/case_study.json @@ -320,14 +320,12 @@ { "fieldname": "cta_btn_url", "fieldtype": "Data", - "label": "Cta Btn URL", - "mandatory_depends_on": "eval: doc.cta_btn_text" + "label": "Cta Btn URL" }, { "fieldname": "cta_btn_text", "fieldtype": "Data", - "label": "Cta Btn Text", - "mandatory_depends_on": "eval: doc.cta_btn_url" + "label": "Cta Btn Text" }, { "fieldname": "btn_description", @@ -338,7 +336,7 @@ "index_web_pages_for_search": 1, "links": [], "make_attachments_public": 1, - "modified": "2024-11-26 18:48:23.726523", + "modified": "2024-11-29 11:02:59.339420", "modified_by": "Administrator", "module": "digital_8848", "name": "Case Study", diff --git a/digital_8848/digital_8848/doctype/expertise/api/expertise_details.py b/digital_8848/digital_8848/doctype/expertise/api/expertise_details.py index bdac6cc..a263a96 100644 --- a/digital_8848/digital_8848/doctype/expertise/api/expertise_details.py +++ b/digital_8848/digital_8848/doctype/expertise/api/expertise_details.py @@ -214,18 +214,19 @@ def get_case_study_details(expertise_doctype): return {"case_study_details": []} # Return an empty dictionary under case_study_details key case_study_doc = frappe.get_doc("Case Study", case_study_title) + final_url = case_study_doc.get("button_url") if case_study_doc.get("use_button_url") else case_study_doc.get("url") case_study_doctype_details = { "title": case_study_doc.get("title") or None, "image": case_study_doc.get("image") or None, "short_description": case_study_doc.get("short_description") or None, "truncate_text": case_study_doc.get("truncate_text_1") or None, "slug": case_study_doc.get("slug") or None, - "url": case_study_doc.get("url") or None, + "url": final_url, # Use the determined URL "type": case_study_doc.get("type") or None, "tag_detail": get_tag_details(case_study_doc) or [] } - # Return under the single key case_study_details return {"case_study_details": [case_study_doctype_details]} + def get_faq_details(expertise_doctype): diff --git a/digital_8848/digital_8848/doctype/expertise/expertise.json b/digital_8848/digital_8848/doctype/expertise/expertise.json index 3f91127..6e26adf 100644 --- a/digital_8848/digital_8848/doctype/expertise/expertise.json +++ b/digital_8848/digital_8848/doctype/expertise/expertise.json @@ -358,14 +358,12 @@ { "fieldname": "cta_btn_url", "fieldtype": "Data", - "label": "Cta Btn URL", - "mandatory_depends_on": "eval: doc.cta_btn_text" + "label": "Cta Btn URL" }, { "fieldname": "cta_btn_text", "fieldtype": "Data", - "label": "Cta Btn Text", - "mandatory_depends_on": "eval: doc.cta_btn_url" + "label": "Cta Btn Text" }, { "fieldname": "section_break_lkyc", @@ -380,7 +378,7 @@ "index_web_pages_for_search": 1, "links": [], "make_attachments_public": 1, - "modified": "2024-11-26 18:49:37.408616", + "modified": "2024-11-29 11:03:36.189476", "modified_by": "Administrator", "module": "digital_8848", "name": "Expertise", diff --git a/digital_8848/digital_8848/doctype/google_analytics/__init__.py b/digital_8848/digital_8848/doctype/google_analytics/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/digital_8848/digital_8848/doctype/google_analytics/google_analytics.js b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.js new file mode 100644 index 0000000..98bcb16 --- /dev/null +++ b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.js @@ -0,0 +1,8 @@ +// Copyright (c) 2024, digital_8848 and contributors +// For license information, please see license.txt + +// frappe.ui.form.on("Google Analytics", { +// refresh(frm) { + +// }, +// }); diff --git a/digital_8848/digital_8848/doctype/google_analytics/google_analytics.json b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.json new file mode 100644 index 0000000..d0e4169 --- /dev/null +++ b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.json @@ -0,0 +1,40 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2024-11-28 18:16:45.093879", + "doctype": "DocType", + "engine": "InnoDB", + "field_order": [ + "google_analytics_id" + ], + "fields": [ + { + "fieldname": "google_analytics_id", + "fieldtype": "Data", + "label": "Google Analytics ID" + } + ], + "index_web_pages_for_search": 1, + "issingle": 1, + "links": [], + "modified": "2024-11-28 18:17:18.770209", + "modified_by": "Administrator", + "module": "digital_8848", + "name": "Google Analytics", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [] +} \ No newline at end of file diff --git a/digital_8848/digital_8848/doctype/google_analytics/google_analytics.py b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.py new file mode 100644 index 0000000..01dc66d --- /dev/null +++ b/digital_8848/digital_8848/doctype/google_analytics/google_analytics.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, digital_8848 and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + + +class GoogleAnalytics(Document): + pass diff --git a/digital_8848/digital_8848/doctype/google_analytics/test_google_analytics.py b/digital_8848/digital_8848/doctype/google_analytics/test_google_analytics.py new file mode 100644 index 0000000..9b3c46f --- /dev/null +++ b/digital_8848/digital_8848/doctype/google_analytics/test_google_analytics.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, digital_8848 and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestGoogleAnalytics(FrappeTestCase): + pass