Merge pull request #4 from steelhawks/dev

Redo Form // Fix Min/Max Check for Counter

Author: FarhanJ2

components/inputs/CounterBox.jsx

@@ -54,18 +54,20 @@ const CounterBox = props => {
             return;
 
         const newValue = parseInt(inputValue);
-        if (!isNaN(newValue)) {
-            if (newValue > (props.min || MIN_LOCAL) && newValue < (props.max || MAX_LOCAL)) {
-                setValue(newValue);
+
+        if (isNaN(newValue)) {
+            Alert.alert('Please enter a number');
+            return;
+        }
+
+        if (newValue >= (props.min || MIN_LOCAL) && newValue <= (props.max || MAX_LOCAL)) {
+            setValue(newValue);
+        } else {
+            if (newValue <= (props.min || MIN_LOCAL)) {
+                Alert.alert('Value cannot be below the minimum');
             } else {
-                if (newValue < (props.min || MIN_LOCAL)) {
-                    Alert.alert('Value cannot be below the minimum');
-                } else {
-                    Alert.alert('Value cannot exceed the maximum');
-                }
+                Alert.alert('Value cannot exceed the maximum');
             }
-        } else {
-            Alert.alert('Please enter a number');
         }
     };
 

contexts/dict.jsx

@@ -9,8 +9,8 @@ export const useDictStore = create(set => ({
         matchType: '', // qualification, practice, or elimination
         driveStation: null,
         alliance: '', // red or blue
-        // preloaded: null, // true or false
-        // robotLeft: null, // true or false
+        preloaded: null, // true or false
+        robotLeft: null, // true or false
         // autonSpeakerNotesScored: 0,
         // autonAmpNotesScored: 0,
         // autonMissed: 0,
@@ -24,14 +24,14 @@ export const useDictStore = create(set => ({
         // telopNotesReceivedFromHumanPlayer: 0,
         // telopNotesReceivedFromGround: 0,
         // ferryNotes: 0,
-        // endGame: null, // PARKED, ONSTAGE, SPOTLIGHT, Default: EMPTY
         // trap: 0,
         // fouls: 0,
         // techFouls: 0,
         // yellowCards: 0,
         // redCards: 0,
         // telopIssues: [], // NOT_MOVING, LOST_CONNECTION, FMS_ISSUES, DISABLED, Default: EMPTY
-        // didTeamPlayDefense: null, // YES, NO, Default: null
+        didTeamPlayDefense: null, // YES, NO,
+        endGame: null, // SHALLOW, DEEP, PARK, NONE
         timeOfCreation: '',
     },
     setDict: (key, value) =>

screens/Scouting/Auton2.jsx

@@ -65,11 +65,11 @@ const Auton2 = ({backConfirm}) => {
             }
         />,
         <Query
-            title="Algae Shot"
+            title="Net Algae Scored"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('autonAlgaeShot', value)
+                        setDict('autonNetAlgaeScored', value)
                     }
                 />
             }

screens/Scouting/Teleop.jsx

@@ -11,51 +11,41 @@ const Teleop = () => {
 
     const reef_scoring_queries = [
         <Query
-            title="L4 Reef Scored"
+            title="Coral Scored L4"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopL4ReefScored', value)
+                        setDict('teleopCoralL4', value)
                     }
                 />
             }
         />,
         <Query
-            title="L3 Reef Scored"
+            title="Coral Scored L3"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopL3ReefScored', value)
+                        setDict('teleopCoralL3', value)
                     }
                 />
             }
         />,
         <Query
-            title="L3 Reef Scored"
+            title="Coral Scored L2"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopL3ReefScored', value)
+                        setDict('teleopCoralL2', value)
                     }
                 />
             }
         />,
         <Query
-            title="L2 Reef Scored"
+            title="Coral Scored L1"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopL2ReefScored', value)
-                    }
-                />
-            }
-        />,
-        <Query
-            title="L1 Reef Scored"
-            item={
-                <CounterBox
-                    onChange={value =>
-                        setDict('teleopL1ReefScored', value)
+                        setDict('teleopCoralL1', value)
                     }
                 />
             }
@@ -68,16 +58,16 @@ const Teleop = () => {
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopNetShotsScored', value)
+                        setDict('teleopNetAlgaeScored', value)
                     }
                 />
             }
         />,
         <Query
-            title="Processor Algae Scored"
+            title="Algae Processed"
             item={
                 <CounterBox
-                    onChange={value => setDict('teleopProcessorAlgaeScored', value)}
+                    onChange={value => setDict('teleopAlgaeProcessed', value)}
                 />
             }
         />,

screens/Scouting/TeleopReceived.jsx

@@ -27,12 +27,12 @@ const TeleopReceived = () => {
                 />
             }
         />,
-        <Query
-            title="Algae from Reef"
+        <Query 
+            title="Coral from Ground"
             item={
                 <CounterBox
                     onChange={value =>
-                        setDict('teleopAlgaeFromReef', value)
+                        setDict('teleopCoralFromGround', value)
                     }
                 />
             }
@@ -41,6 +41,16 @@ const TeleopReceived = () => {
             title="Algae from Ground"
             item={<CounterBox onChange={value => setDict('teleopAlgaeFromGround', value)} />}
         />,
+        <Query
+            title="Algae from Reef"
+            item={
+                <CounterBox
+                    onChange={value =>
+                        setDict('teleopAlgaeFromReef', value)
+                    }
+                />
+            }
+        />,
     ];
 
     const tele_missed_queries = [

screens/ScoutingPage.tsx

@@ -59,7 +59,7 @@ const ScoutingPage: React.FC<ScoutingPageProps> = ({
     // define the required fields here
     // MAKE SURE THAT THEY ARE NULL IN THE DICT AS IT ONLY CHECKS
     // IF THE VALUE IS NULL!!!!!
-    const requiredQueries = ['preloaded', 'robotLeft', 'didTeamPlayDefense'];
+    const requiredQueries = ['preloaded', 'robotLeft', 'didTeamPlayDefense', 'endGame'];
 
     // validation function to check if all required queries are completed
     const validateQueries = () => {