From 77fb39778fc4ebb3eea9e9801320efe1a4878c9a Mon Sep 17 00:00:00 2001
From: gabrhr <73925454+gabrhr@users.noreply.github.com>
Date: Wed, 1 Jun 2022 13:08:52 -0500
Subject: =?UTF-8?q?Add=20Almacen,=20Ruta,=20Camiones=20(Flota,=20Camiones,?=
 =?UTF-8?q?=20Aver=C3=ADas)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#TODO
- Arreglar combos
- Añadir los reducer de camiones, rutas, almacen
---
 .../app/components/Tables/CrudTableForm.js         |   8 +-
 .../app/components/Tables/CrudTableForm2.js        | 101 +++++++++++++++++++++
 .../components/Tables/tableParts/RowReadOnly.js    |  10 ++
 .../components/Tables/tableParts/tableStyle-jss.js |   2 +-
 4 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 front/odiparpack/app/components/Tables/CrudTableForm2.js

(limited to 'front/odiparpack/app/components/Tables')

diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js
index 017a3fc..8b7e6d5 100644
--- a/front/odiparpack/app/components/Tables/CrudTableForm.js
+++ b/front/odiparpack/app/components/Tables/CrudTableForm.js
@@ -5,16 +5,16 @@ import MainTableForm from './tableParts/MainTableForm';
 import FloatingPanel from './../Panel/FloatingPanel';
 
 class CrudTableForm extends React.Component {
-  /* componentDidMount(){
+  componentDidMount(){
     this.props.fetchData(this.props.dataInit, this.props.branch);
-  } */
+  }
 
-  componentDidUpdate(previousProps) {
+ /*  componentDidUpdate(previousProps) {
     if (previousProps.dataInit !== this.props.dataInit) {
       //console.log("en el FORM",this.props.dataInit)}
       this.props.fetchData(this.props.dataInit, this.props.branch);
     }
-  }
+  } */
 
   sendValues = (values) => {
     setTimeout(() => {
diff --git a/front/odiparpack/app/components/Tables/CrudTableForm2.js b/front/odiparpack/app/components/Tables/CrudTableForm2.js
new file mode 100644
index 0000000..dd24aec
--- /dev/null
+++ b/front/odiparpack/app/components/Tables/CrudTableForm2.js
@@ -0,0 +1,101 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Form from './tableParts/Form';
+import MainTableForm from './tableParts/MainTableForm';
+import FloatingPanel from '../Panel/FloatingPanel';
+
+class CrudTableForm extends React.Component {
+  /* componentDidMount(){
+    this.props.fetchData(this.props.dataInit, this.props.branch);
+  } */
+
+  componentDidUpdate(previousProps) {
+    if (previousProps.dataInit !== this.props.dataInit) {
+      //console.log("en el FORM",this.props.dataInit)}
+      this.props.fetchData(this.props.dataInit, this.props.branch);
+    }
+  }
+
+  sendValues = (values) => {
+    setTimeout(() => {
+      this.props.submit(values, this.props.branch);
+    }, 500);
+    if (this.props.editingId === this.props.initValues.get('id')) {
+      this.props.dispatch(this.props.editRowAPI()).then((res) => {
+        if (res) {
+            console.log("EDIT RO ", res)
+        }
+      })
+    } else {
+      this.props.dispatch(this.props.addNewAPI()).then((res) => {
+        if (res) {
+            console.log("ADD NEW FORM ", res)
+        }
+      })
+    }
+    
+  }
+
+  getTitle( ){
+    if (this.props.editingId === this.props.initValues.get(this.props.anchor[0].name)) {
+      return "Editar"
+    } 
+    return "Añadir nuevo"
+  }
+
+  render() {
+    const {
+      title,
+      dataTable,
+      openForm,
+      closeForm,
+      removeRow,
+      addNew,
+      editRow,
+      anchor,
+      children,
+      branch,
+      initValues,
+      removeRowAPI
+    } = this.props;
+    return (
+      <div>
+        
+        <FloatingPanel openForm={openForm} branch={branch} closeForm={closeForm} title = {this.getTitle()}>
+          <Form onSubmit={this.sendValues} initValues={initValues} branch={branch}>
+            {children}
+          </Form>
+        </FloatingPanel>
+        <MainTableForm
+          title={title}
+          addNew={addNew}
+          items={dataTable}
+          removeRow={removeRow}
+          editRow={editRow}
+          anchor={anchor}
+          branch={branch}
+          removeRowAPI={removeRowAPI}
+        />
+      </div>
+    );
+  }
+}
+
+CrudTableForm.propTypes = {
+  title: PropTypes.string.isRequired,
+  anchor: PropTypes.array.isRequired,
+  dataInit: PropTypes.array.isRequired,
+  dataTable: PropTypes.object.isRequired,
+  fetchData: PropTypes.func.isRequired,
+  submit: PropTypes.func.isRequired,
+  addNew: PropTypes.func.isRequired,
+  openForm: PropTypes.bool.isRequired,
+  closeForm: PropTypes.func.isRequired,
+  removeRow: PropTypes.func.isRequired,
+  editRow: PropTypes.func.isRequired,
+  children: PropTypes.node.isRequired,
+  initValues: PropTypes.object.isRequired,
+  branch: PropTypes.string.isRequired,
+};
+
+export default CrudTableForm;
diff --git a/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js b/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
index d060d02..f6be3fd 100644
--- a/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
+++ b/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
@@ -46,6 +46,9 @@ class RowReadOnly extends React.Component {
           case 'etiq_camion':
           case 'etiq_bloqueo': 
           case 'etiq_alma':
+          case 'etiq_ruta':
+          case 'etiq_tipoAveria':
+          case 'etiq_estadoAveria':
             return (
               <TableCell padding="none" key={index.toString()}>
                 {etiqueta(inputType, item.get(itemCell.name))}
@@ -57,6 +60,13 @@ class RowReadOnly extends React.Component {
                 {item.get(itemCell.name) !== undefined ? item.get(itemCell.name).toString() : ''}
               </TableCell>
             );
+          case 'averia_ubicacion':
+            return (
+              <TableCell padding="none" key={index.toString()}>
+                Longitud: {item.get('longitud') !== undefined ? item.get('longitud').toString() : ''}
+                {'\u00A0'} Latitud: {item.get('latitud') !== undefined ? item.get('latitud').toString() : ''}
+              </TableCell>
+            );
         }
       }
       return false;
diff --git a/front/odiparpack/app/components/Tables/tableParts/tableStyle-jss.js b/front/odiparpack/app/components/Tables/tableParts/tableStyle-jss.js
index bede0b8..bef1ac7 100644
--- a/front/odiparpack/app/components/Tables/tableParts/tableStyle-jss.js
+++ b/front/odiparpack/app/components/Tables/tableParts/tableStyle-jss.js
@@ -6,7 +6,7 @@ const styles = theme => ({
   rootTable: {
     width: '100%',
     marginTop: theme.spacing(3),
-    overflowX: 'auto',
+    overflowX: 'hidden',
   },
   highlight:
     theme.palette.type === 'light' ? {
-- 
cgit v1.2.3