addChantier / selectMachine / machineSummary : presque fini

components/selectMachine.tsx

@@ -8,18 +8,21 @@ import { ThemedText } from './theme/themed-text';
 import { ThemedView } from "./theme/themed-view";
 import { Ressources, User } from '@/class/class';
 import { getRessources } from "@/services/ressourcesService";
+import MachineSummary from './machineSummary';
 
 const { width, height } = Dimensions.get("window");
 
+type RessourcesQte = [Ressources, number];
+
 type Props = {
-    sendMachines: (machine: Ressources[]) => void;
+    sendMachines: (machine: RessourcesQte[]) => void;
     style?: StyleProp<ViewStyle>;
 };
 
 export default function SelectMachine({style,sendMachines: sendMachines , ...otherProps }: Props) {
 
     const { chantier, setChantier} = useChantier();
-    const [machines, setMachines] = useState<Ressources[]>([]);
+    const [machines, setMachines] = useState<RessourcesQte[]>([]);
     const [tempStatus, setTempStatus] = useState("");
     const [isOpen,setIsOpen] = useState(false);
     const [openConfirmation,setOpenConfirmation] = useState(false);
@@ -38,36 +41,51 @@ export default function SelectMachine({style,sendMachines: sendMachines , ...oth
       }
       loadData();
     }, []);
+
+
+    useEffect(() => {
+      sendMachines(machines);
+    }, [machines])
   
 
     function onPressOpen(): void {
        setIsOpen(!isOpen);
     }
 
-    function onPressRessource(machine: Ressources): void{
-      const exists = machines.some(item => item.name === machine.name);
-      if(exists){
-        setMachines(prev => prev.filter(item => item.name !== machine.name));
-      }
-      else{
-          setMachines(prevItem => [...prevItem, machine]);
-      }
-      sendMachines(machines);
-      //setIsOpen(false);
+    function getTotalMachine(): number{
+      var total = 0;
+      machines.forEach(element => {
+        total += element[1]
+      });
+      return total;
     }
 
-    const MachineSummary = ({ item }: { item: Ressources }) => {
+    function addMachine(machine: RessourcesQte): void{
+      if(machine[1]>0){
+        setMachines(prev =>
+          prev.some(i => i[0].name === machine[0].name)
+            ? prev.map(i =>
+                i[0].name === machine[0].name
+                  ? [i[0], machine[1]]
+                  : i
+              )
+            : [...prev, machine]
+        );
+      }
+      else{
+        setMachines(prev => prev.filter(item => item[0].name !== machine[0].name));
+      }
+    }
+
+
+
+
+    const MachineSummaryItem = ({ item }: { item: Ressources }) => {
       if (!item) return null;
-      const exists = machines.some(i => i.name === item.name);
+      const machineQte = machines.find(([r]) => r.name === item.name);
+      const qte = machineQte? machineQte[1]:0;
       return(
-        <View style={{padding:10,width:"100%"}}>
-          <ThemedButton lvl={exists?2:0} border={exists?3:0} style={{padding:10,width:"100%",borderRadius:10}} onPress={() => {onPressRessource(item)}}>
-             <ThemedText>{item.id}</ThemedText>
-            <ThemedText>{item.name}</ThemedText>
-            <ThemedText>{item.quantity}</ThemedText>
-            <ThemedText>{item.type}</ThemedText>
-          </ThemedButton>
-        </View>
+        <MachineSummary style={{padding:10,width:"100%"}} machine={item} qte={qte} sendMachine={addMachine}></MachineSummary>
       )
     }
 
@@ -81,7 +99,7 @@ export default function SelectMachine({style,sendMachines: sendMachines , ...oth
                 <FlatList
                   style={{width:"100%"}}
                   data={listMachines}
-                  renderItem={MachineSummary}
+                  renderItem={MachineSummaryItem}
                   keyExtractor={(_, index) => index.toString()}
                 />
 
@@ -97,7 +115,7 @@ export default function SelectMachine({style,sendMachines: sendMachines , ...oth
 
     return(
             <ThemedButton style={style} lvl={1} onPress={() => onPressOpen()}>
-                <ThemedText style={styles.centeredText}>{machines?machines.length+" machine(s) sélectionné":"sélectionner des machine(s)"}</ThemedText>
+                <ThemedText style={styles.centeredText}>{machines? getTotalMachine()+" machine(s) sélectionné dont "+ machines.length+" différente":"sélectionner des machine(s)"}</ThemedText>
                 {isOpen && MachineSearch()}
             </ThemedButton>