fix: 3 issues at once

backend/src/mongodb/speaker.go

@@ -127,7 +127,9 @@ func (s *SpeakersType) CreateSpeaker(data CreateSpeakerData) (*models.Speaker, e
 	ctx := context.Background()
 
 	contact := bson.M{
-		"phones": []models.ContactPhone{},
+		"gender":   data.Contact.Gender,
+		"language": data.Contact.Language,
+		"phones":   []models.ContactPhone{},
 		"socials": bson.M{
 			"facebook": "",
 			"skype":    "",

frontend/public/templates/speakers/33-pt.html

@@ -236,20 +236,16 @@
                   "
                 >
                   <p>
-                    <strong
-                      >Car<b style="color: red">o/a/e</b> {{.Speaker}},</strong
-                    >
+                    <strong>Car{{.SpeakerArticle}} {{.Speaker}},</strong>
                   </p>
                   <p>
-                    Sou <b style="color: red">o/a/e</b> {{.Member}}, um
-                    orgulhoso membro da SINFO. Em nome da equipa organizadora da
-                    SINFO {{.Edition}}, convidamo-l<b style="color: red"
-                      >o/a/e</b
-                    >
-                    a participar como orador<b style="color: red">(a)</b> de uma
-                    palestra no nosso evento. Ficaríamos muito gratos pela
-                    oportunidade de recebê-l<b style="color: red">o/a/e</b> se
-                    aceitar este convite.
+                    Sou {{.MemberArticle}} {{.Member}}, um{{.MemberSuffix}}
+                    orgulhos{{.MemberArticle}} membro da SINFO. Em nome da
+                    equipa organizadora da SINFO {{.Edition}},
+                    convidamo-l{{.SpeakerArticle}} a participar como
+                    orador{{.SpeakerSuffix}} de uma palestra no nosso evento.
+                    Ficaríamos muito gratos pela oportunidade de
+                    recebê-l{{.SpeakerArticle}} se aceitar este convite.
                   </p>
 
                   <p>
@@ -409,9 +405,8 @@
                     {{if .Paragraph}} {{.Paragraph}} {{else}} A maioria dos
                     nossos visitantes são estudantes de Informática ansiosos por
                     começar as suas carreiras e seria com muito prazer que iam
-                    ouvi-l<b style="color: red">o/a</b> falar sobre o seu
-                    percurso profissional e aprender com a sua experiência!
-                    {{end}}
+                    ouvi-l{{.SpeakerArticle}} falar sobre o seu percurso
+                    profissional e aprender com a sua experiência! {{end}}
                   </p>
 
                   <br />

frontend/src/components/BulkEmailDialogTrigger.vue

@@ -450,7 +450,7 @@ import {
 import { humanReadableParticipationStatus } from "@/dto/index";
 import type { ParticipationStatus } from "@/dto/index";
 import type { CompanyWithParticipation } from "@/dto/companies";
-import type { SpeakerWithParticipation } from "@/dto/speakers";
+import type { SpeakerWithContactAndParticipation } from "@/dto/speakers";
 import {
   useBulkCompanyEmails,
   useBulkSpeakerEmails,
@@ -462,7 +462,7 @@ interface Props {
   size?: "sm" | "default" | "lg" | "icon";
   buttonClass?: string;
   companies?: CompanyWithParticipation[];
-  speakers?: SpeakerWithParticipation[];
+  speakers?: SpeakerWithContactAndParticipation[];
   entityType: "companies" | "speakers";
 }
 
@@ -499,7 +499,7 @@ const speakerBulk = useBulkSpeakerEmails();
 const processBulkEmails = async (
   templateCategory: EmailTemplateCategory,
   statuses: ParticipationStatus[],
-  entities: CompanyWithParticipation[] | SpeakerWithParticipation[],
+  entities: CompanyWithParticipation[] | SpeakerWithContactAndParticipation[],
 ) => {
   if (props.entityType === "companies") {
     return companyBulk.processBulkEmails(
@@ -511,7 +511,7 @@ const processBulkEmails = async (
   return speakerBulk.processBulkEmails(
     templateCategory,
     statuses,
-    entities as SpeakerWithParticipation[],
+    entities as SpeakerWithContactAndParticipation[],
   );
 };
 

frontend/src/components/Communications.vue

@@ -153,17 +153,6 @@
                   ></div>
                   <span>{{ getKindLabel(thread.kind) }}</span>
                 </div>
-
-                <div class="flex items-center gap-1">
-                  <div
-                    :class="[
-                      'w-2 h-2 rounded-full',
-                      getStatusColor(thread.status),
-                    ]"
-                  ></div>
-                  <span>{{ getStatusLabel(thread.status) }}</span>
-                </div>
-
                 <span>{{ formatDate(thread.posted) }}</span>
               </div>
 
@@ -350,7 +339,7 @@ import { ref, computed, watch, nextTick } from "vue";
 import { useQuery } from "@pinia/colada";
 import { getAllEvents } from "@/api/events";
 import { getAllMembers } from "@/api/members";
-import { ThreadKind, ThreadStatus } from "@/dto/threads";
+import { ThreadKind } from "@/dto/threads";
 import type {
   ParticipationCommunications,
   ThreadWithEntry,
@@ -704,32 +693,6 @@ const getKindColor = (kind: ThreadKind): string => {
   }
 };
 
-const getStatusLabel = (status: ThreadStatus): string => {
-  switch (status) {
-    case ThreadStatus.ThreadStatusApproved:
-      return "Approved";
-    case ThreadStatus.ThreadStatusReviewed:
-      return "Reviewed";
-    case ThreadStatus.ThreadStatusPending:
-      return "Pending";
-    default:
-      return "Unknown";
-  }
-};
-
-const getStatusColor = (status: ThreadStatus): string => {
-  switch (status) {
-    case ThreadStatus.ThreadStatusApproved:
-      return "bg-green-500";
-    case ThreadStatus.ThreadStatusReviewed:
-      return "bg-yellow-500";
-    case ThreadStatus.ThreadStatusPending:
-      return "bg-red-500";
-    default:
-      return "bg-gray-400";
-  }
-};
-
 const formatDate = (dateString: string): string => {
   const date = new Date(dateString);
   const now = new Date();

frontend/src/components/companies/ContactForm.vue

@@ -16,7 +16,7 @@
 
       <!-- Gender Field -->
       <div class="space-y-2">
-        <Label class="text-sm font-medium">Gender</Label>
+        <Label class="text-sm font-medium">Gender *</Label>
         <ToggleGroup
           v-model="formData.contact.gender"
           type="single"
@@ -38,7 +38,7 @@
 
       <!-- Language Field -->
       <div class="space-y-2">
-        <Label class="text-sm font-medium">Language</Label>
+        <Label class="text-sm font-medium">Language *</Label>
         <ToggleGroup
           v-model="formData.contact.language"
           type="single"
@@ -237,6 +237,18 @@
             {{ showMoreSocials ? "- Less" : "+ More" }} social platforms
           </Button>
         </div>
+
+        <!-- Validation Message (Visible in embedded mode) -->
+        <div
+          v-if="withoutAction && !isValid && validationMessage"
+          class="rounded-md bg-destructive/15 p-3 mt-4"
+        >
+          <p
+            class="text-sm font-medium text-destructive flex items-center gap-2"
+          >
+            {{ validationMessage }}
+          </p>
+        </div>
       </div>
     </div>
 
@@ -350,20 +362,29 @@ watch(
   { immediate: true },
 );
 
-watch(
-  () => formData,
-  (newData) => emit("updated", newData),
-  { deep: true, immediate: true },
-);
-
 const isValid = computed(() => {
   const hasName = props.withoutName || formData.name?.trim();
   const hasEmail = formData.contact.mails.some((mail) => mail.mail.trim());
-  return hasName && hasEmail;
+  const hasGender = !!formData.contact.gender;
+  const hasLanguage = !!formData.contact.language;
+
+  return hasName && hasEmail && hasGender && hasLanguage;
 });
 
+watch(
+  () => formData,
+  (newData) => {
+    if (isValid.value) {
+      emit("updated", newData);
+    }
+  },
+  { deep: true, immediate: true },
+);
+
 const validationMessage = computed(() => {
   if (!props.withoutName && !formData.name?.trim()) return "Name is required";
+  if (!formData.contact.gender) return "Gender is required";
+  if (!formData.contact.language) return "Language is required";
   if (!formData.contact.mails.some((mail) => mail.mail.trim()))
     return "At least one email is required";
   return "";

frontend/src/components/speakers/CreateSpeakerForm.vue

@@ -160,7 +160,10 @@
           Back
         </Button>
         <div class="flex gap-2">
-          <Button :disabled="isLoading" @click="createSpeakerAndFinish">
+          <Button
+            :disabled="isLoading || !isStep3Valid"
+            @click="createSpeakerAndFinish"
+          >
             <span>Create Speaker</span>
           </Button>
         </div>
@@ -266,6 +269,17 @@ const isStep1Valid = computed(() => {
   );
 });
 
+const isStep3Valid = computed(() => {
+  return (
+    contactData.value.gender != undefined &&
+    contactData.value.language != undefined &&
+    contactData.value.mails &&
+    contactData.value.mails.some(
+      (mail) => mail.mail && mail.mail.trim().length > 0,
+    )
+  );
+});
+
 // Step navigation
 const nextStep = () => {
   if (currentStep.value === 1 && validateStep1()) {
@@ -352,6 +366,8 @@ const createSpeakerAndFinish = async () => {
         (phone) => phone.phone && phone.phone.trim().length > 0,
       ),
       socials: contactData.value.socials || {},
+      gender: contactData.value.gender,
+      language: contactData.value.language,
     };
 
     const createData: CreateSpeakerData = {

frontend/src/components/speakers/SpeakerCommunications.vue

@@ -13,7 +13,7 @@
 
 <script setup lang="ts">
 import { getSpeakerCommunications } from "@/api/speakers";
-import type { SpeakerWithParticipation } from "@/dto/speakers";
+import type { SpeakerWithContactObject } from "@/dto/speakers";
 import { useEventStore } from "@/stores/event";
 import { usePostSpeakerThreadMutation } from "@/mutations/speakers";
 import Communications from "../Communications.vue";
@@ -22,7 +22,7 @@ import { computed } from "vue";
 import { useAuthStore } from "@/stores/auth";
 
 const props = defineProps<{
-  speaker: SpeakerWithParticipation;
+  speaker: SpeakerWithContactObject;
 }>();
 
 const eventStore = useEventStore();
@@ -41,9 +41,15 @@ const templates = computed(() =>
 
 const createSpeakerTemplateVariables = () => {
   const endDate = new Date(eventStore.selectedEvent?.end || 0);
+  const memberGender = authStore.member!.contactObject.gender;
+  const speakerGender = props.speaker.contactObject.gender;
 
   return [
+    createEmailVariable.memberArticle(memberGender),
+    createEmailVariable.memberSuffix(memberGender),
     createEmailVariable.member(authStore.member!),
+    createEmailVariable.speakerArticle(speakerGender),
+    createEmailVariable.speakerSuffix(speakerGender),
     createEmailVariable.speaker(props.speaker),
     createEmailVariable.edition(eventStore.selectedEvent?.id || 0),
     createEmailVariable.editionOrdinal(eventStore.selectedEvent?.id || 0),

frontend/src/composables/useBulkEmails.ts

@@ -4,7 +4,10 @@ import { useAuthStore } from "@/stores/auth";
 import { useEventStore } from "@/stores/event";
 import { getCompanyRepresentatives } from "@/api/companies";
 import type { CompanyWithParticipation } from "@/dto/companies";
-import type { Speaker, SpeakerWithParticipation } from "@/dto/speakers";
+import type {
+  Speaker,
+  SpeakerWithContactAndParticipation,
+} from "@/dto/speakers";
 import type { ParticipationStatus } from "@/dto/index";
 import {
   EmailTemplateCategory,
@@ -24,10 +27,10 @@ import { Gender, Language } from "@/dto/contacts";
 // Generic types for bulk emails
 export type BulkEmailEntity =
   | CompanyWithParticipation
-  | SpeakerWithParticipation;
+  | SpeakerWithContactAndParticipation;
 function isSpeaker(
   entity: BulkEmailEntity,
-): entity is SpeakerWithParticipation {
+): entity is SpeakerWithContactAndParticipation {
   return (entity as Speaker).companyName !== undefined;
 }
 
@@ -176,9 +179,9 @@ const companyEmailFetcher: EmailFetcher<CompanyWithParticipation> = {
 };
 
 // Speaker email fetcher
-const speakerEmailFetcher: EmailFetcher<SpeakerWithParticipation> = {
+const speakerEmailFetcher: EmailFetcher<SpeakerWithContactAndParticipation> = {
   getEmail: async (
-    speaker: SpeakerWithParticipation,
+    speaker: SpeakerWithContactAndParticipation,
   ): Promise<EmailWithDetails | null> => {
     try {
       const response = await getSpeakerById(speaker.id);
@@ -201,7 +204,8 @@ const speakerEmailFetcher: EmailFetcher<SpeakerWithParticipation> = {
       );
     }
   },
-  getEntityName: (speaker: SpeakerWithParticipation): string => speaker.name,
+  getEntityName: (speaker: SpeakerWithContactAndParticipation): string =>
+    speaker.name,
 };
 
 export const useBulkEmails = <T extends BulkEmailEntity>(

frontend/src/composables/useDirectEmail.ts

@@ -4,7 +4,10 @@ import { useAuthStore } from "@/stores/auth";
 import { useEventStore } from "@/stores/event";
 import { getCompanyRepresentatives } from "@/api/companies";
 import type { CompanyWithParticipation } from "@/dto/companies";
-import type { Speaker, SpeakerWithParticipation } from "@/dto/speakers";
+import type {
+  Speaker,
+  SpeakerWithContactAndParticipation,
+} from "@/dto/speakers";
 import {
   EmailTemplateCategory,
   getVariablesFromType,
@@ -22,11 +25,11 @@ import type { Contact } from "@/dto/contacts";
 
 export type DirectEmailEntity =
   | CompanyWithParticipation
-  | SpeakerWithParticipation;
+  | SpeakerWithContactAndParticipation;
 
 function isSpeaker(
   entity: DirectEmailEntity,
-): entity is SpeakerWithParticipation {
+): entity is SpeakerWithContactAndParticipation {
   return (entity as Speaker).companyName !== undefined;
 }
 

frontend/src/dto/speakers.ts

@@ -98,3 +98,6 @@ export interface UpdateSpeakerParticipationData {
   feedback?: string;
   room?: SpeakerParticipationRoom;
 }
+
+export type SpeakerWithContactAndParticipation = SpeakerWithContactObject &
+  SpeakerWithParticipation;