Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand DownExpand Up@@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All@@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All@@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All@@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand DownExpand Up@@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand DownExpand Up@@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
Comment thread
coodos marked this conversation as resolved.
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All@@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All@@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
Comment thread
coodos marked this conversation as resolved.

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand DownExpand Up@@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down