Skip to content

fix: evoting reported issues #462

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: evoting reported issues #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe018bb
fix: evoting reported issues
coodos Nov 24, 2025
94c685b
chore: fix build
coodos Nov 24, 2025
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 @@ -421,12 +421,12 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
<span className="font-medium text-gray-900">
{result.optionText || `Option ${index + 1}`}
</span>
{result.isTied && (
{result.isTied && blindVoteResults.totalVotes > 0 && (
<Badge variant="success" className="bg-blue-500 text-white">
🏆 Tied
</Badge>
)}
{isWinner && !result.isTied && (
{isWinner && !result.isTied && blindVoteResults.totalVotes > 0 && (
<Badge variant="success" className="bg-green-500 text-white">
🏆 Winner
</Badge>
Expand Down Expand Up @@ -480,6 +480,9 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
</div>
<div className="text-xs text-blue-600">
{resultsData.totalVotes || 0} of {resultsData.totalEligibleVoters} eligible voters
{(resultsData.mode === "ereputation" || selectedPoll?.votingWeight === "ereputation") && resultsData.pointsVoted !== undefined && resultsData.totalEligiblePoints !== undefined && (
<> ({resultsData.pointsVoted} points of {resultsData.totalEligiblePoints} total eligible points)</>
)}
</div>
</div>
</div>
Expand Down Expand Up @@ -521,7 +524,8 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
} else {
// Normal voting (including eReputation weighted normal voting): show votes and percentage
const voteCount = result.votes || 0;
displayValue = `${voteCount} votes`;
// For eReputation mode, show "Points" instead of "votes"
displayValue = resultsData.mode === "ereputation" ? `${voteCount} Points` : `${voteCount} votes`;
// Calculate total from results array for percentage (handles both weighted and non-weighted)
const totalVotesForPercentage = resultsData.results.reduce((sum, r) => sum + (r.votes || 0), 0);
isWinner = voteCount === Math.max(...resultsData.results.map(r => r.votes || 0));
Expand All @@ -541,12 +545,12 @@ export default function Vote({ params }: { params: Promise<{ id: string }> }) {
<span className="font-medium text-gray-900">
{result.option}
</span>
{result.isTied && (
{result.isTied && resultsData.totalVotes > 0 && (
<Badge variant="success" className="bg-blue-500 text-white">
🏆 Tied
</Badge>
)}
{isWinner && !result.isTied && (
{isWinner && !result.isTied && resultsData.totalVotes > 0 && (
<Badge variant="success" className="bg-green-500 text-white">
🏆 Winner
</Badge>
Expand Down
24 changes: 21 additions & 3 deletions platforms/eVoting/src/app/(app)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,18 @@ export default function Home() {
const [currentPage, setCurrentPage] = useState(1);
const [searchTerm, setSearchTerm] = useState("");
const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
const [sortField, setSortField] = useState<string>("deadline");
const [sortDirection, setSortDirection] = useState<"asc" | "desc">("asc");
const [sortField, setSortField] = useState<string>(() => {
if (typeof window !== "undefined") {
return localStorage.getItem("evoting_sortField") || "deadline";
}
return "deadline";
});
const [sortDirection, setSortDirection] = useState<"asc" | "desc">(() => {
if (typeof window !== "undefined") {
return (localStorage.getItem("evoting_sortDirection") as "asc" | "desc") || "asc";
}
return "asc";
});
const itemsPerPage = 15;

useEffect(() => {
Expand Down Expand Up @@ -75,10 +85,18 @@ export default function Home() {

const handleSort = (field: string) => {
if (sortField === field) {
setSortDirection(sortDirection === "asc" ? "desc" : "asc");
const newDirection = sortDirection === "asc" ? "desc" : "asc";
setSortDirection(newDirection);
if (typeof window !== "undefined") {
localStorage.setItem("evoting_sortDirection", newDirection);
}
} else {
setSortField(field);
setSortDirection("asc");
if (typeof window !== "undefined") {
localStorage.setItem("evoting_sortField", field);
localStorage.setItem("evoting_sortDirection", "asc");
}
}
};

Expand Down
2 changes: 2 additions & 0 deletions platforms/eVoting/src/lib/pollApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ export interface PollResults {
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
pointsVoted?: number;
totalEligiblePoints?: number;
}

export interface BlindVoteOptionResult {
Expand Down
8 changes: 1 addition & 7 deletions platforms/evoting-api/src/services/PollService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,7 @@ export class PollService {
const aIsActive = !a.deadline || new Date(a.deadline) > now;
const bIsActive = !b.deadline || new Date(b.deadline) > now;

// ALWAYS show active polls first, UNLESS sorting by status
if (sortField !== "status") {
if (aIsActive && !bIsActive) return -1;
if (!aIsActive && bIsActive) return 1;
}

// If both are active or both are ended, apply the user's chosen sorting
// Apply the user's chosen sorting
let comparison = 0;

switch (sortField) {
Expand Down
35 changes: 32 additions & 3 deletions platforms/evoting-api/src/services/VoteService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,25 @@ export class VoteService {
? Object.values(finalResults).reduce((sum, r) => sum + r.votes, 0)
: Object.values(optionCounts).reduce((sum, count) => sum + count, 0);

// Calculate totalEligiblePoints and pointsVoted for eReputation
let totalEligiblePoints: number | undefined;
let pointsVoted: number | undefined;
if (isWeighted && reputationResults) {
// eReputation weighted normal voting: sum of all scores
totalEligiblePoints = reputationResults.results.reduce((sum, r) => sum + r.score, 0);
pointsVoted = totalWeightedVotes; // Sum of weighted votes
}

return {
pollId,
totalVotes: votes.length, // Actual number of votes cast
totalWeightedVotes: totalWeightedVotes, // Sum of all weighted votes (if weighted)
totalEligibleVoters,
turnout: totalEligibleVoters > 0 ? (votes.length / totalEligibleVoters) * 100 : 0,
mode: isWeighted ? "ereputation" : "normal",
results: finalResults
results: finalResults,
...(totalEligiblePoints !== undefined && { totalEligiblePoints }),
...(pointsVoted !== undefined && { pointsVoted })
};
} else if (poll.mode === "point") {
// STEP 1: Calculate point-based results normally (without eReputation weighting)
Expand Down Expand Up @@ -341,14 +352,25 @@ export class VoteService {
// Sort by total points (highest first)
finalResults.sort((a, b) => b.totalPoints - a.totalPoints);

// Calculate totalEligiblePoints and pointsVoted for eReputation weighted points-based voting
let totalEligiblePoints: number | undefined;
let pointsVoted: number | undefined;
if (reputationResults) {
// eReputation weighted points-based voting: sum of all scores * 100 (each user has 100 points)
totalEligiblePoints = reputationResults.results.reduce((sum, r) => sum + r.score, 0) * 100;
pointsVoted = totalWeightedPoints; // Sum of weighted points
}

return {
pollId,
totalVotes,
totalWeightedPoints,
totalEligibleVoters,
turnout: totalEligibleVoters > 0 ? (totalVotes / totalEligibleVoters) * 100 : 0,
mode: "ereputation",
results: finalResults
results: finalResults,
...(totalEligiblePoints !== undefined && { totalEligiblePoints }),
...(pointsVoted !== undefined && { pointsVoted })
};
} else {
// No weighting - use normal points
Expand All @@ -369,14 +391,21 @@ export class VoteService {
// Sort by total points (highest first)
finalResults.sort((a, b) => b.totalPoints - a.totalPoints);

// Calculate totalEligiblePoints for simple points-based voting (not eReputation)
// Each user has 100 points by default
const totalEligiblePoints = totalEligibleVoters * 100;
const pointsVoted = totalPoints; // Sum of all points distributed

return {
pollId,
totalVotes,
totalWeightedPoints: totalPoints,
totalEligibleVoters,
turnout: totalEligibleVoters > 0 ? (totalVotes / totalEligibleVoters) * 100 : 0,
mode: "point",
results: finalResults
results: finalResults,
totalEligiblePoints,
pointsVoted
};
}
} else if (poll.mode === "rank") {
Expand Down