gestion des ressources fonctionnelle, mais pas fini

components/add/addRessource.tsx

@@ -52,73 +52,74 @@ export default function AddRessource({ressourceType, ...otherProps }: Props) {
   const [quantiteDisponible,setQuantiteDisponible] = useState('');  
   const [openConfirmation,setOpenConfirmation] = useState(false);
 
-    async function handleAddRessource() {
+  async function handleAddRessource() {
     setLoading(true);
     setOpenConfirmation(true);
   }
 
-        async function onConfirm(): Promise<void> {
-        if(isValidRessource()){
-          try{
-            setLoading(true);
-            const nouvelleRessource : Ressources = {
-              id : '',
-              name: nom,
-              type : ressourceType,
-              quantity : parseInt(quantite),
-              available_quantity : parseInt(quantite),
-              Image : "",
-              allocation : [],
-            };
-            const id = await addRessources(nouvelleRessource);
+  async function onConfirm(): Promise<void> {
+    if(isValidRessource()){
+      try{
+        setLoading(true);
+        const nouvelleRessource : Ressources = {
+          id : '',
+          name: nom,
+          type : ressourceType,
+          quantity : parseInt(quantite),
+          available_quantity : parseInt(quantite),
+          Image : "",
+          allocation : [],
+        };
+        const id = await addRessources(nouvelleRessource);
 
-            if(id){
-              setRessources([...ressources,{...nouvelleRessource, id}]);
-              setOpenConfirmation(false);
-              setNom('');
-              setQuantite('');
-              setQuantiteDisponible('');
-            }
-          }catch(error){
-          }finally{
+        if(id){
+          setRessources([...ressources,{...nouvelleRessource, id}]);
           setOpenConfirmation(false);
-          setLoading(false);
+          setNom('');
+          setQuantite('');
+          setQuantiteDisponible('');
         }
+      }catch(error){
+      }finally{
+        setOpenConfirmation(false);
+        setLoading(false);
       }
     }
+  }
+
+  function onCancel(): void {
+    setOpenConfirmation(false);
+  }
 
-      function onCancel(): void {
-        setOpenConfirmation(false);
-      }
   function isValidRessource():Boolean{
     return nom!= "" && quantite != "" 
   }
 
-    const renderValidationScreen = () => {
-      return(
-        <Modal transparent={true} >
-          <View style={styles.overlay}>
-            <ThemedView style={styles.overlayView}>
-              <ThemedText style={{fontSize: 25}}>Créer la nouvelle ressource {ressourceType} suivante ? :</ThemedText>
-              <ThemedView lvl={2} style={styles.summaryNewChantier}>
-                <ThemedText style={{fontSize: 20}}>Nom: {nom===''?"NONE":nom}</ThemedText>
-                <ThemedText style={{fontSize: 20}}>Quantité Total: {quantite===''?"0":quantite} </ThemedText>
-              </ThemedView>
-              <View style={styles.overlayView}>
-                <ThemedButton lvl={2} border={5} style={styles.buttonValid} onPress={() => onConfirm()}>
-                  <ThemedText style={{fontSize: 25}}>Confirmer</ThemedText>
-                </ThemedButton>
-              </View>
-              <View style={styles.overlayView}>
-                <ThemedButton lvl={2} border={5} style={styles.buttonValid} onPress={() => onCancel()}>
-                  <ThemedText style={{fontSize: 25}}>Annuler</ThemedText>
-                </ThemedButton>
-              </View>
+  const renderValidationScreen = () => {
+    return(
+      <Modal transparent={true} >
+        <View style={styles.overlay}>
+          <ThemedView style={styles.overlayView}>
+            <ThemedText style={{fontSize: 25}}>Créer la nouvelle ressource {ressourceType} suivante ? :</ThemedText>
+            <ThemedView lvl={2} style={styles.summaryNewChantier}>
+              <ThemedText style={{fontSize: 20}}>Nom: {nom===''?"NONE":nom}</ThemedText>
+              <ThemedText style={{fontSize: 20}}>Quantité Total: {quantite===''?"0":quantite} </ThemedText>
             </ThemedView>
-          </View>
-        </Modal>
-      )
-        }
+            <View style={styles.overlayView}>
+              <ThemedButton lvl={2} border={5} style={styles.buttonValid} onPress={() => onConfirm()}>
+                <ThemedText style={{fontSize: 25}}>Confirmer</ThemedText>
+              </ThemedButton>
+            </View>
+            <View style={styles.overlayView}>
+              <ThemedButton lvl={2} border={5} style={styles.buttonValid} onPress={() => onCancel()}>
+                <ThemedText style={{fontSize: 25}}>Annuler</ThemedText>
+              </ThemedButton>
+            </View>
+          </ThemedView>
+        </View>
+      </Modal>
+    )
+  }
 
   const renderInut = (name : string, preFill : string, value : string, setValue : ((text:string) => void),numeric:boolean) => {
     return (
@@ -129,7 +130,7 @@ export default function AddRessource({ressourceType, ...otherProps }: Props) {
     );
   };
 
-return (
+  return (
     <ThemedView lvl={3} style={styles.back}>
       <View style={styles.container}>
         {editMode &&

components/add/select/ressourceSummary.tsx

@@ -1,9 +1,12 @@
 import { Chantier, Ressources } from '@/class/class';
 import { ThemedView, } from '@/components/theme/themed-view';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Image, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 import { ThemedText } from '@/components/theme/themed-text';
 import { ThemedButton } from '@/components/theme/themed-button';
+import { getNbUseRessources } from '@/class/utils';
+import { useReservations } from '@/app/ContextReservation';
+import { getReservations } from '@/services/ressourcesService';
 
 type RessourcesQte = [Ressources, number];
 
@@ -16,11 +19,11 @@ type Props = {
 
 export default function RessourceSummary({ressource: ressource,qte,style,sendRessource: sendRessource, ...otherProps }: Props) {
 
-
+    const { reservations, setReservations } = useReservations();
     const [count,setCount] = useState(qte);
     
     function onPressAdd(ressource: Ressources): void {
-        if(count<ressource.quantity){
+        if(count<ressource.quantity-getNbUseRessources(ressource,reservations)){
             setCount(count+1);
             sendRessource([ressource, count+1]);
         }
@@ -33,20 +36,28 @@ export default function RessourceSummary({ressource: ressource,qte,style,sendRes
         }
     }
 
+    useEffect(() => {
+        async function loadReservations() {
+            const list = await getReservations();
+            setReservations(list);
+        }
+
+        loadReservations();
+    }, []);
+    
+
     return(
         <View style={style}>
             <ThemedView lvl={2} border={3} style={{padding:10,width:"100%",borderRadius:10,flexDirection: 'row',justifyContent: 'space-between',}}>
                 <View>
-                    <ThemedText>{ressource.id}</ThemedText>
-                    <ThemedText>{ressource.name}</ThemedText>
-                    <ThemedText>{ressource.quantity}</ThemedText>
-                    <ThemedText>{ressource.type}</ThemedText>
+                    <ThemedText>Nom : {ressource.name}</ThemedText>
+                    <ThemedText>Restant : {ressource.quantity-getNbUseRessources(ressource,reservations)}/{ressource.quantity}</ThemedText>
                 </View>
                 <View style={{alignItems:"center"}}>
                     <ThemedButton style={styles.button} lvl={3} onPress={() => onPressAdd(ressource)}>
                         <ThemedText>+</ThemedText>
                     </ThemedButton>
-                    <ThemedText>{count}/{ressource.quantity}</ThemedText>
+                    <ThemedText>{count}/{ressource.quantity-getNbUseRessources(ressource,reservations)}</ThemedText>
                     <ThemedButton style={styles.button} lvl={3} onPress={() => onPressSub(ressource)}>
                         <ThemedText>-</ThemedText>
                     </ThemedButton>