Skip to content

fix: (eVoting) handle leading zero in point voting #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Bekiboo wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: (eVoting) handle leading zero in point voting #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { pollApi, type Poll, type PollResults, type BlindVoteResults, type VoteD
import Link from "next/link";

import BlindVotingInterface from "@/components/blind-voting-interface";
import VotingInterface from "@/components/voting-interface";
import { SigningInterface } from "@/components/signing-interface";

export default function Vote({ params }: { params: Promise<{ id: string }> }) {
Expand Down Expand Up @@ -594,7 +593,7 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
(() => {
const voteData = voteStatus?.vote?.data;
if (!voteData) return "Unknown option";

if (voteData.mode === "normal" && Array.isArray(voteData.data)) {
const optionIndex = parseInt(voteData.data[0] || "0");
return selectedPoll.options[optionIndex] || "Unknown option";
Expand Down Expand Up @@ -633,7 +632,7 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
const isUserChoice = (() => {
const voteData = voteStatus?.vote?.data;
if (!voteData) return false;

if (voteData.mode === "normal" && Array.isArray(voteData.data)) {
return voteData.data.includes(index.toString());
} else if (voteData.mode === "point" && typeof voteData.data === "object" && !Array.isArray(voteData.data)) {
Expand All @@ -650,7 +649,7 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
const userChoiceDetails = (() => {
const voteData = voteStatus?.vote?.data;
if (!voteData) return null;

if (voteData.mode === "normal" && Array.isArray(voteData.data)) {
return voteData.data.includes(index.toString()) ? "← You voted for this option" : null;
} else if (voteData.mode === "point" && typeof voteData.data === "object" && !Array.isArray(voteData.data)) {
Expand Down Expand Up @@ -1115,12 +1114,17 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
max="100"
value={pointVotes[index] || 0}
onChange={(e) => {
const value = parseInt(e.target.value) || 0;
const value = parseInt(e.target.value, 10) || 0;
setPointVotes(prev => ({
...prev,
[index]: value
}));
}}
onInput={(e) => {
const target = e.target as HTMLInputElement;
const value = parseInt(target.value, 10) || 0;
target.value = value.toString();
}}
className="w-20 px-3 py-2 border border-gray-300 rounded-md text-center"
disabled={!isVotingAllowed}
/>
Expand Down