Skip to content
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

score calc totals #238

Merged
merged 3 commits into from
Mar 31, 2024
Merged

score calc totals #238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6daad7a
Totals
ThePotatoArchivist Mar 17, 2024
e5f48dc
Add fouls
ThePotatoArchivist Mar 17, 2024
abb779c
Merge branch 'main' into score-calc-totals
ThePotatoArchivist Mar 21, 2024
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
38 changes: 27 additions & 11 deletions client/src/apps/score_calculator/ScoreCalculator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, { Dispatch, SetStateAction, useState } from 'react';

import LinkButton from '../../components/LinkButton';
import { MaterialSymbol } from 'react-material-symbols';
import NumberInput from '../../components/NumberInput';

function Counter({
value,
Expand Down Expand Up @@ -42,6 +43,14 @@ function ScoreCalculator() {
const [trap, setTrap] = useState(0);
const [harmony, setHarmony] = useState(0);

const [foulPoints, setFoulPoints] = useState<number | undefined>(0);

const autoPoints = autoLeave * 2;
const speakerPoints = autoSpeaker * 5 + teleSpeaker * 2 + ampedTeleSpeaker * 5;
const ampPoints = autoAmp * 2 + teleAmp * 1;
const stagePoints = park * 1 + climb * 3 + climbSpot * 4 + trap * 5 + harmony * 2;
const totalPoints = autoPoints + speakerPoints + ampPoints + stagePoints + (foulPoints ?? 0);

const handleReset = () => {
setAutoLeave(0);
setAutoSpeaker(0);
Expand All @@ -54,6 +63,7 @@ function ScoreCalculator() {
setClimbSpot(0);
setTrap(0);
setHarmony(0);
setFoulPoints(0);
};

return (
Expand Down Expand Up @@ -81,7 +91,7 @@ function ScoreCalculator() {
<div className='flex flex-grow flex-col'>
<button
onClick={handleReset}
className='text-md col-span-2 mx-2 rounded-md bg-blue-400/70 px-3 py-2 text-black'>
className='text-md col-span-2 mx-2 rounded-md bg-blue-400/70 px-3 py-2 text-black active:brightness-75'>
Reset All
</button>
<div className='flex flex-grow snap-x snap-mandatory flex-row overflow-x-auto *:flex-shrink-0 gap-2 p-2'>
Expand Down Expand Up @@ -137,35 +147,41 @@ function ScoreCalculator() {
<p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center'>
Leave:{' '}
<span className='rounded-lg bg-black/15 p-2 py-1'>
{autoLeave * 2}
{autoPoints}
</span>
</p>

<p
className={` text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center`}>
Speaker:{' '}
<span className='rounded-lg bg-black/15 p-2 py-1'>
{autoSpeaker * 5 +
teleSpeaker * 2 +
ampedTeleSpeaker * 5}
{speakerPoints}
</span>
</p>

<p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center'>
Amp:{' '}
<span className='rounded-lg bg-black/15 p-2 py-1'>
{autoAmp * 2 + teleAmp * 1}
{ampPoints}
</span>
</p>

<p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center'>
Stage:{' '}
<span className='rounded-lg bg-black/15 p-2 py-1'>
{park * 1 +
climb * 3 +
climbSpot * 4 +
trap * 5 +
harmony * 2}
{stagePoints}
</span>
</p>

<p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center'>
Foul Points:{' '}
<NumberInput className='rounded-lg bg-black/15 p-2 py-1 w-16 text-center' value={foulPoints} onChange={setFoulPoints} />
</p>

<p className='text-black-100 text-md rounded-md border-green-800 bg-green-400/70 px-3 py-2 text-center font-black'>
Total:{' '}
<span className='rounded-lg bg-black/15 p-2 py-1'>
{totalPoints}
</span>
</p>
</div>
Expand Down