gestion_user au lieu de gestion_ouvrier (qui est une ressource, donc en double avec gestionnaire_ressource) + filtre dans gestion_ressource pour avoir seulement les ressources du chantier courrant

2025-12-14 16:08:27 +01:00
parent 707ae1dc30
commit 3296d301ee
7 changed files with 107 additions and 56 deletions
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -39,9 +39,9 @@ export default function TabLayout() {
        }}
      />
      <Tabs.Screen
-        name="gestion_ouvrier"
+        name="gestion_user"
        options={{
-          title: 'Ouvriers',
+          title: 'Users',
          tabBarIcon: ({ color }) => <IconSymbol size={28} name="person.fill" color={color} />,
        }}
      />
--- a/app/(tabs)/gestion_ouvrier.tsx
+++ b/app/(tabs)/gestion_ouvrier.tsx
@@ -2,14 +2,11 @@ import { ThemedText } from "@/components/theme/themed-text";
 import { ThemedTextInput } from "@/components/theme/themed-textinput";
 import { ThemedView } from "@/components/theme/themed-view";
 import Constants from "expo-constants"; //pour connaître la taille de la barre menu de l'OS en haut
-import { useLocalSearchParams, useRouter } from "expo-router";
-import React, { useEffect, useMemo, useState } from "react";
-import { FlatList, Image, StyleSheet, Text, View } from "react-native";
+import React, { useEffect, useState } from "react";
+import { FlatList, StyleSheet, Text, View } from "react-native";
 import { getUsers } from "@/services/ressourcesService";
-import { useChantier } from "../ContextChantier";
 import SelectChantier from "@/components/selectChantier";
