Merge branch 'dev-rebase-test' of https://github.com/FOSSASystems/InvenTree into dev-rebase-test

Author: mariavfossa

src/frontend/src/components/dashboard/DashboardMenu.tsx

@@ -45,17 +45,14 @@ export default function DashboardMenu({
 }>) {
   const user = useUserState();
   const instanceName = useInstanceName();
-  const [total_Value, total_Consumed, total_bills, total_quantity, total_count] = UseTotalValue();
+  const [total_Value, total_Consumed, total_bills, total_quantity, total_count, total_Extracted] = UseTotalValue();
 
   const title = useMemo(() => {
     const username = user.username();
 
     return (
       <div>
         <StylishText size='lg'>{`FOSSA Inventory (Spain) - ${username}`}</StylishText>
-        <div style={{ marginTop: '10px', display: 'flex', flexDirection: 'column' }}>
-          <Text size='md' fw={500}>Total Stock: {total_quantity}</Text>
-        </div>
         <div style={{ marginTop: '10px', display: 'flex', flexDirection: 'column' }}>
           <Text size='md' fw={500}>Item Count: {total_count}</Text>
         </div>
@@ -68,9 +65,12 @@ export default function DashboardMenu({
         <div style={{ marginTop: '10px', display: 'flex', flexDirection: 'column' }}>
           <Text size='md' fw={500}>Total Bills Value: {total_bills} €</Text>
         </div>
+        <div style={{ marginTop: '10px', display: 'flex', flexDirection: 'column' }}>
+          <Text size='md' fw={500}>Total Extracted Value: {total_Extracted} €</Text>
+        </div>
       </div>
     );    
-  }, [user, instanceName, total_Value, total_Consumed]);
+  }, [user, instanceName, total_Value, total_Consumed, total_Extracted]);
   return (
     <Paper p='sm' pr={0}>
       <Group justify='space-between' wrap='nowrap'>

src/frontend/src/hooks/UseTotalValue.tsx

@@ -6,6 +6,7 @@ export default function UseTotalValue() {
   const [totalBills, setTotalBills] = useState<number>(0);
   const [totalQuantity, setTotalQuantity] = useState<number>(0);
   const [totalCount, setTotalCount] = useState<number>(0);
+  const [totalExtracted, setTotalExtracted] = useState<number>(0);
 
   useEffect(() => {
     fetch("/api/stock/value/")
@@ -16,8 +17,9 @@ export default function UseTotalValue() {
         setTotalBills(data.total_from_bills);
         setTotalQuantity(data.total_quantity)
         setTotalCount(data.item_count)
+        setTotalExtracted(data.total_extracted)
       });
   }, []);
 
-  return [totalValue.toFixed(2), totalConsumed.toFixed(2), totalBills.toFixed(2), totalQuantity, totalCount];
+  return [totalValue.toFixed(2), totalConsumed.toFixed(2), totalBills.toFixed(2), totalQuantity, totalCount, totalExtracted.toFixed(2)];
 }