From f17983ce4a5f4c915a62adfe247db2789ef957b8 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 6 Mar 2024 12:14:07 +0100 Subject: [PATCH 1/5] added new fields in web template --- .../web_template/event_card/event_card.json | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/erpnext/venue/web_template/event_card/event_card.json b/erpnext/venue/web_template/event_card/event_card.json index e7fbf27adda..b12422869c4 100644 --- a/erpnext/venue/web_template/event_card/event_card.json +++ b/erpnext/venue/web_template/event_card/event_card.json @@ -1,9 +1,11 @@ { + "__unsaved": 1, "creation": "2023-12-07 17:29:26.161880", "docstatus": 0, "doctype": "Web Template", "fields": [ { + "dynamic_template": 0, "fieldname": "title", "fieldtype": "Data", "label": "Title", @@ -11,13 +13,50 @@ }, { "default": "16", + "dynamic_template": 0, "fieldname": "limit", "fieldtype": "Int", "label": "Limit", "reqd": 0 + }, + { + "__unsaved": 1, + "default": "starts_on asc", + "dynamic_template": 0, + "fieldname": "sort_field", + "fieldtype": "Data", + "label": "Sort Field", + "reqd": 1 + }, + { + "__unsaved": 1, + "dynamic_template": 0, + "fieldname": "filters", + "fieldtype": "Table Break", + "label": "Filters", + "reqd": 0 + }, + { + "__islocal": 1, + "__unsaved": 1, + "dynamic_template": 0, + "fieldname": "fieldname", + "fieldtype": "Data", + "label": "Fieldname", + "reqd": 0 + }, + { + "__islocal": 1, + "__unsaved": 1, + "dynamic_template": 0, + "fieldname": "value", + "fieldtype": "Data", + "label": "Value", + "reqd": 0 } ], - "modified": "2023-12-07 17:29:26.161880", + "idx": 0, + "modified": "2024-03-06 12:13:28.110840", "modified_by": "Administrator", "module": "Venue", "name": "Event Card", @@ -25,4 +64,4 @@ "standard": 1, "template": "", "type": "Section" -} +} \ No newline at end of file -- GitLab From 1dbe91fe5731443ec7d4cea685c226919a69b935 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 6 Mar 2024 12:36:27 +0100 Subject: [PATCH 2/5] Added filter and sort field in html --- .../web_template/event_card/event_card.html | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/erpnext/venue/web_template/event_card/event_card.html b/erpnext/venue/web_template/event_card/event_card.html index d9b776cb7ff..89689e54204 100644 --- a/erpnext/venue/web_template/event_card/event_card.html +++ b/erpnext/venue/web_template/event_card/event_card.html @@ -1,3 +1,28 @@ +{%- set sort_field = sort_field -%} +{%- set filters = filters or [] -%} + +{# Prepare filters #} +{%- set ns = namespace(query_filters=[], method=frappe.get_list) -%} +{% set filt = ['Event', published_field, "=", "1"] -%} +{% set ns.query_filters = ns.query_filters + [filt] -%} +{% set ns.method = frappe.get_all -%} + + +{%- for filt in filters -%} + {%- if filt.fieldname and filt.value -%} + {%- set filt = ["Event", filt.fieldname, "=", filt.value] -%} + {%- set ns.query_filters = ns.query_filters + [filt] -%} + {%- endif -%} +{%- endfor -%} + +{%- set event_list = ns.method( + "Event", + filters=ns.query_filters, + order_by=sort_field, + limit=limit, + pluck="name", +) -%} + {%- macro event_card(event, is_full_width=False, align="Left") -%} {# {%- set align_events_class = resolve_class({ 'align-events-end': align == 'Right', @@ -116,12 +141,6 @@
- {%- set event_list = frappe.get_all( - 'Event', - {'published': 1, 'event_type': 'Public'}, - order_by='starts_on asc', - limit=limit if limit else 24, - ) -%} {%- for event in event_list: -%} {%- set event = frappe.get_doc('Event', event) -%} {{ event_card(event, is_full_width=True, align='Center') }} -- GitLab From ff0555a58356892536c34f6165c63dda5c2da2f9 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 6 Mar 2024 12:42:40 +0100 Subject: [PATCH 3/5] fix html --- erpnext/venue/web_template/event_card/event_card.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/venue/web_template/event_card/event_card.html b/erpnext/venue/web_template/event_card/event_card.html index 89689e54204..003813f7144 100644 --- a/erpnext/venue/web_template/event_card/event_card.html +++ b/erpnext/venue/web_template/event_card/event_card.html @@ -3,7 +3,7 @@ {# Prepare filters #} {%- set ns = namespace(query_filters=[], method=frappe.get_list) -%} -{% set filt = ['Event', published_field, "=", "1"] -%} +{% set filt = ['Event', "published", "=", "1"] -%} {% set ns.query_filters = ns.query_filters + [filt] -%} {% set ns.method = frappe.get_all -%} -- GitLab From 0914e0eaa8011b73165eb231466037d754b6d7b1 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 6 Mar 2024 16:15:58 +0100 Subject: [PATCH 4/5] option to hide/display past events --- .../venue/web_template/event_card/event_card.html | 8 ++++++-- .../venue/web_template/event_card/event_card.json | 15 +++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/erpnext/venue/web_template/event_card/event_card.html b/erpnext/venue/web_template/event_card/event_card.html index 003813f7144..496d5e8884c 100644 --- a/erpnext/venue/web_template/event_card/event_card.html +++ b/erpnext/venue/web_template/event_card/event_card.html @@ -3,10 +3,10 @@ {# Prepare filters #} {%- set ns = namespace(query_filters=[], method=frappe.get_list) -%} -{% set filt = ['Event', "published", "=", "1"] -%} +{% set filt = ["Event", "published", "=", "1"] -%} {% set ns.query_filters = ns.query_filters + [filt] -%} {% set ns.method = frappe.get_all -%} - +{% set date = frappe.utils.get_datetime() %} {%- for filt in filters -%} {%- if filt.fieldname and filt.value -%} @@ -15,6 +15,10 @@ {%- endif -%} {%- endfor -%} +{% if not display_past_event %} + {% set ns.query_filters = ns.query_filters + [["Event", "starts_on", ">=", frappe.utils.today()]] %} +{% endif %} + {%- set event_list = ns.method( "Event", filters=ns.query_filters, diff --git a/erpnext/venue/web_template/event_card/event_card.json b/erpnext/venue/web_template/event_card/event_card.json index b12422869c4..4311db6d422 100644 --- a/erpnext/venue/web_template/event_card/event_card.json +++ b/erpnext/venue/web_template/event_card/event_card.json @@ -21,6 +21,14 @@ }, { "__unsaved": 1, + "default": "0", + "dynamic_template": 0, + "fieldname": "display_past_event", + "fieldtype": "Check", + "label": "Display Past Event", + "reqd": 0 + }, + { "default": "starts_on asc", "dynamic_template": 0, "fieldname": "sort_field", @@ -29,7 +37,6 @@ "reqd": 1 }, { - "__unsaved": 1, "dynamic_template": 0, "fieldname": "filters", "fieldtype": "Table Break", @@ -37,8 +44,6 @@ "reqd": 0 }, { - "__islocal": 1, - "__unsaved": 1, "dynamic_template": 0, "fieldname": "fieldname", "fieldtype": "Data", @@ -46,8 +51,6 @@ "reqd": 0 }, { - "__islocal": 1, - "__unsaved": 1, "dynamic_template": 0, "fieldname": "value", "fieldtype": "Data", @@ -56,7 +59,7 @@ } ], "idx": 0, - "modified": "2024-03-06 12:13:28.110840", + "modified": "2024-03-06 12:43:33.640955", "modified_by": "Administrator", "module": "Venue", "name": "Event Card", -- GitLab From f5366c74a814656ed31565b78a1f976ec465a378 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 6 Mar 2024 16:37:10 +0100 Subject: [PATCH 5/5] add fr translation --- erpnext/translations/fr.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv index e3fdfd604cc..3a333d752de 100644 --- a/erpnext/translations/fr.csv +++ b/erpnext/translations/fr.csv @@ -3731,6 +3731,7 @@ Display Additional Information,Informations additionnelles, Display Images,Images, Display Information,Informations, Display Items In Stock,Afficher les articles en stock, +Display Past Event, Afficher les événements passés, Display Settings,Paramètres d'affichage, Disposal Date,Date de cession/destruction, Distance UOM,Distance UOM, -- GitLab