added timezone migration, updated intake form frontend and procesor

YashK2005 · YashK2005 · commit 93b44df24f25 · 2025-10-30T20:19:08.000-04:00
to store user's timezone
diff --git a/backend/app/models/UserData.py b/backend/app/models/UserData.py
@@ -59,6 +59,7 @@ class UserData(Base):
     ethnic_group = Column(JSON, nullable=True)  # Array of strings
     marital_status = Column(Text, nullable=True)
     has_kids = Column(Text, nullable=True)
+    timezone = Column(Text, nullable=True)
 
     # Cancer Experience
     diagnosis = Column(Text, nullable=True)
diff --git a/backend/app/services/implementations/intake_form_processor.py b/backend/app/services/implementations/intake_form_processor.py
@@ -9,6 +9,9 @@
 
 logger = logging.getLogger(__name__)
 
+# Valid Canadian timezone abbreviations
+VALID_TIMEZONES = {"NST", "AST", "EST", "CST", "MST", "PST"}
+
 
 class IntakeFormProcessor:
     """
@@ -177,6 +180,15 @@ def _process_demographics(self, user_data: UserData, demographics: Dict[str, Any
         user_data.ethnic_group = demographics.get("ethnic_group", [])
         user_data.marital_status = self._trim_text(demographics.get("marital_status"))
         user_data.has_kids = demographics.get("has_kids")
+        
+        # Validate and set timezone
+        timezone = self._trim_text(demographics.get("timezone"))
+        if timezone and timezone not in VALID_TIMEZONES:
+            raise ValueError(
+                f"Invalid timezone: {timezone}. Must be one of {sorted(VALID_TIMEZONES)}"
+            )
+        user_data.timezone = timezone
+        
         user_data.other_ethnic_group = self._trim_text(demographics.get("ethnic_group_custom"))
         user_data.gender_identity_custom = self._trim_text(demographics.get("gender_identity_custom"))
 
diff --git a/backend/migrations/versions/2ccee7a88d08_add_timezone_column_to_user_data.py b/backend/migrations/versions/2ccee7a88d08_add_timezone_column_to_user_data.py
@@ -0,0 +1,29 @@
+"""add_timezone_column_to_user_data
+
+Revision ID: 2ccee7a88d08
+Revises: 9f1a6d727929
+Create Date: 2025-10-30 19:02:10.801071
+
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = '2ccee7a88d08'
+down_revision: Union[str, None] = '9f1a6d727929'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user_data', sa.Column('timezone', sa.Text(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user_data', 'timezone')
+    # ### end Alembic commands ###
diff --git a/frontend/src/components/intake/demographic-cancer-form.tsx b/frontend/src/components/intake/demographic-cancer-form.tsx
@@ -7,6 +7,7 @@ import { CheckboxGroup } from '@/components/ui/checkbox-group';
 import { COLORS, VALIDATION } from '@/constants/form';
 import baseAPIClient from '@/APIClients/baseAPIClient';
 import { IntakeExperience, IntakeTreatment } from '@/types/intakeTypes';
+import { detectCanadianTimezone } from '@/utils/timezoneUtils';
 
 // Reusable Select component to replace inline styling
 type StyledSelectProps = React.SelectHTMLAttributes<HTMLSelectElement> & {
@@ -48,23 +49,25 @@ interface DemographicCancerFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
   diagnosis: string;
   dateOfDiagnosis: string;
   treatments: string[];
   experiences: string[];
 }
 
