Skip to content

Hotfix - Voting results not showing on organizer winner tab #787

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wickathou merged 1 commit into from
Mar 19, 2024
Merged

Hotfix - Voting results not showing on organizer winner tab #787

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/components/projects/ProjectsGridItem/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const ProjectsGridItem = ({
showTags = false,
showReviewers = false,
showScore = false,
votingResults = null,
}) => {
const [openReviewModal, setOpenReviewModal] = useState(false)
const isReviewingOpen = EventHelpers.isReviewingOpen(event, moment)
Expand Down Expand Up @@ -191,7 +192,6 @@ const ProjectsGridItem = ({
</div>
{project?.punchline && (
<Typography variant="body1" component="p">
{showTableLocation && showScore}
{_.truncate(project.punchline, {
length: styling.punchlineMaxLength,
})}
Expand Down Expand Up @@ -225,6 +225,7 @@ const ProjectsGridItem = ({
)}
</div>
)}
{votingResults && <>{votingResults}</>}
</div>
</CardContent>
<CardActions className="tw-flex tw-flex-col tw-justify-center tw-items-center tw-px-4 tw-pb-4 tw-pt-0 tw-gap-4">
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ export default () => {
if (partnerVotes) {
setTokenVoterResults(partnerVotes)
}
setLoading(false)
}
setLoading(false)
}, [
event.overallReviewMethod,
event.slug,
Expand All @@ -87,7 +87,7 @@ export default () => {

return (
<>
<strong>{total}</strong> <br />
<strong>Total votes received: {total}</strong> <br />
Participant votes: {scoreFromUsers} <br />
Token votes: {scoreFromTokenVoters}
</>
Expand All @@ -102,7 +102,7 @@ export default () => {
<ProjectsGridItem
project={project}
event={event}
score={getScoreText(project._id)}
votingResults={getScoreText(project._id)}
onClickMore={() => setSelected(project)}
showScore={true}
/>
Expand Down