From f923a969e9d70d3b1a947350755c1c328eace0c5 Mon Sep 17 00:00:00 2001 From: AlirezaYousefpour <93353496+AlirezaYousefpourM@users.noreply.github.com> Date: Wed, 15 Jan 2025 02:02:22 +0330 Subject: [PATCH 1/5] Update models.py --- backend/backend_api/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/backend_api/models.py b/backend/backend_api/models.py index 111bae3..7ad9d8e 100644 --- a/backend/backend_api/models.py +++ b/backend/backend_api/models.py @@ -151,8 +151,8 @@ def google_calendar_link(self): base_url = "https://www.google.com/calendar/render?action=TEMPLATE" workshop_title = escape(self.name) workshop_description = escape(self.desc) - start_datetime = self.start_date.strftime("%Y%m%dT%H%M%S") - end_datetime = self.end_date.strftime("%Y%m%dT%H%M%S") + start_datetime = (self.start_date + timedelta(hours=3, minutes=30)).strftime("%Y%m%dT%H%M%S") + end_datetime = (self.end_date + timedelta(hours=3, minutes=30)).strftime("%Y%m%dT%H%M%S") teachers_names = " ".join([teacher.name for teacher in self.teachers.all()]) event_details = f"Teachers: {teachers_names}\nDescription: {workshop_description}" From bfab7429e6160694fd8dd63cd923614f347cb88d Mon Sep 17 00:00:00 2001 From: AlirezaYousefpour <93353496+AlirezaYousefpourM@users.noreply.github.com> Date: Wed, 15 Jan 2025 02:15:59 +0330 Subject: [PATCH 2/5] Update models.py --- backend/backend_api/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/backend_api/models.py b/backend/backend_api/models.py index 7ad9d8e..a471002 100644 --- a/backend/backend_api/models.py +++ b/backend/backend_api/models.py @@ -151,8 +151,8 @@ def google_calendar_link(self): base_url = "https://www.google.com/calendar/render?action=TEMPLATE" workshop_title = escape(self.name) workshop_description = escape(self.desc) - start_datetime = (self.start_date + timedelta(hours=3, minutes=30)).strftime("%Y%m%dT%H%M%S") - end_datetime = (self.end_date + timedelta(hours=3, minutes=30)).strftime("%Y%m%dT%H%M%S") + start_datetime = self.start_date.strftime("%Y%m%dT%H%M%SZ") + end_datetime = self.end_date.strftime("%Y%m%dT%H%M%SZ") teachers_names = " ".join([teacher.name for teacher in self.teachers.all()]) event_details = f"Teachers: {teachers_names}\nDescription: {workshop_description}" From 7affe68715c62006374a15e79f0140e5dfa40367 Mon Sep 17 00:00:00 2001 From: AlirezaYousefpour <93353496+AlirezaYousefpourM@users.noreply.github.com> Date: Wed, 15 Jan 2025 02:21:05 +0330 Subject: [PATCH 3/5] Update models.py --- backend/backend_api/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/backend_api/models.py b/backend/backend_api/models.py index a471002..1f27680 100644 --- a/backend/backend_api/models.py +++ b/backend/backend_api/models.py @@ -223,8 +223,8 @@ def google_calendar_link(self): base_url = "https://www.google.com/calendar/render?action=TEMPLATE" presentation_title = escape(self.name) presentation_description = escape(self.desc) - start_datetime = self.start_date.strftime("%Y%m%dT%H%M%S") - end_datetime = self.end_date.strftime("%Y%m%dT%H%M%S") + start_datetime = self.start_date.strftime("%Y%m%dT%H%M%SZ") + end_datetime = self.end_date.strftime("%Y%m%dT%H%M%SZ") presenters_names = " ".join([presenter.name for presenter in self.presenters.all()]) event_details = f"Presenters: {presenters_names}\nDescription: {presentation_description}" From fa02aac0b76a91137d031550e12f17f3221f96dc Mon Sep 17 00:00:00 2001 From: alireza Date: Wed, 15 Jan 2025 02:55:38 +0330 Subject: [PATCH 4/5] something --- frontend/src/components/item-card/item-card.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/item-card/item-card.jsx b/frontend/src/components/item-card/item-card.jsx index 472bc9b..e66d7ee 100644 --- a/frontend/src/components/item-card/item-card.jsx +++ b/frontend/src/components/item-card/item-card.jsx @@ -26,7 +26,8 @@ export const Cost = ({ cost }) => ( sx={{ fontSize: 14, color: "text.secondary" }} lineHeight={1.5} > - {cost} T 0 T + {cost}T + 0T ( }} lineHeight={1.5} > - Paid by Bale Messeger + Paid by Bale Messenger From ff3f7fe4679af889732ec75d274cfb4c3caed780 Mon Sep 17 00:00:00 2001 From: alireza Date: Wed, 15 Jan 2025 03:00:50 +0330 Subject: [PATCH 5/5] something --- frontend/src/pages/my-account/MyAccount.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/my-account/MyAccount.jsx b/frontend/src/pages/my-account/MyAccount.jsx index e387232..35474dd 100644 --- a/frontend/src/pages/my-account/MyAccount.jsx +++ b/frontend/src/pages/my-account/MyAccount.jsx @@ -145,7 +145,10 @@ const MyAccount = () => { return ( - Total: {total !== 0 && {total} T} 0 T + + Total: {total !== 0 && {total}T}{' '} + 0T + ); };