-const DEFAULT_VALUES: DemographicCancerFormData = {
+const getDefaultValues = (): DemographicCancerFormData => ({
   genderIdentity: '',
   pronouns: [],
   ethnicGroup: [],
   maritalStatus: '',
   hasKids: '',
+  timezone: detectCanadianTimezone(),
   diagnosis: '',
   dateOfDiagnosis: '',
   treatments: [],
   experiences: [],
-};
+});
 
 const DIAGNOSIS_OPTIONS = [
   'Acute Myeloid Leukaemia',
@@ -106,6 +109,8 @@ const PRONOUNS_OPTIONS = [
   'Self-describe',
 ];
 
+const TIMEZONE_OPTIONS = ['NST', 'AST', 'EST', 'CST', 'MST', 'PST'];
+
 const ETHNIC_OPTIONS = [
   'Indigenous',
   'Arab',
@@ -274,7 +279,7 @@ export function DemographicCancerForm({
   caringForSomeone,
 }: DemographicCancerFormProps) {
   const { control, handleSubmit, formState, watch } = useForm<DemographicCancerFormData>({
-    defaultValues: DEFAULT_VALUES,
+    defaultValues: getDefaultValues(),
   });
   const { errors, isSubmitting } = formState;
 
@@ -516,6 +521,29 @@ export function DemographicCancerForm({
             )}
           </HStack>
 
+          {/* Time Zone - Left aligned */}
+          <HStack gap={4} w="full" align="start">
+            <Box w="50%">
+              <FormField label="Time Zone" error={errors.timezone?.message}>
+                <Controller
+                  name="timezone"
+                  control={control}
+                  rules={{ required: 'Time zone is required' }}
+                  render={({ field }) => (
+                    <StyledSelect {...field} error={!!errors.timezone}>
+                      <option value="">Time Zone</option>
+                      {TIMEZONE_OPTIONS.map((tz) => (
+                        <option key={tz} value={tz}>
+                          {tz}
+                        </option>
+                      ))}
+                    </StyledSelect>
+                  )}
+                />
+              </FormField>
+            </Box>
+          </HStack>
+
           {/* Ethnic or Cultural Group - Left aligned */}
           <HStack gap={4} w="full" align="start">
             <Box w="50%">
@@ -803,15 +831,17 @@ interface BasicDemographicsFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
 }
 
-const BASIC_DEFAULT_VALUES: BasicDemographicsFormData = {
+const getBasicDefaultValues = (): BasicDemographicsFormData => ({
   genderIdentity: '',
   pronouns: [],
   ethnicGroup: [],
   maritalStatus: '',
   hasKids: '',
-};
+  timezone: detectCanadianTimezone(),
+});
 
 interface BasicDemographicsFormProps {
   formType?: 'participant' | 'volunteer';
@@ -825,7 +855,7 @@ export function BasicDemographicsForm({ formType, onNext }: BasicDemographicsFor
     formState: { errors, isSubmitting },
     watch,
   } = useForm<BasicDemographicsFormData>({
-    defaultValues: BASIC_DEFAULT_VALUES,
+    defaultValues: getBasicDefaultValues(),
   });
 
   // Local state for custom values
@@ -1020,6 +1050,29 @@ export function BasicDemographicsForm({ formType, onNext }: BasicDemographicsFor
             )}
           </HStack>
 
+          {/* Time Zone - Left aligned */}
+          <HStack gap={4} w="full" align="start">
+            <Box w="50%">
+              <FormField label="Time Zone" error={errors.timezone?.message}>
+                <Controller
+                  name="timezone"
+                  control={control}
+                  rules={{ required: 'Time zone is required' }}
+                  render={({ field }) => (
+                    <StyledSelect {...field} error={!!errors.timezone}>
+                      <option value="">Time Zone</option>
+                      {TIMEZONE_OPTIONS.map((tz) => (
+                        <option key={tz} value={tz}>
+                          {tz}
+                        </option>
+                      ))}
+                    </StyledSelect>
+                  )}
+                />
+              </FormField>
+            </Box>
+          </HStack>
+
           {/* Ethnic or Cultural Group */}
           <HStack gap={4} w="full" align="start">
             <Box w="50%">
diff --git a/frontend/src/constants/form.ts b/frontend/src/constants/form.ts
@@ -58,6 +58,7 @@ export interface IntakeFormData {
     ethnicGroup: string[];
     maritalStatus: string;
     hasKids: string;
+    timezone: string;
   };
 
   // User's Cancer Experience (if applicable)
@@ -111,6 +112,7 @@ export interface DemographicsData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
 }
 
 export interface CancerExperienceData {
@@ -149,5 +151,6 @@ export const INITIAL_INTAKE_FORM_DATA: IntakeFormData = {
     ethnicGroup: [],
     maritalStatus: '',
     hasKids: '',
+    timezone: '',
   },
 };
diff --git a/frontend/src/pages/participant/intake/index.tsx b/frontend/src/pages/participant/intake/index.tsx
@@ -27,6 +27,7 @@ interface DemographicCancerFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
   diagnosis: string;
   dateOfDiagnosis: string;
   treatments: string[];
@@ -49,6 +50,7 @@ interface BasicDemographicsFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
 }
 
 export default function ParticipantIntakePage() {
@@ -128,6 +130,7 @@ export default function ParticipantIntakePage() {
           ethnicGroup: data.ethnicGroup,
           maritalStatus: data.maritalStatus,
           hasKids: data.hasKids,
+          timezone: data.timezone,
         },
         ...(prev.hasBloodCancer === 'yes' && {
           cancerExperience: {
@@ -184,6 +187,7 @@ export default function ParticipantIntakePage() {
           ethnicGroup: data.ethnicGroup,
           maritalStatus: data.maritalStatus,
           hasKids: data.hasKids,
+          timezone: data.timezone,
         },
       };
       void advanceAfterUpdate(updated);
diff --git a/frontend/src/pages/volunteer/intake/index.tsx b/frontend/src/pages/volunteer/intake/index.tsx
@@ -27,6 +27,7 @@ interface DemographicCancerFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
   diagnosis: string;
   dateOfDiagnosis: string;
   treatments: string[];
@@ -49,6 +50,7 @@ interface BasicDemographicsFormData {
   ethnicGroup: string[];
   maritalStatus: string;
   hasKids: string;
+  timezone: string;
 }
 
 export default function VolunteerIntakePage() {
@@ -137,6 +139,7 @@ export default function VolunteerIntakePage() {
           ethnicGroup: data.ethnicGroup,
           maritalStatus: data.maritalStatus,
           hasKids: data.hasKids,
+          timezone: data.timezone,
         },
         ...(prev.hasBloodCancer === 'yes' && {
           cancerExperience: {
@@ -193,6 +196,7 @@ export default function VolunteerIntakePage() {
           ethnicGroup: data.ethnicGroup,
           maritalStatus: data.maritalStatus,
           hasKids: data.hasKids,
+          timezone: data.timezone,
         },
       };
       void advanceAfterUpdate(updated);
diff --git a/frontend/src/utils/timezoneUtils.ts b/frontend/src/utils/timezoneUtils.ts
@@ -0,0 +1,77 @@
+/**
+ * Detects the user's timezone and maps it to Canadian timezone abbreviations.
+ * Returns one of: NST, AST, EST, CST, MST, PST, or empty string if detection fails.
+ */
+export function detectCanadianTimezone(): string {
+  try {
+    // Use Intl API to get the IANA timezone identifier
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    
+    // Map IANA timezone identifiers to Canadian timezone abbreviations
+    const timezoneMap: Record<string, string> = {
+      // Newfoundland Standard Time
+      'America/St_Johns': 'NST',
+      
+      // Atlantic Standard Time
+      'America/Halifax': 'AST',
+      'America/Moncton': 'AST',
+      'America/Glace_Bay': 'AST',
+      'America/Goose_Bay': 'AST',
+      'America/Blanc-Sablon': 'AST',
+      
+      // Eastern Standard Time
+      'America/Toronto': 'EST',
+      'America/Montreal': 'EST',
+      'America/Ottawa': 'EST',
+      'America/Thunder_Bay': 'EST',
+      'America/Nipigon': 'EST',
+      'America/Rainy_River': 'EST',
+      'America/Atikokan': 'EST',
+      
+      // Central Standard Time
+      'America/Winnipeg': 'CST', // Manitoba uses Central Time
+      'America/Regina': 'CST',
+      'America/Swift_Current': 'CST',
+      
+      // Mountain Standard Time
+      'America/Edmonton': 'MST',
+      'America/Calgary': 'MST',
+      'America/Yellowknife': 'MST',
+      'America/Inuvik': 'MST',
+      'America/Cambridge_Bay': 'MST',
+      'America/Dawson_Creek': 'MST',
+      'America/Fort_Nelson': 'MST',
+      
+      // Pacific Standard Time
+      'America/Vancouver': 'PST',
+      'America/Whitehorse': 'PST',
+      'America/Dawson': 'PST',
+    };
+    
+    // Check if we have a direct mapping
+    if (timezoneMap[timeZone]) {
+      return timezoneMap[timeZone];
+    }
+    
+    // Fallback: Use timezone offset to estimate
+    // Get UTC offset in hours (accounting for DST)
+    const now = new Date();
+    const offsetMinutes = now.getTimezoneOffset();
+    const offsetHours = -offsetMinutes / 60; // Invert because getTimezoneOffset returns opposite sign
+    
+    // Map UTC offsets to Canadian timezones (accounting for DST)
+    // During DST, offsets are shifted by 1 hour, so we map to standard time equivalents
+    if (offsetHours === -3.5 || offsetHours === -2.5) return 'NST'; // Newfoundland (standard or daylight)
+    if (offsetHours === -4 || offsetHours === -3) return 'AST'; // Atlantic (standard or daylight)
+    if (offsetHours === -5 || offsetHours === -4) return 'EST'; // Eastern (standard or daylight)
+    if (offsetHours === -6 || offsetHours === -5) return 'CST'; // Central (standard or daylight)
+    if (offsetHours === -7 || offsetHours === -6) return 'MST'; // Mountain (standard or daylight)
+    if (offsetHours === -8 || offsetHours === -7) return 'PST'; // Pacific (standard or daylight)
+    
+    return '';
+  } catch (error) {
+    console.warn('Unable to detect timezone:', error);
+    return '';
+  }
+}
+
