🎙️ Thread chat

backend/api/models/MenteeProfile.py

@@ -33,6 +33,7 @@ class MenteeProfile(Document, Mixin):
     workstate = ListField(StringField(), required=False)
     preferred_language = StringField(required=False, default="en-US")
     roomName = StringField(required=False)
+    timezone = StringField(required=True)
 
     def __repr__(self):
         return f"""<MenteeProfile user_id:{self.firebase_uid} \n name: {self.name}

backend/api/models/MentorProfile.py

@@ -34,6 +34,7 @@ class MentorProfile(Document, Mixin):
     preferred_language = StringField(required=False, default="en-US")
     roomName = StringField(required=False)
     organization = StringField(required=False)
+    timezone = StringField(required=True)
 
     def __repr__(self):
         return f"""<MentorProfile firebase_id: {self.firebase_uid} 

backend/api/models/PartnerProfile.py

@@ -32,6 +32,7 @@ class PartnerProfile(Document, Mixin):
     hub_user = DictField(required=False)
     hub_user_name = StringField(required=False)
     roomName = StringField(required=False)
+    timezone = StringField(required=True)
 
     def __repr__(self):
         return f"""<Partner email: {self.email}

backend/api/utils/profile_parse.py

@@ -173,6 +173,7 @@ def edit_profile(data: dict = {}, profile: object = None):
             "preferred_language", profile.preferred_language
         )
         profile.roomName = data.get("roomName", profile.roomName)
+        profile.timezone = data.get("timezone", profile.timezone)
         return True
 
     if isinstance(profile, MentorProfile):
@@ -194,6 +195,7 @@ def edit_profile(data: dict = {}, profile: object = None):
         )
         profile.linkedin = data.get("linkedin", profile.linkedin)
         profile.website = data.get("website", profile.website)
+        profile.timezone = data.get("timezone", profile.timezone)
 
         if ex_organization != profile.organization:
             # for old data---------------------------------
@@ -267,6 +269,7 @@ def edit_profile(data: dict = {}, profile: object = None):
         profile.is_private = data.get("is_private", profile.is_private)
         profile.specializations = data.get("specializations", profile.specializations)
         profile.workstate = data.get("workstate", profile.workstate)
+        profile.timezone = data.get("timezone", profile.timezone)
         profile.immigrant_status = data.get(
             "immigrant_status", profile.immigrant_status
         )

backend/api/views/appointment.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone, timedelta
 from flask import Blueprint, request
 from api.models import AppointmentRequest, Availability, MentorProfile, MenteeProfile
 from api.core import create_response, logger
@@ -18,6 +18,7 @@
     TRANSLATIONS,
 )
 from api.utils.require_auth import admin_only, all_users, mentor_only
+import re
 
 appointment = Blueprint("appointment", __name__)
 
@@ -112,6 +113,24 @@ def send_invite_email():
         end_time = end_date_object.strftime("%I:%M%p %Z")
         avail_htmls.append(start_time + " ~ " + end_time)
 
+        if mentee.timezone:
+            print("timezone", mentee.timezone)
+            match = re.match(r"UTC([+-]\d{2}):(\d{2})", mentee.timezone)
+            print("match", match)
+            if match:
+                hours_offset = int(match.group(1))
+                minutes_offset = int(match.group(2))
+                # Create a timezone with the parsed offset
+                offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+                # Convert the datetime to the target timezone
+                avail_htmls.append(
+                    start_date_object.astimezone(offset).strftime("%m-%d-%Y %I:%M%p %Z")
+                    + " ~ "
+                    + start_date_object.astimezone(offset).strftime(
+                        "%m-%d-%Y %I:%M%p %Z"
+                    )
+                )
+
     if len(avail_htmls) > 0 and mentee.email_notifications:
         res, res_msg = (
             send_email(
@@ -176,6 +195,24 @@ def create_appointment():
 
     date_object = datetime.strptime(time_data.get("start_time"), "%Y-%m-%dT%H:%M:%S%z")
     start_time = date_object.strftime(APPT_TIME_FORMAT + " %Z")
+    if mentee.timezone:
+        print("timezone", mentee.timezone)
+        match = re.match(r"UTC([+-]\d{2}):(\d{2})", mentee.timezone)
+        print("match", match)
+        if match:
+            hours_offset = int(match.group(1))
+            minutes_offset = int(match.group(2))
+            # Create a timezone with the parsed offset
+            offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+            # Convert the datetime to the target timezone
+            converted_date = date_object.astimezone(offset)
+            start_time_local_timezone = converted_date.strftime(
+                APPT_TIME_FORMAT + " %Z"
+            )
+        else:
+            start_time_local_timezone = start_time
+    else:
+        start_time_local_timezone = start_time
 
     if mentee.email_notifications:
         res, res_msg = send_email(
@@ -184,7 +221,7 @@ def create_appointment():
             data={
                 "confirmation": True,
                 "name": mentor.name,
-                "date": start_time,
+                "date": start_time_local_timezone,
                 mentee.preferred_language: True,
                 "subject": TRANSLATIONS[mentee.preferred_language]["mentee_appt"],
             },
@@ -194,12 +231,31 @@ def create_appointment():
             logger.info(msg)
 
     if mentor.email_notifications:
+        if mentor.timezone:
+            print("timezone", mentor.timezone)
+            match = re.match(r"UTC([+-]\d{2}):(\d{2})", mentor.timezone)
+            print("match", match)
+            if match:
+                hours_offset = int(match.group(1))
+                minutes_offset = int(match.group(2))
+                # Create a timezone with the parsed offset
+                offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+                # Convert the datetime to the target timezone
+                converted_date = date_object.astimezone(offset)
+                start_time_local_timezone = converted_date.strftime(
+                    APPT_TIME_FORMAT + " %Z"
+                )
+            else:
+                start_time_local_timezone = start_time
+        else:
+            start_time_local_timezone = start_time
+
         res, res_msg = send_email(
             recipient=mentor.email,
             template_id=MENTOR_APPT_TEMPLATE,
             data={
                 "name": mentee.name,
-                "date": start_time,
+                "date": start_time_local_timezone,
                 mentor.preferred_language: True,
                 "subject": TRANSLATIONS[mentee.preferred_language]["mentor_appt"],
             },
@@ -247,11 +303,30 @@ def put_appointment(id):
 
     if mentee.email_notifications:
         start_time = appointment.timeslot.start_time.strftime(APPT_TIME_FORMAT + " GMT")
+        if mentee.timezone:
+            print("timezone", mentee.timezone)
+            match = re.match(r"UTC([+-]\d{2}):(\d{2})", mentee.timezone)
+            print("match", match)
+            if match:
+                hours_offset = int(match.group(1))
+                minutes_offset = int(match.group(2))
+                # Create a timezone with the parsed offset
+                offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+                # Convert the datetime to the target timezone
+                converted_date = appointment.timeslot.start_time.astimezone(offset)
+                start_time_local_timezone = converted_date.strftime(
+                    APPT_TIME_FORMAT + " %Z"
+                )
+            else:
+                start_time_local_timezone = start_time
+        else:
+            start_time_local_timezone = start_time
+
         res_email = send_email(
             recipient=mentee.email,
             data={
                 "name": mentor.name,
-                "date": start_time,
+                "date": start_time_local_timezone,
                 "approved": True,
                 mentee.preferred_language: True,
                 "subject": TRANSLATIONS[mentee.preferred_language]["mentee_appt"],
@@ -282,6 +357,26 @@ def delete_request(appointment_id):
 
     if mentee.email_notifications:
         start_time = request.timeslot.start_time.strftime(f"{APPT_TIME_FORMAT} GMT")
+
+        if mentee.timezone:
+            print("timezone", mentee.timezone)
+            match = re.match(r"UTC([+-]\d{2}):(\d{2})", mentee.timezone)
+            print("match", match)
+            if match:
+                hours_offset = int(match.group(1))
+                minutes_offset = int(match.group(2))
+                # Create a timezone with the parsed offset
+                offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+                # Convert the datetime to the target timezone
+                converted_date = request.timeslot.start_time.astimezone(offset)
+                start_time_local_timezone = converted_date.strftime(
+                    APPT_TIME_FORMAT + " %Z"
+                )
+            else:
+                start_time_local_timezone = start_time
+        else:
+            start_time_local_timezone = start_time
+
         res_email = send_email(
             recipient=mentee.email,
             data={

backend/api/views/events.py

@@ -11,11 +11,11 @@
     MenteeProfile,
     PartnerProfile,
 )
-from datetime import datetime
+from datetime import datetime, timezone, timedelta
+import re
 from api.utils.translate import (
     get_all_translations,
 )
-from datetime import datetime
 from api.utils.constants import (
     Account,
     EVENT_TEMPLATE,
@@ -77,8 +77,26 @@ def delete_train(id):
 
 
 ######################################################################
-def send_mail_for_event(recipients, role_name, title, eventdate, target_url):
+def send_mail_for_event(
+    recipients, role_name, title, eventdate, target_url, start_datetime, end_datetime
+):
     for recipient in recipients:
+        if recipient.timezone:
+            print("timezone", recipient.timezone)
+            match = re.match(r"UTC([+-]\d{2}):(\d{2})", recipient.timezone)
+            print("match", match)
+            if match:
+                hours_offset = int(match.group(1))
+                minutes_offset = int(match.group(2))
+                # Create a timezone with the parsed offset
+                offset = timezone(timedelta(hours=hours_offset, minutes=minutes_offset))
+                # Convert the datetime to the target timezone
+                eventdate.append(
+                    start_datetime.astimezone(offset).strftime("%m-%d-%Y %I:%M%p %Z")
+                    + " ~ "
+                    + end_datetime.astimezone(offset).strftime("%m-%d-%Y %I:%M%p %Z")
+                )
+
         res, res_msg = send_email(
             recipient=recipient.email,
             data={
@@ -151,18 +169,48 @@ def new_event():
             if start_datetime_str != "":
                 eventdate = start_datetime_str + " ~ " + end_datetime_str
             if Account.MENTOR in roles:
-                recipients = MentorProfile.objects.only("email", "preferred_language")
+                recipients = MentorProfile.objects.only(
+                    "email", "preferred_language", "timezone"
+                )
                 role_name = "MENTOR"
 
-                send_mail_for_event(recipients, role_name, title, eventdate, target_url)
+                send_mail_for_event(
+                    recipients,
+                    role_name,
+                    title,
+                    eventdate,
+                    target_url,
+                    start_datetime,
+                    end_datetime,
+                )
             if Account.MENTEE in roles:
-                recipients = MenteeProfile.objects.only("email", "preferred_language")
+                recipients = MenteeProfile.objects.only(
+                    "email", "preferred_language", "timezone"
+                )
                 role_name = "MENTEE"
-                send_mail_for_event(recipients, role_name, title, eventdate, target_url)
+                send_mail_for_event(
+                    recipients,
+                    role_name,
+                    title,
+                    eventdate,
+                    target_url,
+                    start_datetime,
+                    end_datetime,
+                )
             if Account.PARTNER in roles:
-                recipients = PartnerProfile.objects.only("email", "preferred_language")
+                recipients = PartnerProfile.objects.only(
+                    "email", "preferred_language", "timezone"
+                )
                 role_name = "Partner"
-                send_mail_for_event(recipients, role_name, title, eventdate, target_url)
+                send_mail_for_event(
+                    recipients,
+                    role_name,
+                    title,
+                    eventdate,
+                    target_url,
+                    start_datetime,
+                    end_datetime,
+                )
             if hub_id is not None:
                 role_name = "Hub"
                 partners = PartnerProfile.objects.filter(hub_id=hub_id).only(

frontend/public/locales/ar/translation.json

@@ -165,7 +165,10 @@
     "requiredCheckbox":"يرجى التحقق من هذا الحقل",
     "requiredPartner": "الرجاء اختيار شريك",
     "stopImpersonating":"التوقف عن انتحال الشخصية",
-    "impersonate":"انتحال شخصية"
+    "impersonate":"انتحال شخصية",
+    "timezone":"المنطقة الزمنية",
+    "requiredTimezone":"الرجاء إدخال المنطقة الزمنية",
+    "requiredAvatar":"الرجاء تحميل صورة الملف الشخصي"
   },
   "commonApplication": {
     "no-affiliation":"عدم الانتماء",

frontend/public/locales/en-US/translation.json

@@ -166,7 +166,10 @@
     "requiredCheckbox":"Please check this field",
     "requiredPartner": "Please select a Partner",
     "stopImpersonating":"Stop Impersonating",
-    "impersonate":"Impersonate"
+    "impersonate":"Impersonate",
+    "timezone":"Time Zone",
+    "requiredTimezone":"Please enter time zone",
+    "requiredAvatar":"Please upload profile image"
   },
   "commonApplication": {
     "no-affiliation":"no-affiliation",

frontend/public/locales/es-US/translation.json

@@ -165,7 +165,10 @@
     "requiredCheckbox":"Por favor revisa este campo",
     "requiredPartner": "Por favor seleccione un socio",
     "stopImpersonating":"Deja de hacerte pasar por",
-    "impersonate":"Personificar"
+    "impersonate":"Personificar",
+    "timezone":"Huso horario",
+    "requiredTimezone":"Por favor, introduzca la zona horaria",
+    "requiredAvatar":"Por favor sube una imagen de perfil"
   },
   "commonApplication": {
     "no-affiliation":"sin afiliación",

frontend/public/locales/fa-AF/translation.json

@@ -165,7 +165,10 @@
     "requiredCheckbox":"لطفا این فیلد را بررسی کنید",
     "requiredPartner": "لطفا یک شریک انتخاب کنید",
     "stopImpersonating":"جعل هویت را متوقف کنید",
-    "impersonate":"جعل هویت"
+    "impersonate":"جعل هویت",
+    "timezone":"منطقه زمانی",
+    "requiredTimezone":"لطفا منطقه زمانی را وارد کنید",
+    "requiredAvatar":"لطفا تصویر نمایه را آپلود کنید"
   },
   "commonApplication": {
     "no-affiliation":"عدم وابستگی",

frontend/public/locales/pa-AR/translation.json

@@ -166,7 +166,10 @@
     "requiredCheckbox":"مهرباني وکړئ دا ساحه وګورئ",
     "requiredPartner": "مهرباني وکړئ یو شریک وټاکئ",
     "stopImpersonating":"تقلید بند کړئ",
-    "impersonate":"تقلید"
+    "impersonate":"تقلید",
+    "timezone":"د وخت زون",
+    "requiredTimezone":"مهرباني وکړئ د وخت زون دننه کړئ",
+    "requiredAvatar":"مهرباني وکړئ د پروفایل عکس اپلوډ کړئ"
   },
   "commonApplication": {
     "no-affiliation":"بې تړاو",

frontend/public/locales/pt-BR/translation.json

@@ -165,7 +165,10 @@
     "requiredCheckbox":"Por favor verifique este campo",
     "requiredPartner": "Selecione um parceiro",
     "stopImpersonating":"Pare de se passar por",
-    "impersonate":"Personificar"
+    "impersonate":"Personificar",
+    "timezone":"Fuso horário",
+    "requiredTimezone":"Por favor, insira o fuso horário",
+    "requiredAvatar":"Por favor, carregue a imagem do perfil"
   },
   "commonApplication": {
     "no-affiliation":"sem afiliação",

frontend/src/components/NavigationHeader.js

@@ -19,6 +19,7 @@ import {
 } from "@ant-design/icons";
 import { fetchUser } from "features/userSlice";
 import { uploadAccountImage } from "utils/api";
+import Profile from "./pages/Profile";
 
 const { Header } = Layout;
 
@@ -155,6 +156,9 @@ function NavigationHeader() {
       style={{ background: colorBgContainer, display: "flex" }}
       theme="light"
     >
+      {!user.timezone && (
+        <div style={{ color: "red" }}>Please set time zone in profile page</div>
+      )}
       {isMobile && <MenuFoldOutlined onClick={() => dispatch(collapse())} />}
       <div style={{ flex: "1 1 0%" }} />
       {supportUserID && user && (