update columns tableLoan

jcarrill0 · Jul 24, 2021 · 29e654d · 29e654d
1 parent 1159a4a
commit 29e654d
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 26 deletions.
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -31,8 +31,9 @@ function Footer(props) {
           </nav>
           <div className="credits ml-auto">
             <div className="copyright">
-              &copy; {new Date().getFullYear()}, made with
-              <i className="fa fa-heart heart ml-1" /> by Creative Tim
+              &copy; {new Date().getFullYear()}, Derechos reservados
+              {/* , made with
+              <i className="fa fa-heart heart ml-1" /> by Creative Tim */}
             </div>
           </div>
         </Row>

diff --git a/src/helpers/helpers.js b/src/helpers/helpers.js
@@ -32,7 +32,7 @@ export const getDateOfPayments = (date, days) => {
 // montoTotal: 21626.88,
 // montoCuota: 5406.72 
 
-export const loanCalculate = (montoCredito, interes, numCuotas) => ({
+export const loanCalculate = (montoCredito, interes, numCuotas = 0) => ({
     getAmountInteres: function() {
         return (montoCredito * interes) / 100
     },

diff --git a/src/views/LoansTable.js b/src/views/LoansTable.js
@@ -11,6 +11,7 @@ import { ModalLoan } from 'components/Modal/ModalLoan';
 import { useModal } from 'hooks/useModal'
 import CalcForm from 'components/Forms/CalcForm';
 import { styles } from './styles/styles'
+import { loanCalculate } from '../helpers/helpers'
 
 
 const LoansTable = () => {
@@ -19,7 +20,7 @@ const LoansTable = () => {
     const loadLoans = useLoanStore(state => state.getAllLoans)
     const loanList = useLoanStore(state => state.loanList)
 
-    const [listLoan] = useState(loans)
+    // const [listLoan] = useState(loans)
 
     const { modal, toggle } = useModal()
 
@@ -28,12 +29,9 @@ const LoansTable = () => {
         loadLoans()
     }, [loadLoans, loadCustomers])
 
-    if(loanList.length === 0) { console.log("Lista de prestamos vacía") }
-    if(customerList.length > 0) { console.log(customerList) }
-
     const columns = [
         {
-            dataField: "codigo",
+            dataField: "id",
             text: "N° Prestamo",
             sort: true,
             // headerStyle: styles.headerStyle,
@@ -45,49 +43,66 @@ const LoansTable = () => {
             sort: true,
             style: styles.columnStyle,
             formatter: cell => {
-                const customer = customers.find(item => item.id === cell)
-
+                let customer = customers.find(item => item.id === cell)
                 return (
                     <span>{`${customer.firstName} ${customer.lastName}`}</span>
                 );
             }
         },
         {
-            dataField: "fechaPrestamo",
-            text: "Fecha Préstamo",
+            dataField: "montoCredito",
+            text: "M. crédito",
             headerAlign: 'center',
             headerStyle: styles.headerStyle,
             style: styles.columnStyle
         },
         {
-            dataField: "montoCredito",
-            text: "Monto Crédito",
+            dataField: "interes",
+            isDummyField: true,
+            text: "M. interés",
             headerAlign: 'center',
             headerStyle: styles.headerStyle,
-            style: styles.columnStyle
+            style: styles.columnStyle,
+            formatter: (cell, {montoCredito, interes}) => {
+                const { getAmountInteres } = loanCalculate(montoCredito, interes)
+                return (
+                    <span>{getAmountInteres()}</span>
+                );
+            }
         },
-        // {
-        //     dataField: "montoTotal",
-        //     text: "Monto Total",
-        //     style: styles.columnStyle
-        // },
         {
-            dataField: "interes",
-            text: "Interés",
+            dataField: "montoTotal",
+            isDummyField: true,
+            text: "M. total",
+            headerAlign: 'center',
             headerStyle: styles.headerStyle,
             style: styles.columnStyle,
-            formatter: (cell, row) => {
+            formatter: (cell, {montoCredito, interes}) => {
+                const { getAmountTotal } = loanCalculate(montoCredito, interes)
                 return (
-                    <span>{cell}%</span>
+                    <span>{getAmountTotal()}</span>
                 );
             }
         },
         {
-            dataField: "cuotas",
-            text: "Cuotas",
+            dataField: "fechaPrestamo",
+            text: "F. Préstamo",
+            headerAlign: 'center',
+            headerStyle: styles.headerStyle,
+            style: styles.columnStyle
+        },
+        {
+            dataField: "estado",
+            text: "Estado",
             headerStyle: styles.headerStyle,
             style: styles.columnStyle
         },
+        // {
+        //     dataField: "cuotas",
+        //     text: "Cuotas",  
+        //     headerStyle: styles.headerStyle,
+        //     style: styles.columnStyle
+        // },
         {
             dataField: "action",
             isDummyField: true,