-import { Ressources } from "@/class/class";
-import { getRessources } from "@/services/ressourcesService";
+import { User } from "@/class/class";

 type Concert = {
  group: string;
@@ -22,19 +19,15 @@ type Concert = {
  favorite: boolean;
 };

-export default function GestionOuvrier() {
-  const router = useRouter();
-  const { nom, prenom } = useLocalSearchParams(); // Recup data ecran precedent
+export default function GestionUser() {
  const [search, setSearch] = useState("");
-  const { chantier, setChantier } = useChantier();
-  const [artisans, setRessources] = useState<Ressources[]>([]);
+  const [users, setUsers] = useState<User[]>([]);

  useEffect(() => {
      async function loadData() {
        try {
-          //Nous ne gardons que les Ouvriers, qui peuvent être assignés à un chantier
-          const data = (await getRessources()).filter(u => u.type === "Ouvrier"); 
-          setRessources(data);
+          const data = (await getUsers()); 
+          setUsers(data);
        } catch (error) {
          console.error("Erreur lors du chargement :", error);
        }
@@ -42,17 +35,15 @@ export default function GestionOuvrier() {
      loadData();
    }, []);

-  const renderItem = ({ item, index }: { item?: Ressources; index: number }) => {
+  const renderItem = ({ item, index }: { item?: User; index: number }) => {
    if (!item) {
      return null;
    }
    return (
      <ThemedView lvl={1} shadow={true} style={styles.card}>
        <ThemedView lvl={1} style={styles.info}>
-          <Image source={{ uri: item.Image }} style={styles.image} />
-          <ThemedText style={styles.group}>{item.name}</ThemedText>
-          <ThemedText>{item.quantity}</ThemedText>
-          <ThemedText>{item.type}</ThemedText>
+          <ThemedText style={styles.group}>{item.name} {item.last_name}</ThemedText>
+          <ThemedText>{item.role}</ThemedText>
        </ThemedView>
      </ThemedView>
    );
@@ -67,7 +58,7 @@ export default function GestionOuvrier() {


        <FlatList
-          data={artisans}
+          data={users}
          renderItem={renderItem}
          keyExtractor={(_, index) => index.toString()}
          contentContainerStyle={{ paddingBottom: 40 }}
--- a/app/(tabs)/gestionnaire_ressource.tsx
+++ b/app/(tabs)/gestionnaire_ressource.tsx
@@ -8,19 +8,25 @@ import { useLocalSearchParams, useRouter } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { FlatList, Image, StyleSheet, Text, View } from "react-native";
 import { Ressources } from "../../class/class";
-import { getRessources } from "../../services/ressourcesService";
+import { getReservations, getRessources } from "../../services/ressourcesService";
 import SelectChantier from "@/components/selectChantier";
 import { useRessources } from "../ContextRessource";
+import { useChantier } from "../ContextChantier";
+import { getNbUseRessources, getNbUseRessourcesInChantier, isInChantier } from "@/class/utils";
+import { useReservations } from "../ContextReservation";

 export default function GestionnaireRessource() {
  const [search, setSearch] = useState("");
  const {ressources, setRessources} = useRessources();
+  const {reservations, setReservations} = useReservations();
+  const {chantier, setChantier} = useChantier();
  const [filterType, setFilterType] = useState("Tout");
  const [showFilterMenu, setShowFilterMenu] = useState(false);
+  const [filterChantier, setFilterChantier] = useState(false);
  const router = useRouter();

  useEffect(() => {
-    async function loadData() {
+    async function loadDataRessources() {
      try {
        const data = await getRessources();
        setRessources(data);
@@ -28,13 +34,23 @@ export default function GestionnaireRessource() {
        console.error("Erreur lors du chargement :", error);
      }
    }
-    loadData();
+    async function loadDataReservations() {
+      try {
+        const data = await getReservations();
+        setReservations(data);
+      } catch (error) {
+        console.error("Erreur lors du chargement :", error);
+      }
+    }
+    loadDataRessources();
+    loadDataReservations();
  }, []);

  const filteredData = ressources.filter((r) => {
    const matchName = r.name.toLowerCase().includes(search.toLowerCase());
    const matchType = filterType === "Tout" || r.type === filterType;
-    return matchName && matchType;
+    
+    return matchName && matchType && (!filterChantier || (chantier && isInChantier(r,chantier,reservations)));
  });

  const renderRessource = ({ item }: { item: Ressources }) => {
@@ -43,11 +59,13 @@ 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>Id : {item.id}</ThemedText>
          <ThemedText>Nom : {item.name}</ThemedText>
          <ThemedText>Type : {item.type}</ThemedText>
          <ThemedText>Quantité totale : {item.quantity}</ThemedText>
-          <ThemedText>Quantité disponible : {item.available_quantity}</ThemedText>
+          <ThemedText>Quantité disponible : {item.quantity-getNbUseRessources(item, reservations)}</ThemedText>
+          {filterChantier&&chantier &&
+          <ThemedText>Quantité utilisé dans le chantier : {getNbUseRessourcesInChantier(item,chantier, reservations)}</ThemedText>
+          }
        </ThemedView>
      </ThemedView>
    );
@@ -84,6 +102,7 @@ export default function GestionnaireRessource() {
                >
                  <ThemedText style={{ textAlign: "center" }}>{t}</ThemedText>
                </ThemedButton>
+                
              ))}

                {/* Bouton "Fermer" remplacé */}
@@ -117,14 +136,22 @@ export default function GestionnaireRessource() {
              </ThemedView>
              
              {/* Bouton filtre en haut à droite */}
+              <View style={{flexDirection: "row", gap:5}}>
                <ThemedButton
                  lvl={1}
                  shadow={true}
-                style={{ padding: 10, borderRadius: 8, marginTop: 10 }}
+                  style={styles.button}
                  onPress={() => setShowFilterMenu(true)}
                >
                  <ThemedText>{`Filtre: ${filterType}`}</ThemedText>
                </ThemedButton>
+                <ThemedButton style={styles.button}>
+                  <ThemedText onPress={() => setFilterChantier(!filterChantier)}>
+                    {filterChantier?"chantier courant":"tous"}
+                  </ThemedText>
+                </ThemedButton>
+              </View>
+
            </View>
          }
          ListEmptyComponent={
@@ -214,4 +241,9 @@ const styles = StyleSheet.create({
    marginBottom: 20,
    textAlign: "center",
  },
+  button:{
+    padding: 10,
+    borderRadius: 8,
+    marginTop: 10
+  },
 });
--- a/class/utils.tsx
+++ b/class/utils.tsx
@@ -29,3 +29,26 @@ export function getNbUseRessources(ressource:Ressources, allReservations:Reserva
  })
  return res;
 }
+
+export function getNbUseRessourcesInChantier(ressource:Ressources,chantier: Chantier, allReservations:Reservation[]):number{
+  var res:number = 0;
+  getReservationOfRessource(ressource,allReservations).forEach(reserv => {
+    if(reserv.chantier.id === chantier.id && reserv.ressource.id===ressource.id){
+      res+=reserv.quantity;
+    }
+  })
+  return res;
+}
+
+export function isInChantier(ressource:Ressources, chantier: Chantier, allReservations:Reservation[]):boolean{
+  console.log(allReservations.length+ " --------------------------------");
+  const reservations:Reservation[] = getReservationOfRessource(ressource,allReservations);
+  var res=false;
+  reservations.forEach(reserv => {
+    console.log(reserv.chantier.id + " " + chantier.id)
+    if(reserv.chantier.id === chantier.id){
+      res=true;
+    }
+  });
+  return res;
+}
--- a/components/chantierSummary.tsx
+++ b/components/chantierSummary.tsx
@@ -18,22 +18,21 @@ export default function ChantierSummary({data,style , ...otherProps }: Props) {
        {data.chantier ? (
            <ThemedView lvl={4} style={styles.chantier}>
                <View>
-                    <Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=693f1a72&is=693dc8f2&hm=86ffb97145fc8d3aec822b87d99be233c98477d4424c1ef58f80eb81b17c7c80&" /*chantier.urlImg*/ }} style={styles.image} />
+                    <Image source={{ uri:"" /*chantier.urlImg*/ }} style={styles.image} />
                </View>
                <View style={{flex: 1}}>
-                    <ThemedText selectable={true}>Id: {data.chantier.id}</ThemedText>
                    <ThemedText selectable={true}>Objet: {data.chantier.name}</ThemedText>
                    <ThemedText selectable={true}>Adresse: {data.chantier.adresse}</ThemedText>
                    <ThemedText selectable={true}>Chef de chantier: {data.chantier.chef.last_name}{" "}{data.chantier.chef.name}</ThemedText>
                    <ThemedText selectable={true}>État: {data.chantier.etat}</ThemedText>
-                    <ThemedText selectable={true}>equipe: 
-                      {getNbItemReservation(data.chantier.equipe)} ({data.chantier.equipe.length} type{data.chantier.equipe.length>1&&"s"})
+                    <ThemedText selectable={true}>
+                      equipe: {getNbItemReservation(data.chantier.equipe)} ({data.chantier.equipe.length} type{data.chantier.equipe.length>1&&"s"})
                    </ThemedText>
-                    <ThemedText selectable={true}>materiel: 
-                      {getNbItemReservation(data.chantier.materiel)} ({data.chantier.materiel.length} type{data.chantier.materiel.length>1&&"s"})
+                    <ThemedText selectable={true}>
+                      materiel: {getNbItemReservation(data.chantier.materiel)} ({data.chantier.materiel.length} type{data.chantier.materiel.length>1&&"s"})
                    </ThemedText>
-                    <ThemedText selectable={true}>vehicules: 
-                      {getNbItemReservation(data.chantier.vehicules)} ({data.chantier.vehicules.length} type{data.chantier.vehicules.length>1&&"s"})
+                    <ThemedText selectable={true}>
+                      vehicules: {getNbItemReservation(data.chantier.vehicules)} ({data.chantier.vehicules.length} type{data.chantier.vehicules.length>1&&"s"})
                    </ThemedText>
                </View>
            </ThemedView>
--- a/components/selectChantier.tsx
+++ b/components/selectChantier.tsx
@@ -122,7 +122,7 @@ export default function SelectChantier() {
              <Image source={{ uri:"https://cdn.discordapp.com/attachments/1425108443571945644/1427207643180826757/raw.png?ex=693f1a72&is=693dc8f2&hm=86ffb97145fc8d3aec822b87d99be233c98477d4424c1ef58f80eb81b17c7c80&" /*chantier.urlImg*/ }} style={styles.image} />
            </View>
            <View style={{flex: 1}}>
-            <ThemedText>Renovation: {item.name}</ThemedText>
+            <ThemedText>Objet: {item.name}</ThemedText>
              <ThemedText>Adresse: {item.adresse}</ThemedText>
              <ThemedText>Chef de chantier: {item.chef.last_name}{" "}{item.chef.name}</ThemedText>
              <ThemedText>État: {item.etat}</ThemedText>
@@ -138,7 +138,7 @@ export default function SelectChantier() {
      <ThemedView lvl={2} shadow={true} style={styles.window}>
        <AnimatedThemedButton style={animatedButtonStyle} lvl={isOpen ? 1 : 1} onPress={() => onPressOpen()}>
          <ThemedText style={styles.buttonText}>
-            {isOpen ? "Fermer" : (chantier!=null ? chantier.adresse : "Chantier")}
+            {isOpen ? "Fermer" : (chantier!=null ? chantier.name : "Chantier")}
          </ThemedText>
        </AnimatedThemedButton>
        {isOpen && (
--- a/services/ressourcesService.ts
+++ b/services/ressourcesService.ts
@@ -219,8 +219,14 @@ async function convertReservation(res: any): Promise<Reservation|null> {

    return {
      id: res.id,
-      chantier: chantierSnap.data() as Chantier,
-      ressource: ressourceSnap.data() as Ressources,
+      chantier: {
+        id: chantierSnap.id,
+        ...(chantierSnap.data() as Omit<Chantier, "id">),
+      },
+      ressource: {
+        id: ressourceSnap.id,
+        ...(ressourceSnap.data() as Omit<Ressources, "id">),
+      },
      quantity: data.quantity,
    };
  } catch (err) {