From 05a1f90dada564042bb37401212502c577b41fc1 Mon Sep 17 00:00:00 2001 From: Le-frances13 <100540487+Le-frances13@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:08:05 -0300 Subject: [PATCH 01/15] feat: time limiter on send motion --- .../bottom-bar-buttons/MotionsButton.tsx | 63 +++++++++++++++---- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx index 138a780..b5e22cd 100644 --- a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx +++ b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx @@ -91,7 +91,7 @@ export default function TestButton() { const [debateKindChange, setDebateKind] = useState("") const [unmoderatedMinutes, setUnmoderatedMinutes] = useState("") const [speechCount, setSpeechCount] = useState("") - const [minutesPerSpeech, setMinutesPerSpeech] = useState("") + const [secondsPerSpeech, setSecondsPerSpeech] = useState("") const [unlimitedDiscourses, setUnlimitedDiscourses] = useState(false) const [questionText, setQuestionText] = useState("") const [answerText, setAnswerText] = useState("") @@ -106,9 +106,9 @@ export default function TestButton() { const motionBody: DelegateMotionPayload = { type: selectedMotion, ...(unmoderatedMinutes !== "" && { total_duration_minutes: Number(unmoderatedMinutes) }), - ...(minutesPerSpeech !== "" && { per_speaker_seconds: Number(minutesPerSpeech) }), //TODO: Fix inconsitency in minutes / seconds + ...(secondsPerSpeech !== "" && { per_speaker_seconds: Number(secondsPerSpeech) }), //TODO: Fix inconsitency in minutes / seconds ...(debateKindChange !== "" && { debate_type: debateKindChange }), - ...(minutesPerSpeech !== "" && { per_speaker_seconds: Number(minutesPerSpeech) }), + ...(secondsPerSpeech !== "" && { per_speaker_seconds: Number(secondsPerSpeech) }), //TODO: add change topic } @@ -127,7 +127,7 @@ export default function TestButton() { setDebateKind("") setUnmoderatedMinutes("") setSpeechCount("") - setMinutesPerSpeech("") + setSecondsPerSpeech("") setUnlimitedDiscourses(false) } @@ -225,7 +225,7 @@ export default function TestButton() { setDebateKind("") setUnmoderatedMinutes("") setSpeechCount("") - setMinutesPerSpeech("") + setSecondsPerSpeech("") setQuestionText("") setAnswerText("") setUnlimitedDiscourses(false) @@ -274,7 +274,20 @@ export default function TestButton() { min={1} placeholder="Minutos do debate" value={unmoderatedMinutes} - onChange={(event) => setUnmoderatedMinutes(event.target.value)} + onChange={(event) => { + const value = event.target.value + if (value === "") { + setUnmoderatedMinutes("") + return + } + + const numericValue = Number(value) + if (Number.isNaN(numericValue)) { + return + } + + setUnmoderatedMinutes(String(Math.min(numericValue, 10000))) + }} /> )} @@ -286,21 +299,49 @@ export default function TestButton() { setSpeechCount(event.target.value)} + onChange={(event) => { + const value = event.target.value + if (value === "") { + setSpeechCount("") + return + } + + const numericValue = Number(value) + if (Number.isNaN(numericValue)) { + return + } + + setSpeechCount(String(Math.min(numericValue, 10000))) + }} /> Deixe em branco para permitir um debate moderado sem limite de discursos. - Quantos minutos por discurso? + Quantos segundos por discurso? setMinutesPerSpeech(event.target.value)} + max={10000} + placeholder="Segundos por discurso" + value={secondsPerSpeech} + onChange={(event) => { + const value = event.target.value + if (value === "") { + setSecondsPerSpeech("") + return + } + + const numericValue = Number(value) + if (Number.isNaN(numericValue)) { + return + } + + setSecondsPerSpeech(String(Math.min(numericValue, 10000))) + }} /> Deixe em branco para manter o tempo de discurso atual. From ab57bc37eb3534bfcc8d0b4512008600ba4dd95f Mon Sep 17 00:00:00 2001 From: Le-frances13 <100540487+Le-frances13@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:08:29 -0300 Subject: [PATCH 02/15] fix: moderated debate UI fixes --- .../session/Sidebar/moderated-debate.tsx | 100 +++++++++++++++--- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/session/Sidebar/moderated-debate.tsx b/frontend/src/components/session/Sidebar/moderated-debate.tsx index 808774d..ccd4cc3 100644 --- a/frontend/src/components/session/Sidebar/moderated-debate.tsx +++ b/frontend/src/components/session/Sidebar/moderated-debate.tsx @@ -9,13 +9,15 @@ import { } from "@/components/ui/item" import Flags from "@/components/ui/flags" import { useCommitteeStore } from "@/store/useCommitteeStore" +import { sendMessage } from "@/context/SessionContext" import { Tooltip, TooltipContent, TooltipTrigger, } from "@/components/ui/tooltip" import { useSession } from "@/context/SessionContext" -import { SessionRoles } from "@/schemas/types.gen" +import { useEffect, useState } from "react" +import { SessionRoles, ChairEvents, type EndSpeechEvent } from "@/schemas/types.gen" //TODO determine if queue is open, if not obscure the button and show a message that the queue is closed @@ -31,13 +33,44 @@ export default function ModeratedDebate() { const delegation = delegationsById[String(delegationId)] return delegation ? [delegation] : [] }) - const waitingCount = queuedDelegations.length + + + const timerIsRunning = useCommitteeStore((state) => state.timer_is_running); + const timerRemaining = useCommitteeStore((state) => state.timer_remaining_seconds); + + + const [cedingTime, setCedingTime] = useState(false) + + useEffect(() => { + + const setCT = (e: CustomEvent) => { + if (!e.detail || e.detail.type === null) { + setCedingTime(false) + return + } + if (!e.detail || e.detail.type === "cedetime") { + setCedingTime(true) + return + } + + } + + window.addEventListener("mapselection", setCT as EventListener) + + return () => { window.removeEventListener("mapselection", setCT as EventListener) } + + }, []) //TODO: Actually implement speaker history return (

Debate Moderado

+ {remainingDiscouses > 0 && ( +

+ {remainingDiscouses} discursos restantes +

+ )}

Historico de Oradores:

@@ -72,14 +105,14 @@ export default function ModeratedDebate() { ) })} - {!isChair && ( + {/*!isChair && ( - )} + )*/} {isChair && (
@@ -88,9 +121,8 @@ export default function ModeratedDebate() { @@ -100,9 +132,28 @@ export default function ModeratedDebate() { - @@ -113,7 +164,14 @@ export default function ModeratedDebate() {
- @@ -121,13 +179,23 @@ export default function ModeratedDebate() {

Finalizar a fala atual e ceder o tempo a mesa

-
- {remainingDiscouses > 0 && ( -

- {remainingDiscouses} discursos restantes -

- )} + {remainingDiscouses > 0 && ( +
+ + + + + +

Encerrar o debate moderado e voltar para lista de discursos

+
+
+ + )} +
From a019af1caa5df0e65ce14743e06bb5c8f7a1d3bf Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:32:57 -0300 Subject: [PATCH 03/15] feat: some features for moderated debate and fixes --- backend/app/session/engine.py | 30 +++++++------------ backend/app/session/models.py | 2 +- .../session/Sidebar/moderated-debate.tsx | 4 +-- frontend/src/schemas/types.gen.ts | 8 ++--- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 505f4f7..06a0e76 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -562,11 +562,6 @@ def apply_passed_motion( message="No Debate Type Provided", ) state.current_speaker = None - duration_seconds = ( - (motion.total_duration_minutes * 60) - if motion.total_duration_minutes is not None - else 600 - ) # defaults to 10 minutes as fallback match motion.debate_type: case DebateTypes.MODERATED_DEBATE: @@ -574,16 +569,9 @@ def apply_passed_motion( state.debate = DebateContext( debate_type=DebateTypes.MODERATED_DEBATE, return_state=return_state, - total_duration_seconds=duration_seconds, per_speaker_seconds=motion.per_speaker_seconds if motion.per_speaker_seconds is not None else state.gsl_default_time_seconds, - expires_at=datetime.now(UTC) + timedelta(seconds=duration_seconds), - ) - reset_timer( - state, - motion.per_speaker_seconds - if motion.per_speaker_seconds is not None - else state.gsl_default_time_seconds, + total_speeches= motion.speech_count, ) case DebateTypes.UNMODERATED_DEBATE: @@ -591,16 +579,15 @@ def apply_passed_motion( state.debate = DebateContext( debate_type=DebateTypes.UNMODERATED_DEBATE, return_state=return_state, - total_duration_seconds=duration_seconds, - per_speaker_seconds=None, - expires_at=datetime.now(UTC) + timedelta(seconds=duration_seconds), + total_duration_seconds=motion.total_duration_minutes, + expires_at=datetime.now(UTC) + timedelta(seconds=motion.total_duration_minutes), ) - reset_timer(state) # should not display per_speaker timer + reset_timer(state, motion.total_duration_minutes) # Use this as timer case DebateTypes.SPEAKERS_LIST: next_state = States.OPEN_GSL state.debate = None - reset_timer(state, state.gsl_default_time_seconds) + case Motions.POSTPONE_SESSION: pass case Motions.REOPEN_SESSION: @@ -995,6 +982,7 @@ def handle_cede_time( message="Cannot cede time if there's no time" ) + state.previous_speakers.append(state.current_speaker) state.current_speaker = representation_id return DispatchOutcome(state=state) @@ -1014,7 +1002,11 @@ def handle_end_speech( code=enums.EventErrorCode.INVALID_STATE, message="Cannot end speech while timer is running" ) - + + if state.current_state == States.MODERATED_CAUCUS and state.debate.speech_count: + state.debate.speech_count -= 1 + + state.previous_speakers.append(state.current_speaker) state.current_speaker = None reset_timer(state) diff --git a/backend/app/session/models.py b/backend/app/session/models.py index 0f845d6..07cbaae 100644 --- a/backend/app/session/models.py +++ b/backend/app/session/models.py @@ -47,6 +47,7 @@ class MotionContext(BaseModel): total_duration_minutes: int | None = None per_speaker_seconds: int | None = None target_topic: str | None = None + speech_count: int | None = None details: str | None = None @@ -85,7 +86,6 @@ class DebateContext(BaseModel): total_speeches: int | None = None per_speaker_seconds: int | None = None expires_at: datetime | None = None - topic: str | None = None class RollCallContext(BaseModel): diff --git a/frontend/src/components/session/Sidebar/moderated-debate.tsx b/frontend/src/components/session/Sidebar/moderated-debate.tsx index 808774d..192d306 100644 --- a/frontend/src/components/session/Sidebar/moderated-debate.tsx +++ b/frontend/src/components/session/Sidebar/moderated-debate.tsx @@ -22,7 +22,7 @@ import { SessionRoles } from "@/schemas/types.gen" export default function ModeratedDebate() { const { role } = useSession() - const remainingDiscouses = 1 + const remainingDiscouses = useCommitteeStore((state) => state.debate?.total_speeches ?? null) const isChair = role === SessionRoles.CHAIR const gslQueue = useCommitteeStore((state) => state.gsl_queue ?? []) const currentSpeaker = useCommitteeStore((state) => state.current_speaker) @@ -122,7 +122,7 @@ export default function ModeratedDebate() {
- {remainingDiscouses > 0 && ( + {remainingDiscouses && (

{remainingDiscouses} discursos restantes

diff --git a/frontend/src/schemas/types.gen.ts b/frontend/src/schemas/types.gen.ts index 146abf4..5196b97 100644 --- a/frontend/src/schemas/types.gen.ts +++ b/frontend/src/schemas/types.gen.ts @@ -1048,10 +1048,6 @@ export type DebateContext = { * Expires At */ expires_at?: string | null; - /** - * Topic - */ - topic?: string | null; }; /** @@ -1162,6 +1158,10 @@ export type MotionContext = { * Target Topic */ target_topic?: string | null; + /** + * Speech Count + */ + speech_count?: number | null; /** * Details */ From 437ebfadb924acb6528a932e9eaf1f15629064ad Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 21:42:02 -0300 Subject: [PATCH 04/15] Update Makefile --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db818a3..9ef39f7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: dev stop docs-serve docs-build +.PHONY: dev stop clean-dev docs-serve docs-build MKDOCS ?= mkdocs @@ -12,6 +12,10 @@ stop: docker compose down supabase stop || npx supabase stop +clean-dev: + docker compose down -v --rmi all --remove-orphans + supabase stop --no-backup + docs-serve: $(MKDOCS) serve --config-file mkdocs.yml From 2bf1f0f4cc15c28a076846a67ffd4b5b40e73f23 Mon Sep 17 00:00:00 2001 From: Le-frances13 <100540487+Le-frances13@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:04:29 -0300 Subject: [PATCH 05/15] feat: chose next speaker in moderated debate --- .../session/Sidebar/moderated-debate.tsx | 27 ++++++++++++++-- .../src/components/session/delegation-map.tsx | 31 ++++++++++++++----- frontend/src/schemas/types.gen.ts | 7 ++++- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/session/Sidebar/moderated-debate.tsx b/frontend/src/components/session/Sidebar/moderated-debate.tsx index eca6c50..93fe2a7 100644 --- a/frontend/src/components/session/Sidebar/moderated-debate.tsx +++ b/frontend/src/components/session/Sidebar/moderated-debate.tsx @@ -40,18 +40,24 @@ export default function ModeratedDebate() { const [cedingTime, setCedingTime] = useState(false) + const [chosingNextSpk, setChosingNextSpk] = useState(false) useEffect(() => { const setCT = (e: CustomEvent) => { if (!e.detail || e.detail.type === null) { setCedingTime(false) + setChosingNextSpk(false) return } if (!e.detail || e.detail.type === "cedetime") { setCedingTime(true) return } + if (!e.detail || e.detail.type === "choseNspeaker") { + setChosingNextSpk(true) + return + } } @@ -121,9 +127,26 @@ export default function ModeratedDebate() { diff --git a/frontend/src/components/session/delegation-map.tsx b/frontend/src/components/session/delegation-map.tsx index 633bc75..dc0bed7 100644 --- a/frontend/src/components/session/delegation-map.tsx +++ b/frontend/src/components/session/delegation-map.tsx @@ -87,27 +87,36 @@ export default function DelegationMap({ if (vote === VotingChoice.ABSTAIN) return "ring-gray-400/50" return "ring-neutral-300/30" default: - if (active) return "ring-yellow-300/50" + if (CedeActive) return "ring-yellow-300/50" + if (ChoseNSActive) return "ring-yellow-300/50" if (presence == RollCallChoice.PRESENT_AND_VOTING || presence === RollCallChoice.PRESENT) return "ring-sky-300/50" return "ring-neutral-400/30" } } - const [active, setActive] = useState(false) + const [CedeActive, setCedeActive] = useState(false) + const [ChoseNSActive, setChoseNSActive] = useState(false) useEffect(() => { const setAc = (e: CustomEvent) => { if (!e.detail || e.detail.type === null) { - setActive(false) + setCedeActive(false) + setChoseNSActive(false) return } if (e.detail.type === "cedetime") { - setActive(true) + setCedeActive(true) return } - setActive(false) + if (e.detail.type === "choseNspeaker") { + setChoseNSActive(true) + return + } + + setCedeActive(false) + setChoseNSActive(false) } window.addEventListener("mapselection", setAc as EventListener) @@ -195,15 +204,23 @@ export default function DelegationMap({ variant="outline" className={`h-[6vh] w-[6vh] overflow-hidden rounded-full p-0 text-[10px] ring-4 ${ringcolor} ring-offset-white shadow-[0_0_18px_rgba(56,189,248,0.18)]`} onClick={() => { - if (active) { + if (CedeActive) { sendMessage({ type: ChairEvents.CEDE_TIME_EVENT, payload: { representation_id: delegation.id } } satisfies CedeTimeEvent) - setActive(false); + setCedeActive(false); const mapSelectionEvent = new CustomEvent("mapselection", { detail: { type: null }, }) window.dispatchEvent(mapSelectionEvent) } + if (ChoseNSActive) { + sendMessage({ type: ChairEvents.GRANT_FLOOR_EVENT, payload: { representation_id: delegation.id } } satisfies GrantFloorEvent) + setChoseNSActive(false); + const mapSelectionEvent = new CustomEvent("mapselection", { + detail: { type: null }, + }) + window.dispatchEvent(mapSelectionEvent) + } }} > diff --git a/frontend/src/schemas/types.gen.ts b/frontend/src/schemas/types.gen.ts index 5b2ab2b..e4b07fb 100644 --- a/frontend/src/schemas/types.gen.ts +++ b/frontend/src/schemas/types.gen.ts @@ -1209,7 +1209,12 @@ export type RollCallContext = { */ export type SessionEffect = { type: SessionEffectType; - data?: VotingContext; + /** + * Data + */ + data?: { + [key: string]: unknown; + }; }; /** From dad0f4e573592c7c27c48c58e33b14ce752ab5ff Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:05:38 -0300 Subject: [PATCH 06/15] fix: speech count and erroneous error --- backend/app/session/engine.py | 4 ---- backend/app/session/schemas.py | 1 + .../session/bottom-bar-buttons/MotionsButton.tsx | 1 + frontend/src/schemas/types.gen.ts | 15 ++++++++++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 74ffd43..8feb18a 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -118,10 +118,6 @@ def validate_motion_payload( payload.debate_type == DebateTypes.UNMODERATED_DEBATE and payload.total_duration_minutes is None ) - or ( - payload.debate_type == DebateTypes.MODERATED_DEBATE - and payload.per_speaker_seconds is None - ) ): raise EventRejectedError( code=enums.EventErrorCode.INVALID_MESSAGE, diff --git a/backend/app/session/schemas.py b/backend/app/session/schemas.py index 90ff0b5..f8c50ae 100644 --- a/backend/app/session/schemas.py +++ b/backend/app/session/schemas.py @@ -22,6 +22,7 @@ class MotionPayload(BaseModel): debate_type: enums.DebateTypes | None = None total_duration_minutes: int | None = None per_speaker_seconds: int | None = None + speech_count: int | None = None target_topic: str | None = None details: str | None = None diff --git a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx index b5e22cd..f19495b 100644 --- a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx +++ b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx @@ -109,6 +109,7 @@ export default function TestButton() { ...(secondsPerSpeech !== "" && { per_speaker_seconds: Number(secondsPerSpeech) }), //TODO: Fix inconsitency in minutes / seconds ...(debateKindChange !== "" && { debate_type: debateKindChange }), ...(secondsPerSpeech !== "" && { per_speaker_seconds: Number(secondsPerSpeech) }), + ...(speechCount !== "" && { speech_count: Number(speechCount)}) //TODO: add change topic } diff --git a/frontend/src/schemas/types.gen.ts b/frontend/src/schemas/types.gen.ts index 5b2ab2b..ed0aead 100644 --- a/frontend/src/schemas/types.gen.ts +++ b/frontend/src/schemas/types.gen.ts @@ -231,6 +231,10 @@ export type ChairMotionPayload = { * Per Speaker Seconds */ per_speaker_seconds?: number | null; + /** + * Speech Count + */ + speech_count?: number | null; /** * Target Topic */ @@ -374,6 +378,10 @@ export type DelegateMotionPayload = { * Per Speaker Seconds */ per_speaker_seconds?: number | null; + /** + * Speech Count + */ + speech_count?: number | null; /** * Target Topic */ @@ -1209,7 +1217,12 @@ export type RollCallContext = { */ export type SessionEffect = { type: SessionEffectType; - data?: VotingContext; + /** + * Data + */ + data?: { + [key: string]: unknown; + }; }; /** From 8150864fe53d3e6a668860a11b3685da567f0502 Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:14:10 -0300 Subject: [PATCH 07/15] fix: fix typo --- backend/app/session/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 8feb18a..4654838 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -1014,7 +1014,7 @@ def handle_end_speech( message="Cannot end speech while timer is running" ) - if state.current_state == States.MODERATED_CAUCUS and state.debate.speech_count: + if state.current_state == States.MODERATED_CAUCUS and state.debate.total_speeches: state.debate.speech_count -= 1 state.previous_speakers.append(state.current_speaker) From 49ee80d62f0ca802857c1f9f345124760bb1255b Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:18:42 -0300 Subject: [PATCH 08/15] fix: forgotten file --- backend/app/session/models.py | 8 +++++--- frontend/src/schemas/types.gen.ts | 11 +++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/app/session/models.py b/backend/app/session/models.py index 96ca0bf..4626db8 100644 --- a/backend/app/session/models.py +++ b/backend/app/session/models.py @@ -146,13 +146,15 @@ class SessionLiveState(BaseModel): # present delegations with voting choice roll_call: RollCallContext # Not None, even if registry is empty + #Temporary Speaker History + previous_speakers: list[int] = [] #temporary list for now + # Additional config has_veto_power: bool = False -# Add more effect payload shapes as they are introduced. -EffectPayloads = dict[str, Any] - +#Add more for other effects (Possibly change the Voting context, when doing that change frontend too) +EffectPayloads = VotingContext class SessionEffect(BaseModel): type: enums.SessionEffectType diff --git a/frontend/src/schemas/types.gen.ts b/frontend/src/schemas/types.gen.ts index ed0aead..6c5c890 100644 --- a/frontend/src/schemas/types.gen.ts +++ b/frontend/src/schemas/types.gen.ts @@ -1217,12 +1217,7 @@ export type RollCallContext = { */ export type SessionEffect = { type: SessionEffectType; - /** - * Data - */ - data?: { - [key: string]: unknown; - }; + data?: VotingContext; }; /** @@ -1307,6 +1302,10 @@ export type SessionLiveState = { active_topic_index?: string | null; voting?: VotingContext | null; roll_call: RollCallContext; + /** + * Previous Speakers + */ + previous_speakers?: Array; /** * Has Veto Power */ From 17da83c17bdba1d4939079d18aa8ebbfc29feb32 Mon Sep 17 00:00:00 2001 From: Le-frances13 <100540487+Le-frances13@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:36:35 -0300 Subject: [PATCH 09/15] feat: moderated debate now works properly --- .../session/Sidebar/moderated-debate.tsx | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/frontend/src/components/session/Sidebar/moderated-debate.tsx b/frontend/src/components/session/Sidebar/moderated-debate.tsx index 93fe2a7..6886a63 100644 --- a/frontend/src/components/session/Sidebar/moderated-debate.tsx +++ b/frontend/src/components/session/Sidebar/moderated-debate.tsx @@ -6,6 +6,7 @@ import { ItemContent, ItemMedia, ItemTitle, + ItemDescription, } from "@/components/ui/item" import Flags from "@/components/ui/flags" import { useCommitteeStore } from "@/store/useCommitteeStore" @@ -26,18 +27,22 @@ export default function ModeratedDebate() { const { role } = useSession() const remainingDiscouses = useCommitteeStore((state) => state.debate?.total_speeches ?? null) const isChair = role === SessionRoles.CHAIR - const gslQueue = useCommitteeStore((state) => state.gsl_queue ?? []) + const previusSpeakers = useCommitteeStore((state) => state.previous_speakers ?? []) const currentSpeaker = useCommitteeStore((state) => state.current_speaker) const delegationsById = useCommitteeStore((state) => state.delegations) - const queuedDelegations = gslQueue.flatMap((delegationId) => { + const previousSpeakerCounts = previusSpeakers.reduce>((counts, delegationId) => { + const key = String(delegationId) + counts[key] = (counts[key] ?? 0) + 1 + return counts + }, {}) + + const queuedDelegations = [...previusSpeakers].reverse().flatMap((delegationId) => { const delegation = delegationsById[String(delegationId)] return delegation ? [delegation] : [] }) - const timerIsRunning = useCommitteeStore((state) => state.timer_is_running); - const timerRemaining = useCommitteeStore((state) => state.timer_remaining_seconds); - + const timerRemaining = useCommitteeStore((state) => state.timer_remaining_seconds) const [cedingTime, setCedingTime] = useState(false) const [chosingNextSpk, setChosingNextSpk] = useState(false) @@ -81,18 +86,19 @@ export default function ModeratedDebate() {
{queuedDelegations.map((delegate, index) => { - const isSpeaking = currentSpeaker === delegate.id + const position = index + 1 + const speakerCount = previousSpeakerCounts[String(delegate.id)] ?? 0 return ( -
+
-

+

{String(position).padStart(2, "0")}

@@ -102,6 +108,10 @@ export default function ModeratedDebate() { {delegate.name} + + {speakerCount} {speakerCount === 1 ? "vez" : "vezes"} + +
{index < queuedDelegations.length - 1 && ( @@ -127,6 +137,7 @@ export default function ModeratedDebate() { @@ -204,21 +215,21 @@ export default function ModeratedDebate() { {remainingDiscouses && (
- - - - - -

Encerrar o debate moderado e voltar para lista de discursos

-
-
-
+ + + + + +

Encerrar o debate moderado e voltar para lista de discursos

+
+
+
)} - +
From cbcb7a2c385a3f4699fae461a11e77fdb675e63b Mon Sep 17 00:00:00 2001 From: Le-frances13 <100540487+Le-frances13@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:40:02 -0300 Subject: [PATCH 10/15] fix: put in speaker list only works in open_gsl --- frontend/src/components/session/delegation-map.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/session/delegation-map.tsx b/frontend/src/components/session/delegation-map.tsx index dc0bed7..778a47b 100644 --- a/frontend/src/components/session/delegation-map.tsx +++ b/frontend/src/components/session/delegation-map.tsx @@ -240,9 +240,11 @@ export default function DelegationMap({ Ações sobre a Delegação - sendMessage({ type: ChairEvents.ADD_GSL_SPEAKER_EVENT, payload: { representation_id: delegation.id } } satisfies AddGslSpeakerEvent)}> - Colocar na Lista de Discursos - + {currentState === States.OPEN_GSL && ( + sendMessage({ type: ChairEvents.ADD_GSL_SPEAKER_EVENT, payload: { representation_id: delegation.id } } satisfies AddGslSpeakerEvent)}> + Colocar na Lista de Discursos + + )} sendMessage({ type: ChairEvents.GRANT_FLOOR_EVENT, payload: { representation_id: delegation.id } } satisfies GrantFloorEvent)}> Dar a palavra From b0452cdc833b4546fcba256415bdceb53a1aee23 Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:40:29 -0300 Subject: [PATCH 11/15] fix: speech_count --- backend/app/session/engine.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 4654838..2186b06 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -305,6 +305,7 @@ def handle_delegate_submit_motion( debate_type=payload.debate_type, total_duration_minutes=payload.total_duration_minutes, per_speaker_seconds=payload.per_speaker_seconds, + speech_count=payload.speech_count, target_topic=payload.target_topic, details=payload.details, ) From 04d770f8877fd395d6287c43e8b962faedb6c1cb Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:43:45 -0300 Subject: [PATCH 12/15] fix: new attempt --- backend/app/session/engine.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 2186b06..6e24116 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -780,6 +780,7 @@ def handle_chair_submit_motion( debate_type=payload.debate_type, total_duration_minutes=payload.total_duration_minutes, per_speaker_seconds=payload.per_speaker_seconds, + speech_count=payload.speech_count, target_topic=payload.target_topic, details=payload.details, ) From ba2097e0a0cf3c58f4c83cbba42127587a9f00e7 Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Mon, 31 Aug 2026 22:46:36 -0300 Subject: [PATCH 13/15] fix: minor fix --- backend/app/session/engine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 6e24116..9c37fff 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -1017,7 +1017,7 @@ def handle_end_speech( ) if state.current_state == States.MODERATED_CAUCUS and state.debate.total_speeches: - state.debate.speech_count -= 1 + state.debate.total_speeches -= 1 state.previous_speakers.append(state.current_speaker) state.current_speaker = None From 73672bc405e37e2cbea1d61284df851e736b6978 Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Tue, 1 Sep 2026 23:39:37 -0300 Subject: [PATCH 14/15] refactor: tests --- backend/app/tests/session/test_engine.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/backend/app/tests/session/test_engine.py b/backend/app/tests/session/test_engine.py index de14f83..0b13818 100644 --- a/backend/app/tests/session/test_engine.py +++ b/backend/app/tests/session/test_engine.py @@ -298,22 +298,6 @@ def test_generates_independent_sequential_motion_and_question_ids( assert eng.generate_next_question_id(session_state) == 1 assert eng.generate_next_question_id(session_state) == 2 - -def test_validate_motion_payload_rejects_moderated_debate_without_speaking_time( - session_state: md.SessionLiveState, -) -> None: - payload = sch.DelegateMotionPayload( - type=enums.Motions.CHANGE_DEBATE_TYPE, - debate_type=enums.DebateTypes.MODERATED_DEBATE, - total_duration_minutes=10, - ) - - with pytest.raises(eng.EventRejectedError) as exc_info: - eng.validate_motion_payload(payload, session_state) - - assert exc_info.value.code is enums.EventErrorCode.INVALID_MESSAGE - - def test_count_present_delegations_handles_empty_and_populated_registry( session_state: md.SessionLiveState, ) -> None: @@ -920,7 +904,6 @@ def test_chair_can_close_passed_procedural_vote( assert state.current_state == enums.States.CLOSED_GSL assert state.voting is None assert outcome.effect is not None - assert outcome.effect.data.get("passed") is True def test_chair_can_close_failed_procedural_vote( @@ -951,7 +934,6 @@ def test_chair_can_close_failed_procedural_vote( assert state.current_state == enums.States.OPEN_GSL assert state.voting is None assert outcome.effect is not None - assert outcome.effect.data.get("passed") is False def test_delegate_cannot_close_procedural_vote( From 3dc2d26496a30681b9ab02aee959bfde93c7d5b2 Mon Sep 17 00:00:00 2001 From: Extroias <91105220+Extroias@users.noreply.github.com> Date: Sat, 5 Sep 2026 22:59:58 -0300 Subject: [PATCH 15/15] feat: Clear motion list button now works --- backend/app/session/engine.py | 8 ++++++++ backend/app/session/enums.py | 1 + backend/app/session/schemas.py | 4 ++++ .../session/bottom-bar-buttons/MotionsButton.tsx | 5 +++-- frontend/src/schemas/types.gen.ts | 16 ++++++++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/backend/app/session/engine.py b/backend/app/session/engine.py index 9c37fff..0333927 100644 --- a/backend/app/session/engine.py +++ b/backend/app/session/engine.py @@ -803,6 +803,13 @@ def handle_chair_submit_motion( state.current_state = States.VOTING_EXECUTION return DispatchOutcome(state=state) +def handle_clear_motions( + state: SessionLiveState, event: schemas.ClearMotionsEvent, actor: SessionActor +) -> DispatchOutcome: + require_chair(actor) + state.submitted_motions = [] + + return DispatchOutcome(state=state) def handle_set_agenda( state: SessionLiveState, event: schemas.SetAgendaEvent, actor: SessionActor @@ -1108,6 +1115,7 @@ def handle_close_roll_call( ChairEvents.FINISH_CAUCUS: handle_finish_caucus, ChairEvents.RESOLVE_MOTION: handle_resolve_motion, ChairEvents.LOG_MOTION: handle_chair_submit_motion, + ChairEvents.CLEAR_MOTIONS: handle_clear_motions, ChairEvents.SET_AGENDA: handle_set_agenda, ChairEvents.SET_AGENDA_ITEM: handle_set_agenda_item, ChairEvents.MARK_AGENDA_ITEM: handle_mark_agenda_item, diff --git a/backend/app/session/enums.py b/backend/app/session/enums.py index 731266c..fae73fa 100644 --- a/backend/app/session/enums.py +++ b/backend/app/session/enums.py @@ -57,6 +57,7 @@ class ChairEvents(StrEnum): OPEN_INFORMAL_VOTING = "OpenInformalVotingEvent" RESOLVE_MOTION = "ResolveMotionEvent" LOG_MOTION = "LogMotionEvent" + CLEAR_MOTIONS = "ClearMotionEvent" CLOSE_PROCEDURAL_VOTING = "CloseProceduralVotingEvent" CLOSE_INFORMAL_VOTING = "CloseInformalVotingEvent" FINISH_CAUCUS = "FinishCaucusEvent" diff --git a/backend/app/session/schemas.py b/backend/app/session/schemas.py index f8c50ae..8f1994c 100644 --- a/backend/app/session/schemas.py +++ b/backend/app/session/schemas.py @@ -160,6 +160,9 @@ class LogMotionEvent(BaseModel): type: Literal[enums.ChairEvents.LOG_MOTION] payload: ChairMotionPayload +class ClearMotionsEvent(BaseModel): + type: Literal[enums.ChairEvents.CLEAR_MOTIONS] + payload: EmptyPayload class OpenSessionEvent(BaseModel): type: Literal[enums.ChairEvents.OPEN_SESSION] @@ -280,6 +283,7 @@ class DeleteAgendaItemEvent(BaseModel): | JoinQueueEvent | LeaveQueueEvent | LogMotionEvent + | ClearMotionsEvent | OpenSessionEvent | CloseSessionEvent | IncreaseTimerEvent diff --git a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx index f19495b..449da35 100644 --- a/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx +++ b/frontend/src/components/session/bottom-bar-buttons/MotionsButton.tsx @@ -40,7 +40,7 @@ import { import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group" import { Label } from "@/components/ui/label" import { useCommitteeStore } from "@/store/useCommitteeStore" -import { ChairEvents, MajorityTypes, MotionDecision, States, type LogMotionEvent } from "@/schemas/types.gen" +import { ChairEvents, MajorityTypes, MotionDecision, States, type ClearMotionsEvent, type LogMotionEvent } from "@/schemas/types.gen" import { useSession } from "@/context/SessionContext" import { SessionRoles } from "@/schemas/types.gen" import { @@ -179,7 +179,8 @@ export default function TestButton() { Cancelar - Confirmar + sendMessage({ type:ChairEvents.CLEAR_MOTION_EVENT,payload:{}} satisfies ClearMotionsEvent)}>Confirmar diff --git a/frontend/src/schemas/types.gen.ts b/frontend/src/schemas/types.gen.ts index 6c5c890..8a7e8ec 100644 --- a/frontend/src/schemas/types.gen.ts +++ b/frontend/src/schemas/types.gen.ts @@ -89,6 +89,7 @@ export const ChairEvents = { OPEN_INFORMAL_VOTING_EVENT: 'OpenInformalVotingEvent', RESOLVE_MOTION_EVENT: 'ResolveMotionEvent', LOG_MOTION_EVENT: 'LogMotionEvent', + CLEAR_MOTION_EVENT: 'ClearMotionEvent', CLOSE_PROCEDURAL_VOTING_EVENT: 'CloseProceduralVotingEvent', CLOSE_INFORMAL_VOTING_EVENT: 'CloseInformalVotingEvent', FINISH_CAUCUS_EVENT: 'FinishCaucusEvent', @@ -306,6 +307,17 @@ export type ChairToggleTimerPayload = { toggle?: boolean; }; +/** + * ClearMotionsEvent + */ +export type ClearMotionsEvent = { + /** + * Type + */ + type: 'ClearMotionEvent'; + payload: EmptyPayload; +}; + /** * CloseInformalVotingEvent */ @@ -875,6 +887,8 @@ export type SessionEvent = ({ } & LeaveQueueEvent) | ({ type: 'LogMotionEvent'; } & LogMotionEvent) | ({ + type: 'ClearMotionEvent'; +} & ClearMotionsEvent) | ({ type: 'OpenSessionEvent'; } & OpenSessionEvent) | ({ type: 'CloseSessionEvent'; @@ -964,6 +978,8 @@ export type EventMessage = { } & LeaveQueueEvent) | ({ type: 'LogMotionEvent'; } & LogMotionEvent) | ({ + type: 'ClearMotionEvent'; + } & ClearMotionsEvent) | ({ type: 'OpenSessionEvent'; } & OpenSessionEvent) | ({ type: 'CloseSessionEvent';