Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet

app/(tabs)/_layout.tsx

@@ -49,7 +49,7 @@ export default function TabLayout() {
         name="GestionOuvrier"
         component={GestionOuvrier}
         options={{
-          title: 'Bonjour',
+          title: 'Ouvriers',
           tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
         }}
       />

app/(tabs)/gestionnaire_ressource.tsx

@@ -12,7 +12,6 @@ import { getRessources } from "../../services/ressourcesService";
 import SelectChantier from "@/components/selectChantier";
 
 export default function GestionnaireRessource() {
-  const { nom, prenom } = useLocalSearchParams();
   const [search, setSearch] = useState("");
   const [ressource, setRessources] = useState<Ressources[]>([]);
   const [filterType, setFilterType] = useState("tout");
@@ -43,11 +42,10 @@ export default function GestionnaireRessource() {
       <ThemedView lvl={1} shadow={true} style={styles.card}>
         <Image source={{ uri: item.Image }} style={styles.image} />
         <ThemedView lvl={1} style={styles.info}>
-          <ThemedText>{item.id}</ThemedText>
-          <ThemedText>{item.name}</ThemedText>
-          <ThemedText>{item.type}</ThemedText>
-          <ThemedText>{item.quantity}</ThemedText>
-          <ThemedText>{item.available_quantity}</ThemedText>
+          <ThemedText>Nom : {item.name}</ThemedText>
+          <ThemedText>Type : {item.type}</ThemedText>
+          <ThemedText>Quantité totale : {item.quantity}</ThemedText>
+          <ThemedText>Quantité disponible : {item.available_quantity}</ThemedText>
         </ThemedView>
       </ThemedView>
     );

components/anomaly.tsx

@@ -1,6 +1,6 @@
 import { Chantier } from '@/class/class';
 import { ThemedView } from '@/components/theme/themed-view';
-import React, { use, useState } from 'react';
+import React, { use, useEffect, useState } from 'react';
 import { TouchableOpacity, StyleProp, StyleSheet, View, Image, ViewStyle,Text, TextInput } from 'react-native';
 import { ThemedText } from './theme/themed-text';
 import { deleteAnomalie, addAnomalie, getChantiers } from '@/services/ressourcesService';
@@ -33,6 +33,12 @@ export default function Anomaly({data,style}: Props) {
     await syncChantier();
   };
 
+  //DEBUG
+  useEffect(() => {
+    console.log("imageUri changed", imageUri);
+  }, [imageUri]);
+
+
   // Image picker function (not used currently)
   const selectImage = async () => {
     let result = await ImagePicker.launchImageLibraryAsync({

package-lock.json

@@ -20,6 +20,7 @@
         "expo-image": "~3.0.9",
         "expo-image-picker": "~17.0.10",
         "expo-linking": "~8.0.8",
+        "expo-location": "~19.0.8",
         "expo-router": "~6.0.11",
         "expo-splash-screen": "~31.0.10",
         "expo-status-bar": "~3.0.8",
@@ -7158,6 +7159,15 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-location": {
+      "version": "19.0.8",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-19.0.8.tgz",
+      "integrity": "sha512-H/FI75VuJ1coodJbbMu82pf+Zjess8X8Xkiv9Bv58ZgPKS/2ztjC1YO1/XMcGz7+s9DrbLuMIw22dFuP4HqneA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-modules-autolinking": {
       "version": "3.0.15",
       "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-3.0.15.tgz",

package.json

@@ -23,6 +23,7 @@
     "expo-image": "~3.0.9",
     "expo-image-picker": "~17.0.10",
     "expo-linking": "~8.0.8",
+    "expo-location": "~19.0.8",
     "expo-router": "~6.0.11",
     "expo-splash-screen": "~31.0.10",
     "expo-status-bar": "~3.0.8",