Send observation organ to backend

eleurent · Oct 15, 2023 · a371392 · a371392
1 parent b7968ec
commit a371392
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/frontend/contexts/ObservationContext.js b/frontend/contexts/ObservationContext.js
@@ -10,6 +10,7 @@ export const ObservationContext = React.createContext();
 
 const initialState = {
     image: null,
+    organ: 'leaf',
     location: null,
     datetime: null,
     data: null,
@@ -22,6 +23,11 @@ const observationReducer = (prevState, action) => {
                 ...prevState,
                 image: action.image,
             };
+        case 'SET_ORGAN':
+            return {
+                ...prevState,
+                organ: action.organ,
+            };
         case 'SET_LOCATION':
             return {
                 ...prevState,
@@ -51,6 +57,9 @@ export const useObservation = () => {
             setObservationImage: (imageBase64) => {
                 dispatch({ type: 'SET_IMAGE', image: imageBase64 });
             },
+            setObservationOrgan: (organ) => {
+                dispatch({ type: 'SET_ORGAN', organ: organ });
+            },
             setObservationLocation: (location) => {
                 dispatch({ type: 'SET_LOCATION', location: location });
             },

diff --git a/frontend/screens/ObservationConfirm.js b/frontend/screens/ObservationConfirm.js
@@ -32,7 +32,6 @@ const ImageType = ({ selected, onSelect, name, text }) => {
 export default function ObservationConfirmScreen({ navigation, route }) {
     const [statusMessage, setStatusMessage] = useState(null);
     const { observationState, observationMethods } = useContext(ObservationContext);
-    const [selectedImageType, setSelectedImageType] = useState('leaf');
 
     useEffect(() => {
 
@@ -70,14 +69,14 @@ export default function ObservationConfirmScreen({ navigation, route }) {
                     <ImageType
                         name="leaf"
                         text="leaf"
-                        selected={selectedImageType === 'leaf'}
-                        onSelect={() => setSelectedImageType('leaf')}
+                        selected={observationState.organ === 'leaf'}
+                        onSelect={() => observationMethods.setObservationOrgan('leaf')}
                     />
                     <ImageType
                         name="flower-outline"
                         text="flower"
-                        selected={selectedImageType === 'flower'}
-                        onSelect={() => setSelectedImageType('flower')}
+                        selected={observationState.organ === 'flower'}
+                        onSelect={() => observationMethods.setObservationOrgan('flower')}
                     />
                 </View>
                 <MapView

diff --git a/frontend/screens/ObservationSelect.js b/frontend/screens/ObservationSelect.js
@@ -41,6 +41,7 @@ const maybeSendObservationImageAsync = async (observationState, observationMetho
         console.log('posting observation with location ' + JSON.stringify(observationState.location));
         console.log('posting observation with datetime ' + JSON.stringify(observationState.datetime));
         formData.append('image', observationState.image);
+        formData.append('organ', observationState.organ);
         formData.append('location', JSON.stringify(observationState.location));
         formData.append('datetime', observationState.datetime);
         axios.post(URL_CREATE_OBSERVATION, formData, {
@@ -72,11 +73,10 @@ const confirmSpeciesAsync = async (observation_id, species_index, onConfirmRespo
 
 const goToSpeciesDetails = (navigation, observationData) => {
     navigation.dispatch((state) => {
-        //update navigation state as you want.
         const routes = [
             { name: 'Home' },
             { name: 'SpeciesList' },
-            { name: 'SpeciesDetail', params: { id: observationData.species } }, //you can also add params 
+            { name: 'SpeciesDetail', params: { id: observationData.species } },
         ];
 
         return CommonActions.reset({